[bug-1574]: Fix offline bundle registry references

bundle/manifests/dell-csm-operator.clusterserviceversion.yaml

@@ -253,10 +253,10 @@ metadata:
                     "envs": [
                       {
                         "name": "NGINX_PROXY_IMAGE",
-                        "value": "nginxinc/nginx-unprivileged:1.27"
+                        "value": "docker.io/nginxinc/nginx-unprivileged:1.27"
                       }
                     ],
-                    "image": "otel/opentelemetry-collector:0.42.0",
+                    "image": "docker.io/otel/opentelemetry-collector:0.42.0",
                     "name": "otel-collector",
                     "privateKey": ""
                   },
@@ -653,10 +653,10 @@ metadata:
                     "envs": [
                       {
                         "name": "NGINX_PROXY_IMAGE",
-                        "value": "nginxinc/nginx-unprivileged:1.27"
+                        "value": "docker.io/nginxinc/nginx-unprivileged:1.27"
                       }
                     ],
-                    "image": "otel/opentelemetry-collector:0.42.0",
+                    "image": "docker.io/otel/opentelemetry-collector:0.42.0",
                     "name": "otel-collector",
                     "privateKey": ""
                   },
@@ -1126,7 +1126,7 @@ metadata:
                       "value": "10.xx.xx.xx,10.xx.xx.xx"
                     }
                   ],
-                  "image": "dellemc/sdc:4.5.2.1",
+                  "image": "docker.io/dellemc/sdc:4.5.2.1",
                   "imagePullPolicy": "IfNotPresent",
                   "name": "sdc"
                 }
@@ -1202,7 +1202,7 @@ metadata:
                       "value": "10.xx.xx.xx,10.xx.xx.xx"
                     }
                   ],
-                  "image": "dellemc/sdc:4.5.2.1",
+                  "image": "docker.io/dellemc/sdc:4.5.2.1",
                   "name": "sdc-monitor"
                 },
                 {
@@ -1258,10 +1258,10 @@ metadata:
                     "envs": [
                       {
                         "name": "NGINX_PROXY_IMAGE",
-                        "value": "nginxinc/nginx-unprivileged:1.27"
+                        "value": "docker.io/nginxinc/nginx-unprivileged:1.27"
                       }
                     ],
-                    "image": "otel/opentelemetry-collector:0.42.0",
+                    "image": "docker.io/otel/opentelemetry-collector:0.42.0",
                     "name": "otel-collector",
                     "privateKey": ""
                   },

config/samples/storage_v1_csm_powerflex.yaml

@@ -59,7 +59,7 @@ spec:
         # sdc-monitor is disabled by default, due to high CPU usage
       - name: sdc-monitor
         enabled: false
-        image: dellemc/sdc:4.5.2.1
+        image: docker.io/dellemc/sdc:4.5.2.1
         envs:
           - name: HOST_PID
             value: "1"
@@ -180,7 +180,7 @@ spec:
       #   operator: "Exists"
       #   effect: "NoSchedule"
     initContainers:
-      - image: dellemc/sdc:4.5.2.1
+      - image: docker.io/dellemc/sdc:4.5.2.1
         imagePullPolicy: IfNotPresent
         name: sdc
         envs:
@@ -236,7 +236,7 @@ spec:
           enabled: false
           # image: Defines otel-collector image. This shouldn't be changed
           # Allowed values: string
-          image: otel/opentelemetry-collector:0.42.0
+          image: docker.io/otel/opentelemetry-collector:0.42.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
@@ -250,7 +250,7 @@ spec:
             # Allowed values: string
             # Default value: "nginxinc/nginx-unprivileged:1.27"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.27"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.27"
         # enabled: Enable/Disable cert-manager
         # Allowed values:
         #   true: enable deployment of cert-manager

config/samples/storage_v1_csm_powermax.yaml

@@ -373,7 +373,7 @@ spec:
           enabled: false
           # image: Defines otel-collector image. This shouldn't be changed
           # Allowed values: string
-          image: otel/opentelemetry-collector:0.42.0
+          image: docker.io/otel/opentelemetry-collector:0.42.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
@@ -387,7 +387,7 @@ spec:
             # Allowed values: string
             # Default value: "nginxinc/nginx-unprivileged:1.27"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.27"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.27"
         - name: cert-manager
           # enabled: Enable/Disable cert-manager
           # Allowed values:

config/samples/storage_v1_csm_powerscale.yaml

@@ -350,7 +350,7 @@ spec:
           enabled: false
           # image: Defines otel-collector image. This shouldn't be changed
           # Allowed values: string
-          image: otel/opentelemetry-collector:0.42.0
+          image: docker.io/otel/opentelemetry-collector:0.42.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
@@ -364,7 +364,7 @@ spec:
             # Allowed values: string
             # Default value: "nginxinc/nginx-unprivileged:1.27"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.27"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.27"
         - name: cert-manager
           # enabled: Enable/Disable cert-manager
           # Allowed values:

operatorconfig/driverconfig/common/default.yaml

@@ -18,6 +18,6 @@ images:
   # container.
   externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
   # "images.sdcmonitor" defines the container images used to monitor sdc container
-  sdcmonitor: dellemc/sdc:4.5.2.1
+  sdcmonitor: docker.io/dellemc/sdc:4.5.2.1
   # "images.metadataretriever" defines the container images used for csi metadata retriever
   metadataretriever: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0

pkg/modules/authorization_test.go

@@ -225,6 +225,17 @@ func TestAuthInjectDeployment(t *testing.T) {
 			}
 			return true, true, controllerYAML.Deployment, operatorConfig, customResource
 		},
+		"success - greenfield injection missing skip certificate validation env": func(*testing.T) (bool, bool, applyv1.DeploymentApplyConfiguration, utils.OperatorConfig, csmv1.ContainerStorageModule) {
+			customResource, err := getCustomResource("./testdata/cr_powerscale_auth_missing_skip_cert_env.yaml")
+			if err != nil {
+				panic(err)
+			}
+			controllerYAML, err := drivers.GetController(ctx, customResource, operatorConfig, csmv1.PowerScaleName)
+			if err != nil {
+				panic(err)
+			}
+			return true, true, controllerYAML.Deployment, operatorConfig, customResource
+		},
 		"success - brownfield injection": func(*testing.T) (bool, bool, applyv1.DeploymentApplyConfiguration, utils.OperatorConfig, csmv1.ContainerStorageModule) {
 			customResource, err := getCustomResource("./testdata/cr_powerscale_auth.yaml")
 			if err != nil {

pkg/modules/testdata/cr_powerscale_auth_missing_skip_cert_env.yaml

@@ -0,0 +1,25 @@
+apiVersion: storage.dell.com/v1
+kind: ContainerStorageModule
+metadata:
+  name: isilon
+  namespace: isilon
+spec:
+  driver:
+    csiDriverType: "isilon"
+    configVersion: v2.12.0
+    authSecret: isilon-creds-custom
+    replicas: 1
+    common:
+      image: "quay.io/dell/container-storage-modules/csi-isilon:v2.12.0"
+      imagePullPolicy: IfNotPresent
+  modules:
+    - name: authorization
+      # enable: Enable/Disable csm-authorization
+      enabled: true
+      components:
+        - name: karavi-authorization-proxy
+          image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0
+          envs:
+            # proxyHost: hostname of the csm-authorization server
+            - name: "PROXY_HOST"
+              value: "testing-proxy-host"

samples/authorization/csm_authorization_proxy_server_v1101.yaml

@@ -30,12 +30,12 @@ spec:
         - name: proxy-server
           # enable: Enable/Disable csm-authorization proxy server
           enabled: true
-          proxyService: dellemc/csm-authorization-proxy:v1.10.1
-          tenantService: dellemc/csm-authorization-tenant:v1.10.1
-          roleService: dellemc/csm-authorization-role:v1.10.1
-          storageService: dellemc/csm-authorization-storage:v1.10.1
-          opa: openpolicyagent/opa
-          opaKubeMgmt: openpolicyagent/kube-mgmt:0.11
+          proxyService: docker.io/dellemc/csm-authorization-proxy:v1.10.1
+          tenantService: docker.io/dellemc/csm-authorization-tenant:v1.10.1
+          roleService: docker.io/dellemc/csm-authorization-role:v1.10.1
+          storageService: docker.io/dellemc/csm-authorization-storage:v1.10.1
+          opa: docker.io/openpolicyagent/opa:latest
+          opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:0.11
           # certificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates
           # for self-signed certs, leave empty string
           # Allowed values: string
@@ -58,8 +58,8 @@ spec:
               # additional annotations for the proxy-server ingress
               annotations: {}
         - name: redis
-          redis: redis:6.0.8-alpine
-          commander: rediscommander/redis-commander:latest
+          redis: docker.io/redis:6.0.8-alpine
+          commander: docker.io/rediscommander/redis-commander:latest
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis
           # to use a different storage class for redis, specify the name of the storage class
           # NOTE: the storage class must NOT be a storage class provisioned by a CSI driver using this installation of CSM Authorization

samples/authorization/csm_authorization_proxy_server_v1110.yaml

@@ -30,12 +30,12 @@ spec:
         - name: proxy-server
           # enable: Enable/Disable csm-authorization proxy server
           enabled: true
-          proxyService: dellemc/csm-authorization-proxy:v1.11.0
-          tenantService: dellemc/csm-authorization-tenant:v1.11.0
-          roleService: dellemc/csm-authorization-role:v1.11.0
-          storageService: dellemc/csm-authorization-storage:v1.11.0
-          opa: openpolicyagent/opa
-          opaKubeMgmt: openpolicyagent/kube-mgmt:0.11
+          proxyService: docker.io/dellemc/csm-authorization-proxy:v1.11.0
+          tenantService: docker.io/dellemc/csm-authorization-tenant:v1.11.0
+          roleService: docker.io/dellemc/csm-authorization-role:v1.11.0
+          storageService: docker.io/dellemc/csm-authorization-storage:v1.11.0
+          opa: docker.io/openpolicyagent/opa:latest
+          opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:0.11
           # certificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates
           # for self-signed certs, leave empty string
           # Allowed values: string
@@ -58,8 +58,8 @@ spec:
               # additional annotations for the proxy-server ingress
               annotations: {}
         - name: redis
-          redis: redis:6.0.8-alpine
-          commander: rediscommander/redis-commander:latest
+          redis: docker.io/redis:6.0.8-alpine
+          commander: docker.io/rediscommander/redis-commander:latest
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis
           # to use a different storage class for redis, specify the name of the storage class
           # NOTE: the storage class must NOT be a storage class provisioned by a CSI driver using this installation of CSM Authorization

samples/authorization/csm_authorization_proxy_server_v1120.yaml

@@ -34,8 +34,8 @@ spec:
           tenantService: quay.io/dell/container-storage-modules/csm-authorization-tenant:v1.12.0
           roleService: quay.io/dell/container-storage-modules/csm-authorization-role:v1.12.0
           storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v1.12.0
-          opa: openpolicyagent/opa
-          opaKubeMgmt: openpolicyagent/kube-mgmt:8.5.7
+          opa: docker.io/openpolicyagent/opa:latest
+          opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:8.5.7
           # certificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates
           # for self-signed certs, leave empty string
           # Allowed values: string
@@ -58,8 +58,8 @@ spec:
               # additional annotations for the proxy-server ingress
               annotations: {}
         - name: redis
-          redis: redis:7.4.0-alpine
-          commander: rediscommander/redis-commander:latest
+          redis: docker.io/redis:7.4.0-alpine
+          commander: docker.io/rediscommander/redis-commander:latest
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis
           # to use a different storage class for redis, specify the name of the storage class
           # NOTE: the storage class must NOT be a storage class provisioned by a CSI driver using this installation of CSM Authorization

samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml

@@ -30,17 +30,17 @@ spec:
         - name: proxy-server
           # enable: Enable/Disable csm-authorization proxy server
           enabled: true
-          proxyService: dellemc/csm-authorization-proxy:v2.0.0-alpha
+          proxyService: docker.io/dellemc/csm-authorization-proxy:v2.0.0-alpha
           proxyServiceReplicas: 1
-          tenantService: dellemc/csm-authorization-tenant:v2.0.0-alpha
+          tenantService: docker.io/dellemc/csm-authorization-tenant:v2.0.0-alpha
           tenantServiceReplicas: 1
-          roleService: dellemc/csm-authorization-role:v2.0.0-alpha
+          roleService: docker.io/dellemc/csm-authorization-role:v2.0.0-alpha
           roleServiceReplicas: 1
-          storageService: dellemc/csm-authorization-storage:v2.0.0-alpha
+          storageService: docker.io/dellemc/csm-authorization-storage:v2.0.0-alpha
           storageServiceReplicas: 1
-          opa: openpolicyagent/opa
-          opaKubeMgmt: openpolicyagent/kube-mgmt:0.11
-          authorizationController: dellemc/csm-authorization-controller:v2.0.0-alpha
+          opa: docker.io/openpolicyagent/opa:latest
+          opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:0.11
+          authorizationController: docker.io/dellemc/csm-authorization-controller:v2.0.0-alpha
           authorizationControllerReplicas: 1
           leaderElection: true
           # controllerReconcileInterval: interval for the authorization controllers to reconcile with Redis.
@@ -67,8 +67,8 @@ spec:
               # additional annotations for the proxy-server ingress
               annotations: {}
         - name: redis
-          redis: redis:7.2.4-alpine
-          commander: rediscommander/redis-commander:latest
+          redis: docker.io/redis:7.2.4-alpine
+          commander: docker.io/rediscommander/redis-commander:latest
           redisName: redis-csm
           redisCommander: rediscommander
           sentinel: sentinel

samples/authorization/csm_authorization_proxy_server_v200.yaml

@@ -38,8 +38,8 @@ spec:
           roleServiceReplicas: 1
           storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.0.0
           storageServiceReplicas: 1
-          opa: openpolicyagent/opa
-          opaKubeMgmt: openpolicyagent/kube-mgmt:8.5.7
+          opa: docker.io/openpolicyagent/opa:latest
+          opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:8.5.7
           authorizationController: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.0.0
           authorizationControllerReplicas: 1
           leaderElection: true
@@ -69,8 +69,8 @@ spec:
           # openTelemetryCollectorAddress: the OTLP receiving endpoint using gRPC
           openTelemetryCollectorAddress: ""
         - name: redis
-          redis: redis:7.4.0-alpine
-          commander: rediscommander/redis-commander:latest
+          redis: docker.io/redis:7.4.0-alpine
+          commander: docker.io/rediscommander/redis-commander:latest
           redisName: redis-csm
           redisCommander: rediscommander
           sentinel: sentinel

samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml

@@ -189,7 +189,7 @@ spec:
       configVersion: v1.11.0
       components:
         - name: karavi-authorization-proxy
-          # Use image: dellemc/csm-authorization-sidecar:v2.0.0-alpha for PowerFlex Tech-Preview v2.0.0-alpha
+          # Use image: docker.io/dellemc/csm-authorization-sidecar:v2.0.0-alpha for PowerFlex Tech-Preview v2.0.0-alpha
           image: registry.connect.redhat.com/dell-emc/csm-authorization-sidecar@sha256:5d3f43f2c1bb0704ddf4b9d8f9218cc2d77cabcd73ec9e7076f4865809d2fc5d
           envs:
             # proxyHost: hostname of the csm-authorization server
@@ -241,9 +241,9 @@ spec:
           envs:
             # image of nginx proxy image
             # Allowed values: string
-            # Default value: "nginxinc/nginx-unprivileged:1.20"
+            # Default value: "docker.io/nginxinc/nginx-unprivileged:1.20"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.20"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.20"
         # enabled: Enable/Disable cert-manager
         # Allowed values:
         #   true: enable deployment of cert-manager

samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml

@@ -385,9 +385,9 @@ spec:
           envs:
             # image of nginx proxy image
             # Allowed values: string
-            # Default value: "nginxinc/nginx-unprivileged:1.20"
+            # Default value: "docker.io/nginxinc/nginx-unprivileged:1.20"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.20"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.20"
         - name: cert-manager
           # enabled: Enable/Disable cert-manager
           # Allowed values:

samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml

@@ -362,9 +362,9 @@ spec:
           envs:
             # image of nginx proxy image
             # Allowed values: string
-            # Default value: "nginxinc/nginx-unprivileged:1.20"
+            # Default value: "docker.io/nginxinc/nginx-unprivileged:1.20"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.20"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.20"
         - name: cert-manager
           # enabled: Enable/Disable cert-manager
           # Allowed values:

samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml

@@ -189,7 +189,7 @@ spec:
       configVersion: v1.11.0
       components:
         - name: karavi-authorization-proxy
-          # Use image: dellemc/csm-authorization-sidecar:v2.0.0-alpha for PowerFlex Tech-Preview v2.0.0-alpha
+          # Use image: docker.io/dellemc/csm-authorization-sidecar:v2.0.0-alpha for PowerFlex Tech-Preview v2.0.0-alpha
           image: registry.connect.redhat.com/dell-emc/csm-authorization-sidecar@sha256:5d3f43f2c1bb0704ddf4b9d8f9218cc2d77cabcd73ec9e7076f4865809d2fc5d
           envs:
             # proxyHost: hostname of the csm-authorization server
@@ -241,9 +241,9 @@ spec:
           envs:
             # image of nginx proxy image
             # Allowed values: string
-            # Default value: "nginxinc/nginx-unprivileged:1.20"
+            # Default value: "docker.io/nginxinc/nginx-unprivileged:1.20"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.20"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.20"
         # enabled: Enable/Disable cert-manager
         # Allowed values:
         #   true: enable deployment of cert-manager

samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml

@@ -385,9 +385,9 @@ spec:
           envs:
             # image of nginx proxy image
             # Allowed values: string
-            # Default value: "nginxinc/nginx-unprivileged:1.20"
+            # Default value: "docker.io/nginxinc/nginx-unprivileged:1.20"
             - name: "NGINX_PROXY_IMAGE"
-              value: "nginxinc/nginx-unprivileged:1.20"
+              value: "docker.io/nginxinc/nginx-unprivileged:1.20"
         - name: cert-manager
           # enabled: Enable/Disable cert-manager
           # Allowed values: