Fix related images auto update (#551)

* Fix auto update of related images during make bundle * update comments in makefile --------- Co-authored-by: panigs7 <spandita.panigrahi@dell.com>
dell · May 16, 2024 · d137158 · d137158
1 parent d471d7e
commit d137158
Show file tree

Hide file tree

Showing 8 changed files with 225 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -159,10 +159,10 @@ rm -rf $$TMP_DIR ;\
 endef
 
 .PHONY: bundle
-bundle: static-manifests gen-semver kustomize ## Generate bundle manifests and metadata, then validate generated files.
+bundle: static-manifests gen-semver kustomize ## Generate bundle manifests and metadata, then validate generated files. Set --use-image-digests=true to use SHA ID of image instead of image tag.
 	operator-sdk generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
+	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS) --use-image-digests=false
 	operator-sdk bundle validate ./bundle
 
 .PHONY: bundle-build

diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
@@ -2581,6 +2581,12 @@ spec:
     spec:
       clusterPermissions:
       - rules:
+        - apiGroups:
+          - '*'
+          resources:
+          - '*'
+          verbs:
+          - '*'
         - nonResourceURLs:
           - /metrics
           verbs:
@@ -3633,6 +3639,8 @@ spec:
           - list
           - update
           - watch
+          - get
+          - patch
         serviceAccountName: dell-csm-operator-manager-service-account
       deployments:
       - label:
@@ -3646,6 +3654,8 @@ spec:
           strategy: {}
           template:
             metadata:
+              annotations:
+                storage.dell.com/CSMVersion: v1.10.0
               labels:
                 control-plane: controller-manager
             spec:
@@ -3668,6 +3678,61 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
+                env:
+                - name: RELATED_IMAGE_dell-csm-operator
+                  value: docker.io/dellemc/dell-csm-operator:v1.5.1
+                - name: RELATED_IMAGE_csi-isilon
+                  value: docker.io/dellemc/csi-isilon:v2.10.1
+                - name: RELATED_IMAGE_csi-powermax
+                  value: docker.io/dellemc/csi-powermax:v2.10.1
+                - name: RELATED_IMAGE_csipowermax-reverseproxy
+                  value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1
+                - name: RELATED_IMAGE_csi-powerstore
+                  value: docker.io/dellemc/csi-powerstore:v2.10.1
+                - name: RELATED_IMAGE_csi-unity
+                  value: docker.io/dellemc/csi-unity:v2.10.1
+                - name: RELATED_IMAGE_csi-vxflexos
+                  value: docker.io/dellemc/csi-vxflexos:v2.10.1
+                - name: RELATED_IMAGE_sdc
+                  value: docker.io/dellemc/sdc:4.5.1
+                - name: RELATED_IMAGE_karavi-authorization-proxy
+                  value: docker.io/dellemc/csm-authorization-sidecar:v1.10.1
+                - name: RELATED_IMAGE_dell-csi-replicator
+                  value: docker.io/dellemc/dell-csi-replicator:v1.8.1
+                - name: RELATED_IMAGE_dell-replication-controller-manager
+                  value: docker.io/dellemc/dell-replication-controller:v1.8.1
+                - name: RELATED_IMAGE_topology
+                  value: docker.io/dellemc/csm-topology:v1.8.1
+                - name: RELATED_IMAGE_otel-collector
+                  value: docker.io/otel/opentelemetry-collector:0.42.0
+                - name: RELATED_IMAGE_metrics-powerscale
+                  value: docker.io/dellemc/csm-metrics-powerscale:v1.5.1
+                - name: RELATED_IMAGE_metrics-powermax
+                  value: docker.io/dellemc/csm-metrics-powermax:v1.3.1
+                - name: RELATED_IMAGE_metrics-powerflex
+                  value: docker.io/dellemc/csm-metrics-powerflex:v1.8.1
+                - name: RELATED_IMAGE_podmon-node
+                  value: docker.io/dellemc/podmon:v1.9.1
+                - name: RELATED_IMAGE_kube-rbac-proxy
+                  value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+                - name: RELATED_IMAGE_attacher
+                  value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+                - name: RELATED_IMAGE_provisioner
+                  value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+                - name: RELATED_IMAGE_snapshotter
+                  value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+                - name: RELATED_IMAGE_registrar
+                  value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+                - name: RELATED_IMAGE_resizer
+                  value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+                - name: RELATED_IMAGE_externalhealthmonitorcontroller
+                  value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+                - name: RELATED_IMAGE_metadataretriever
+                  value: dellemc/csi-metadata-retriever:v1.7.2
+                - name: RELATED_IMAGE_dell-connectivity-client
+                  value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3
+                - name: RELATED_IMAGE_cert-persister
+                  value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
                 image: docker.io/dellemc/dell-csm-operator:v1.5.1
                 imagePullPolicy: Always
                 livenessProbe:

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -14,6 +14,8 @@ spec:
     metadata:
       labels:
         control-plane: controller-manager
+      annotations:
+        storage.dell.com/CSMVersion: v1.10.0
     spec:
       serviceAccountName: manager-service-account
       securityContext:
@@ -26,6 +28,61 @@ spec:
         image: controller:latest
         imagePullPolicy:  Always
         name: manager
+        env:
+        - value: docker.io/dellemc/dell-csm-operator:v1.5.0
+          name: RELATED_IMAGE_dell-csm-operator
+        - value: docker.io/dellemc/csi-isilon:v2.10.0
+          name: RELATED_IMAGE_csi-isilon
+        - value: docker.io/dellemc/csi-powermax:v2.10.0
+          name: RELATED_IMAGE_csi-powermax
+        - value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.0
+          name: RELATED_IMAGE_csipowermax-reverseproxy
+        - value: docker.io/dellemc/csi-powerstore:v2.10.0
+          name: RELATED_IMAGE_csi-powerstore
+        - value: docker.io/dellemc/csi-unity:v2.10.0
+          name: RELATED_IMAGE_csi-unity
+        - value: docker.io/dellemc/csi-vxflexos:v2.10.0
+          name: RELATED_IMAGE_csi-vxflexos
+        - value: docker.io/dellemc/sdc:4.5.1
+          name: RELATED_IMAGE_sdc
+        - value: docker.io/dellemc/csm-authorization-sidecar:v1.10.0
+          name: RELATED_IMAGE_karavi-authorization-proxy
+        - value: docker.io/dellemc/dell-csi-replicator:v1.8.0
+          name: RELATED_IMAGE_dell-csi-replicator
+        - value: docker.io/dellemc/dell-replication-controller:v1.8.0
+          name: RELATED_IMAGE_dell-replication-controller-manager
+        - value: docker.io/dellemc/csm-topology:v1.8.0
+          name: RELATED_IMAGE_topology
+        - value: docker.io/otel/opentelemetry-collector:0.42.0
+          name: RELATED_IMAGE_otel-collector
+        - value: docker.io/dellemc/csm-metrics-powerscale:v1.5.0
+          name: RELATED_IMAGE_metrics-powerscale
+        - value: docker.io/dellemc/csm-metrics-powermax:v1.3.0
+          name: RELATED_IMAGE_metrics-powermax
+        - value: docker.io/dellemc/csm-metrics-powerflex:v1.8.0
+          name: RELATED_IMAGE_metrics-powerflex
+        - value: docker.io/dellemc/podmon:v1.9.0
+          name: RELATED_IMAGE_podmon-node
+        - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+          name: RELATED_IMAGE_kube-rbac-proxy
+        - value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+          name: RELATED_IMAGE_attacher
+        - value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+          name: RELATED_IMAGE_provisioner
+        - value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+          name: RELATED_IMAGE_snapshotter
+        - value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+          name: RELATED_IMAGE_registrar
+        - value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+          name: RELATED_IMAGE_resizer
+        - value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+          name: RELATED_IMAGE_externalhealthmonitorcontroller
+        - value: dellemc/csi-metadata-retriever:v1.7.2
+          name: RELATED_IMAGE_metadataretriever
+        - value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3
+          name: RELATED_IMAGE_dell-connectivity-client
+        - value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
+          name: RELATED_IMAGE_cert-persister
         securityContext:
           allowPrivilegeEscalation: false
         livenessProbe:

diff --git a/config/rbac/application_mobility_clusterrole.yaml b/config/rbac/application_mobility_clusterrole.yaml
@@ -0,0 +1,11 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: application-mobility-velero-server
+rules:
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - '*'
diff --git a/config/rbac/application_mobility_role_binding.yaml b/config/rbac/application_mobility_role_binding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: application-mobility-velero-server-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: application-mobility-velero-server
+subjects:
+- kind: ServiceAccount
+  name: dell-csm-operator-manager-service-account
+  namespace: dell-csm-operator
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -15,3 +15,6 @@ resources:
 - auth_proxy_role.yaml
 - auth_proxy_role_binding.yaml
 - auth_proxy_client_clusterrole.yaml
+
+- application_mobility_clusterrole.yaml
+- application_mobility_role_binding.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1058,3 +1058,5 @@ rules:
   - list
   - update
   - watch
+  - get
+  - patch
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -46,6 +46,18 @@ rules:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
+metadata:
+  name: dell-csm-operator-application-mobility-velero-server
+rules:
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: dell-csm-operator-manager-role
@@ -1150,36 +1162,24 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: dell-csm-operator-manager-rolebinding
+  name: dell-csm-operator-application-mobility-velero-server-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: dell-csm-operator-manager-role
+  name: dell-csm-operator-application-mobility-velero-server
 subjects:
 - kind: ServiceAccount
   name: dell-csm-operator-manager-service-account
   namespace: dell-csm-operator
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: application-mobility-velero-server
-rules:
-- apiGroups:
-  - '*'
-  resources:
-  - '*'
-  verbs:
-  - '*'
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: application-mobility-velero-server-rolebinding
+  name: dell-csm-operator-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: application-mobility-velero-server
+  name: dell-csm-operator-manager-role
 subjects:
 - kind: ServiceAccount
   name: dell-csm-operator-manager-service-account
@@ -1247,16 +1247,71 @@ spec:
       control-plane: controller-manager
   template:
     metadata:
-      labels:
-        control-plane: controller-manager
       annotations:
         storage.dell.com/CSMVersion: v1.10.2
+      labels:
+        control-plane: controller-manager
     spec:
       containers:
       - args:
         - --leader-elect
         command:
         - /manager
+        env:
+        - name: RELATED_IMAGE_dell-csm-operator
+          value: docker.io/dellemc/dell-csm-operator:v1.5.1
+        - name: RELATED_IMAGE_csi-isilon
+          value: docker.io/dellemc/csi-isilon:v2.10.1
+        - name: RELATED_IMAGE_csi-powermax
+          value: docker.io/dellemc/csi-powermax:v2.10.1
+        - name: RELATED_IMAGE_csipowermax-reverseproxy
+          value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1
+        - name: RELATED_IMAGE_csi-powerstore
+          value: docker.io/dellemc/csi-powerstore:v2.10.1
+        - name: RELATED_IMAGE_csi-unity
+          value: docker.io/dellemc/csi-unity:v2.10.1
+        - name: RELATED_IMAGE_csi-vxflexos
+          value: docker.io/dellemc/csi-vxflexos:v2.10.1
+        - name: RELATED_IMAGE_sdc
+          value: docker.io/dellemc/sdc:4.5.1
+        - name: RELATED_IMAGE_karavi-authorization-proxy
+          value: docker.io/dellemc/csm-authorization-sidecar:v1.10.1
+        - name: RELATED_IMAGE_dell-csi-replicator
+          value: docker.io/dellemc/dell-csi-replicator:v1.8.1
+        - name: RELATED_IMAGE_dell-replication-controller-manager
+          value: docker.io/dellemc/dell-replication-controller:v1.8.1
+        - name: RELATED_IMAGE_topology
+          value: docker.io/dellemc/csm-topology:v1.8.1
+        - name: RELATED_IMAGE_otel-collector
+          value: docker.io/otel/opentelemetry-collector:0.42.0
+        - name: RELATED_IMAGE_metrics-powerscale
+          value: docker.io/dellemc/csm-metrics-powerscale:v1.5.1
+        - name: RELATED_IMAGE_metrics-powermax
+          value: docker.io/dellemc/csm-metrics-powermax:v1.3.1
+        - name: RELATED_IMAGE_metrics-powerflex
+          value: docker.io/dellemc/csm-metrics-powerflex:v1.8.1
+        - name: RELATED_IMAGE_podmon-node
+          value: docker.io/dellemc/podmon:v1.9.1
+        - name: RELATED_IMAGE_kube-rbac-proxy
+          value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+        - name: RELATED_IMAGE_attacher
+          value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+        - name: RELATED_IMAGE_provisioner
+          value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+        - name: RELATED_IMAGE_snapshotter
+          value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+        - name: RELATED_IMAGE_registrar
+          value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+        - name: RELATED_IMAGE_resizer
+          value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+        - name: RELATED_IMAGE_externalhealthmonitorcontroller
+          value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+        - name: RELATED_IMAGE_metadataretriever
+          value: dellemc/csi-metadata-retriever:v1.7.2
+        - name: RELATED_IMAGE_dell-connectivity-client
+          value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3
+        - name: RELATED_IMAGE_cert-persister
+          value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
         image: docker.io/dellemc/dell-csm-operator:v1.5.1
         imagePullPolicy: Always
         livenessProbe:
-Original file line number
+Diff line change
@@ Expand Up / @@ -1058,3 +1058,5 @@ rules: @@
       - list
       - update
       - watch
+      - get
+      - patch