manager: use latest version of operator in manager controller

Manager Controller was using hardcoded version. Generated manifests should use latest version according to used branch.
scylladb · Jan 19, 2021 · aecb42f · aecb42f
1 parent b09bb23
commit aecb42f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -51,6 +51,7 @@ deploy: manifests cert-manager
 # Generate manifests e.g. CRD, RBAC etc.
 manifests:
 	cd config/operator/operator && kustomize edit set image controller=${IMG}
+	cd config/manager/manager && kustomize edit set image operator=${IMG}
 
 	controller-gen $(CRD_OPTIONS) paths="$(PKG)" output:crd:dir=config/operator/crd/bases \
 	rbac:roleName=manager-role output:rbac:artifacts:config=config/operator/rbac \

diff --git a/config/manager/manager/kustomization.yaml b/config/manager/manager/kustomization.yaml
@@ -9,13 +9,12 @@ images:
   newTag: 2.2.0
 - name: operator
   newName: scylladb/scylla-operator
-  newTag: v0.3.0
+  newTag: nightly
 
 configMapGenerator:
-  - name: manager-config
-    files:
-      - scylla-manager.yaml
+- files:
+  - scylla-manager.yaml
+  name: manager-config
 
 configurations:
-  - varconfig.yaml
-
+- varconfig.yaml
diff --git a/examples/common/manager.yaml b/examples/common/manager.yaml
@@ -232,7 +232,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: scylladb/scylla-operator:v0.3.0
+        image: scylladb/scylla-operator:nightly
         imagePullPolicy: IfNotPresent
         name: scylla-manager-controller
         resources: