Skip to content

Commit aa0d87a

Browse files
authored
CLOUDP-354957: Autogenerated resources Kustomize configuration (#2838)
* add kustomize config for autogenerated resources * renaming to be consistent with related projects folders
1 parent a6dca9b commit aa0d87a

File tree

6 files changed

+35
-3
lines changed

6 files changed

+35
-3
lines changed

.github/workflows/tests-selectable.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
enable-cache: 'true'
141141
- name: Prepare bundle
142142
env:
143-
OPERATOR_IMAGE: ${{ env.GHCR_BUNDLES_REPO }}
143+
OPERATOR_IMAGE: ${{ env.GHCR_BUNDLES_REPO }}:${{ steps.detect-tests.outputs.image_tag }}
144144
VERSION: ${{ steps.detect-tests.outputs.image_tag }}
145145
run: |
146146
devbox run -- make bundle-dev

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,5 @@ bundle.Dockerfile
5959
config/manifests/bases/mongodb-atlas-kubernetes.clusterserviceversion.yaml
6060
config/manifests/kustomization.yaml
6161
config/manager/kustomization.yaml
62+
config/generated/crd/bases/*.yaml
63+
config/generated/rbac/role.yaml

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ update-manager-kustomization:
727727
@cd $(CONFIG_MANAGER); \
728728
touch kustomization.yaml; \
729729
$(KUSTOMIZE) edit add resource bases/; \
730-
$(KUSTOMIZE) edit set image controller="$(OPERATOR_IMAGE):$(VERSION)";
730+
$(KUSTOMIZE) edit set image controller="$(OPERATOR_IMAGE)";
731731
@echo "Manager image set to $(OPERATOR_IMAGE)"
732732

733733
$(ALL_IN_ONE_CONFIG): manifests update-manager-kustomization
@@ -811,4 +811,9 @@ clean-bundle:
811811
@rm -f $(CONFIG_RBAC)/clusterwide/role.yaml
812812
@rm -f $(CONFIG_RBAC)/namespaced/role.yaml
813813
@rm -f $(BUNDLE_DOCKERFILE)
814-
@echo "✅ Cleanup complete."
814+
@echo "✅ Cleanup complete."
815+
816+
autogenerated-manifests: manifests update-manager-kustomization
817+
@echo "Creating directory..."
818+
@mkdir -p $(TARGET_DIR)/generated
819+
@$(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/generated > $(TARGET_DIR)/generated/allinone.yaml
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- bases/crds.yaml
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
namespace: mongodb-atlas-system
2+
3+
namePrefix: mongodb-atlas-
4+
5+
# Labels to add to all resources and selectors.
6+
labels:
7+
- pairs:
8+
app.kubernetes.io/component: controller
9+
app.kubernetes.io/name: mongodb-atlas-kubernetes-operator
10+
app.kubernetes.io/instance: mongodb-atlas-kubernetes-operator
11+
app.kubernetes.io/part-of: atlas.generated.mongodb.com
12+
includeSelectors: true
13+
14+
resources:
15+
- crd
16+
- ../crd
17+
- ../manager
18+
- rbac # -> autogenerated RBAC
19+
- ../rbac/clusterwide
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
resources:
2+
- role.yaml

0 commit comments

Comments
 (0)