Fix dell-replication-controller-config reconcile reset issue

.github/workflows/actions.yml

@@ -80,7 +80,7 @@ jobs:
           podman save docker.io/library/csm-operator -o /tmp/csm-operator.tar
           docker load -i /tmp/csm-operator.tar
       - name: Scan controller Image
-        uses: aquasecurity/trivy-action@0.24.0
+        uses: aquasecurity/trivy-action@0.28.0
         with:
           image-ref: csm-operator:latest
           severity: 'HIGH'

Makefile

@@ -85,6 +85,9 @@ driver-unit-test:
 module-unit-test:
 	go clean -cache && go test -v -coverprofile=c.out github.com/dell/csm-operator/pkg/modules
 
+utils-unit-test:
+	go clean -cache && go test -v -coverprofile=c.out github.com/dell/csm-operator/pkg/utils
+
 .PHONY: actions
 actions: ## Run all the github action checks that run on a pull_request creation
 	act -l | grep -v ^Stage | grep pull_request | grep -v image_security_scan | awk '{print $$2}' | while read WF; do act pull_request --no-cache-server --platform ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest --job "$${WF}"; done

config/manager/manager.yaml

@@ -31,37 +31,37 @@ spec:
           env:
             - value: docker.io/dellemc/dell-csm-operator:v1.7.0
               name: RELATED_IMAGE_dell-csm-operator
-            - value: docker.io/dellemc/csi-isilon:v2.12.0
+            - value: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0
               name: RELATED_IMAGE_csi-isilon
-            - value: docker.io/dellemc/csi-powermax:v2.12.0
+            - value: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0
               name: RELATED_IMAGE_csi-powermax
-            - value: docker.io/dellemc/csipowermax-reverseproxy:v2.11.0
+            - value: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
               name: RELATED_IMAGE_csipowermax-reverseproxy
-            - value: docker.io/dellemc/csi-powerstore:v2.12.0
+            - value: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0
               name: RELATED_IMAGE_csi-powerstore
-            - value: docker.io/dellemc/csi-unity:v2.12.0
+            - value: quay.io/dell/container-storage-modules/csi-unity:v2.12.0
               name: RELATED_IMAGE_csi-unity
-            - value: docker.io/dellemc/csi-vxflexos:v2.12.0
+            - value: quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0
               name: RELATED_IMAGE_csi-vxflexos
             - value: docker.io/dellemc/sdc:4.5.2.1
               name: RELATED_IMAGE_sdc
-            - value: docker.io/dellemc/csm-authorization-sidecar:v1.12.0
+            - value: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0
               name: RELATED_IMAGE_karavi-authorization-proxy
-            - value: docker.io/dellemc/dell-csi-replicator:v1.12.0
+            - value: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.12.0
               name: RELATED_IMAGE_dell-csi-replicator
-            - value: docker.io/dellemc/dell-replication-controller:v1.10.0
+            - value: quay.io/dell/container-storage-modules/dell-replication-controller:v1.10.0
               name: RELATED_IMAGE_dell-replication-controller-manager
-            - value: docker.io/dellemc/csm-topology:v1.10.0
+            - value: quay.io/dell/container-storage-modules/csm-topology:v1.10.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.7.0
+            - value: quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.7.0
               name: RELATED_IMAGE_metrics-powerscale
-            - value: docker.io/dellemc/csm-metrics-powermax:v1.5.0
+            - value: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.5.0
               name: RELATED_IMAGE_metrics-powermax
-            - value: docker.io/dellemc/csm-metrics-powerflex:v1.10.0
+            - value: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0
               name: RELATED_IMAGE_metrics-powerflex
-            - value: docker.io/dellemc/podmon:v1.11.0
+            - value: quay.io/dell/container-storage-modules/podmon:v1.11.0
               name: RELATED_IMAGE_podmon-node
             - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9:v4.16.0-202409051837.p0.g8ea2c99.assembly.stream.el9
               name: RELATED_IMAGE_kube-rbac-proxy
@@ -77,7 +77,7 @@ spec:
               name: RELATED_IMAGE_resizer
             - value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
               name: RELATED_IMAGE_externalhealthmonitorcontroller
-            - value: dellemc/csi-metadata-retriever:v1.8.0
+            - value: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.8.0
               name: RELATED_IMAGE_metadataretriever
             - value: docker.io/dellemc/connectivity-client-docker-k8s:1.19.0
               name: RELATED_IMAGE_dell-connectivity-client

config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml

@@ -2448,37 +2448,37 @@ spec:
   relatedImages:
     - image: docker.io/dellemc/dell-csm-operator:v1.7.0
       name: dell-csm-operator
-    - image: docker.io/dellemc/csi-isilon:v2.12.0
+    - image: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0
       name: csi-isilon
-    - image: docker.io/dellemc/csi-powermax:v2.12.0s
+    - image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0s
       name: csi-powermax
-    - image: docker.io/dellemc/csipowermax-reverseproxy:v2.11.0
+    - image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
       name: csipowermax-reverseproxy
-    - image: docker.io/dellemc/csi-powerstore:v2.12.0
+    - image: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0
       name: csi-powerstore
-    - image: docker.io/dellemc/csi-unity:v2.12.0
+    - image: quay.io/dell/container-storage-modules/csi-unity:v2.12.0
       name: csi-unity
-    - image: docker.io/dellemc/csi-vxflexos:v2.12.0
+    - image: quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0
       name: csi-vxflexos
     - image: docker.io/dellemc/sdc:4.5.2.1
       name: sdc
-    - image: docker.io/dellemc/csm-authorization-sidecar:v1.12.0
+    - image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0
       name: karavi-authorization-proxy
-    - image: docker.io/dellemc/dell-csi-replicator:v1.10.0
+    - image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
       name: dell-csi-replicator
-    - image: docker.io/dellemc/dell-replication-controller:v1.10.0
+    - image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.10.0
       name: dell-replication-controller-manager
-    - image: docker.io/dellemc/csm-topology:v1.10.0
+    - image: quay.io/dell/container-storage-modules/csm-topology:v1.10.0
       name: topology
     - image: docker.io/otel/opentelemetry-collector:0.42.0
       name: otel-collector
-    - image: docker.io/dellemc/csm-metrics-powerscale:v1.7.0
+    - image: quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.7.0
       name: metrics-powerscale
-    - image: docker.io/dellemc/csm-metrics-powermax:v1.5.0
+    - image: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.5.0
       name: metrics-powermax
-    - image: docker.io/dellemc/csm-metrics-powerflex:v1.10.0
+    - image: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0
       name: metrics-powerflex
-    - image: docker.io/dellemc/podmon:v1.11.0
+    - image: quay.io/dell/container-storage-modules/podmon:v1.11.0
       name: podmon-node
     - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9:v4.16.0-202409051837.p0.g8ea2c99.assembly.stream.el9
       name: kube-rbac-proxy
@@ -2494,7 +2494,7 @@ spec:
       name: resizer
     - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
       name: externalhealthmonitorcontroller
-    - image: dellemc/csi-metadata-retriever:v1.8.0
+    - image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.8.0
       name: metadataretriever
     - image: docker.io/dellemc/connectivity-client-docker-k8s:1.19.0
       name: dell-connectivity-client

config/samples/storage_v1_csm_powerflex.yaml

@@ -23,7 +23,7 @@ spec:
     forceUpdate: false
     forceRemoveDriver: true
     common:
-      image: "dellemc/csi-vxflexos:v2.12.0"
+      image: "quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0"
       imagePullPolicy: IfNotPresent
       envs:
         - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT
@@ -55,7 +55,7 @@ spec:
       - name: snapshotter
         image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
       - name: csi-metadata-retriever
-        image: dellemc/csi-metadata-retriever:v1.8.0
+        image: quay.io/dell/container-storage-modulescsi-metadata-retriever:v1.8.0
         # sdc-monitor is disabled by default, due to high CPU usage
       - name: sdc-monitor
         enabled: false
@@ -197,7 +197,7 @@ spec:
       components:
         - name: karavi-authorization-proxy
           # Use image: dellemc/csm-authorization-sidecar:v2.0.0-alpha for PowerFlex Tech-Preview v2.0.0-alpha
-          image: dellemc/csm-authorization-sidecar:v1.12.0
+          image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0
           envs:
             # proxyHost: hostname of the csm-authorization server
             - name: "PROXY_HOST"
@@ -216,7 +216,7 @@ spec:
           enabled: false
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-topology:v1.10.0
+          image: quay.io/dell/container-storage-modules/csm-topology:v1.10.0
           # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates
           #  for self-signed certs, leave empty string
           # Allowed values: string
@@ -248,9 +248,9 @@ spec:
           envs:
             # image of nginx proxy image
             # Allowed values: string
-            # Default value: "nginxinc/nginx-unprivileged:1.20"
+            # Default value: "nginxinc/nginx-unprivileged:1.27"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.20"
+              value: "nginxinc/nginx-unprivileged:1.27"
         # enabled: Enable/Disable cert-manager
         # Allowed values:
         #   true: enable deployment of cert-manager
@@ -262,7 +262,7 @@ spec:
           # enabled: Enable/Disable PowerFlex metrics
           enabled: false
           # image: Defines PowerFlex metrics image. This shouldn't be changed
-          image: dellemc/csm-metrics-powerflex:v1.10.0
+          image: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0
           envs:
             # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex
             # Allowed values: int
@@ -329,7 +329,7 @@ spec:
           # image: Image to use for dell-csi-replicator. This shouldn't be changed
           # Allowed values: string
           # Default value: None
-          image: dellemc/dell-csi-replicator:v1.10.0
+          image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
           envs:
             # replicationPrefix: prefix to prepend to storage classes parameters
             # Allowed values: string
@@ -343,7 +343,7 @@ spec:
         - name: dell-replication-controller-manager
           # image: Defines controller image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/dell-replication-controller:v1.10.0
+          image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.10.0
           envs:
             # TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
             # Set the value to "self" in case of stretched/single cluster configuration
@@ -379,7 +379,7 @@ spec:
       configVersion: v1.11.0
       components:
         - name: podmon-controller
-          image: dellemc/podmon:v1.11.0
+          image: quay.io/dell/container-storage-modules/podmon:v1.11.0
           imagePullPolicy: IfNotPresent
           args:
             - "--labelvalue=csi-vxflexos"
@@ -393,7 +393,7 @@ spec:
             - "--mode=controller"
             - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml"
         - name: podmon-node
-          image: dellemc/podmon:v1.11.0
+          image: quay.io/dell/container-storage-modules/podmon:v1.11.0
           imagePullPolicy: IfNotPresent
           envs:
             # podmonAPIPort: Defines the port to be used within the kubernetes cluster

config/samples/storage_v1_csm_powermax.yaml

@@ -44,7 +44,7 @@ spec:
     forceUpdate: false
     forceRemoveDriver: true
     common:
-      image: dellemc/csi-powermax:v2.12.0
+      image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0
       # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container.
       # Allowed values:
       #  Always: Always pull the image.
@@ -232,7 +232,7 @@ spec:
       - name: snapshotter
         image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
       - name: csi-metadata-retriever
-        image: dellemc/csi-metadata-retriever:v1.8.0
+        image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.8.0
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor
         enabled: false
@@ -254,7 +254,7 @@ spec:
         - name: csipowermax-reverseproxy
           # image: Define the container images used for the reverse proxy
           # Default value: None
-          image: dellemc/csipowermax-reverseproxy:v2.11.0
+          image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
           envs:
             # "tlsSecret" defines the TLS secret that is created with certificate
             # and its associated key
@@ -278,7 +278,7 @@ spec:
       configVersion: v1.12.0
       components:
         - name: karavi-authorization-proxy
-          image: dellemc/csm-authorization-sidecar:v1.12.0
+          image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0
           envs:
             # proxyHost: hostname of the csm-authorization server
             - name: "PROXY_HOST"
@@ -301,7 +301,7 @@ spec:
           # image: Image to use for dell-csi-replicator. This shouldn't be changed
           # Allowed values: string
           # Default value: None
-          image: dellemc/dell-csi-replicator:v1.10.0
+          image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
           envs:
             # replicationPrefix: prefix to prepend to storage classes parameters
             # Allowed values: string
@@ -316,7 +316,7 @@ spec:
         - name: dell-replication-controller-manager
           # image: Defines controller image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/dell-replication-controller:v1.10.0
+          image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.10.0
           envs:
             # TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
             # Set the value to "self" in case of stretched/single cluster configuration
@@ -353,7 +353,7 @@ spec:
           enabled: false
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-topology:v1.10.0
+          image: quay.io/dell/container-storage-modules/csm-topology:v1.10.0
           # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates
           #  for self-signed certs, leave empty string
           # Allowed values: string
@@ -385,9 +385,9 @@ spec:
           envs:
             # image of nginx proxy image
             # Allowed values: string
-            # Default value: "nginxinc/nginx-unprivileged:1.20"
+            # Default value: "nginxinc/nginx-unprivileged:1.27"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.20"
+              value: "nginxinc/nginx-unprivileged:1.27"
         - name: cert-manager
           # enabled: Enable/Disable cert-manager
           # Allowed values:
@@ -399,7 +399,7 @@ spec:
           # enabled: Enable/Disable PowerMax metrics
           enabled: false
           # image: Defines PowerMax metrics image. This shouldn't be changed
-          image: dellemc/csm-metrics-powermax:v1.5.0
+          image: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.5.0
           envs:
             # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax
             # Allowed values: int
@@ -454,7 +454,7 @@ spec:
       configVersion: v1.11.0
       components:
         - name: podmon-controller
-          image: dellemc/podmon:v1.11.0
+          image: quay.io/dell/container-storage-modules/podmon:v1.11.0
           imagePullPolicy: IfNotPresent
           args:
             - "--labelvalue=csi-powermax"
@@ -469,7 +469,7 @@ spec:
             - "--driver-config-params=/powermax-config-params/driver-config-params.yaml"
             - "--driverPath=csi-powermax.dellemc.com"
         - name: podmon-node
-          image: dellemc/podmon:v1.11.0
+          image: quay.io/dell/container-storage-modules/podmon:v1.11.0
           imagePullPolicy: IfNotPresent
           envs:
             # podmonAPIPort: Defines the port to be used within the kubernetes cluster