From 49afa7528c89d70435a6dfaee9204ee4f8170ac7 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Mon, 4 Nov 2024 15:59:22 +0000 Subject: [PATCH 01/14] update image refs --- bundle/manifests/dell-csm-operator.clusterserviceversion.yaml | 4 ++-- operatorconfig/driverconfig/common/default.yaml | 2 +- scripts/csm-offline-bundle.sh | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/csm-offline-bundle.sh diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 945b5fc36..a89ca9769 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -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" }, { diff --git a/operatorconfig/driverconfig/common/default.yaml b/operatorconfig/driverconfig/common/default.yaml index e36ae5172..8a57e0b94 100644 --- a/operatorconfig/driverconfig/common/default.yaml +++ b/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 diff --git a/scripts/csm-offline-bundle.sh b/scripts/csm-offline-bundle.sh old mode 100644 new mode 100755 index 5a533f031..b8498e897 --- a/scripts/csm-offline-bundle.sh +++ b/scripts/csm-offline-bundle.sh @@ -193,6 +193,7 @@ IMAGEFILEDIR="${REPODIR}/scripts/images.tar" FILES_WITH_IMAGE_NAMES=( "${REPODIR}/operatorconfig/driverconfig/common/default.yaml" "${REPODIR}/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml" + "${REPODIR}/samples/ocp/*/*.yaml" ) # list of all files to be included From d810fec3d370a08b95de221b6a02ff9b897964e0 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Mon, 4 Nov 2024 19:32:47 +0000 Subject: [PATCH 02/14] put ocp sample images in manifest --- scripts/csm-offline-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/csm-offline-bundle.sh b/scripts/csm-offline-bundle.sh index b8498e897..a80711db9 100755 --- a/scripts/csm-offline-bundle.sh +++ b/scripts/csm-offline-bundle.sh @@ -62,7 +62,7 @@ run_command() { # build_image_manifest # builds a manifest of all the images referred to by the latest operator csv build_image_manifest() { - local REGEX="([-_./:A-Za-z0-9]{3,}):([-_.A-Za-z0-9]{1,})" + local REGEX="([-_./:A-Za-z0-9]{3,})[^@sha256]:([-_.A-Za-z0-9]{1,})|([-_./:A-Za-z0-9]{3,})@sha256:([-_.A-Za-z0-9]{1,})" status "Building image manifest file" if [ -e "${IMAGEFILEDIR}" ]; then From 57a0591684b43dcb7be82dd55d9f93a7b0423cd3 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Wed, 6 Nov 2024 16:08:54 +0000 Subject: [PATCH 03/14] update samples to use docker.io --- .../csm_authorization_proxy_server_v1101.yaml | 16 ++++++------ .../csm_authorization_proxy_server_v1110.yaml | 16 ++++++------ .../csm_authorization_proxy_server_v1120.yaml | 8 +++--- ...authorization_proxy_server_v200-alpha.yaml | 18 ++++++------- .../csm_authorization_proxy_server_v200.yaml | 8 +++--- .../1.6.0/storage_csm_powerflex_v2110.yaml | 2 +- .../ocp/1.6.0/storage_csm_powermax_v2110.yaml | 2 +- .../1.6.0/storage_csm_powerscale_v2110.yaml | 2 +- .../1.6.1/storage_csm_powerflex_v2110.yaml | 2 +- .../ocp/1.6.1/storage_csm_powermax_v2110.yaml | 2 +- .../1.6.1/storage_csm_powerscale_v2110.yaml | 2 +- samples/storage_csm_powerflex_v2101.yaml | 26 +++++++++---------- samples/storage_csm_powerflex_v2110.yaml | 26 +++++++++---------- samples/storage_csm_powerflex_v2120.yaml | 8 +++--- samples/storage_csm_powermax_v2101.yaml | 20 +++++++------- samples/storage_csm_powermax_v2110.yaml | 24 ++++++++--------- samples/storage_csm_powermax_v2120.yaml | 2 +- samples/storage_csm_powerscale_v2101.yaml | 22 ++++++++-------- samples/storage_csm_powerscale_v2110.yaml | 22 ++++++++-------- samples/storage_csm_powerscale_v2120.yaml | 2 +- samples/storage_csm_powerstore_v2101.yaml | 8 +++--- samples/storage_csm_powerstore_v2110.yaml | 8 +++--- samples/storage_csm_unity_v2101.yaml | 4 +-- samples/storage_csm_unity_v2110.yaml | 4 +-- 24 files changed, 127 insertions(+), 127 deletions(-) diff --git a/samples/authorization/csm_authorization_proxy_server_v1101.yaml b/samples/authorization/csm_authorization_proxy_server_v1101.yaml index b6b7f35ac..d66309f6a 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1101.yaml +++ b/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 + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v1110.yaml b/samples/authorization/csm_authorization_proxy_server_v1110.yaml index 1103f3df7..50c4154a3 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1110.yaml +++ b/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: ddocker.io/ellemc/csm-authorization-storage:v1.11.0 + opa: docker.io/openpolicyagent/opa + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v1120.yaml b/samples/authorization/csm_authorization_proxy_server_v1120.yaml index d263cb0b7..6e4a69557 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1120.yaml +++ b/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 + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml b/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml index cd175f5c1..c8aaa9c89 100644 --- a/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml +++ b/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 + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v200.yaml b/samples/authorization/csm_authorization_proxy_server_v200.yaml index 2d0f07dae..d728a8af1 100644 --- a/samples/authorization/csm_authorization_proxy_server_v200.yaml +++ b/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 + 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 diff --git a/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml index a10859345..32bc54a1e 100644 --- a/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml @@ -243,7 +243,7 @@ spec: # Allowed values: string # Default value: "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 diff --git a/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml index 2e91dc71f..4c636e284 100644 --- a/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml @@ -387,7 +387,7 @@ spec: # Allowed values: string # Default value: "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: diff --git a/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml index 43c17f6c3..0388b2e94 100644 --- a/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml @@ -364,7 +364,7 @@ spec: # Allowed values: string # Default value: "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: diff --git a/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml index 78bc65e57..9511bc448 100644 --- a/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml +++ b/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml @@ -243,7 +243,7 @@ spec: # Allowed values: string # Default value: "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 diff --git a/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml index fdb264fe7..5c1dfe5c3 100644 --- a/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml +++ b/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml @@ -387,7 +387,7 @@ spec: # Allowed values: string # Default value: "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: diff --git a/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml index 1e46eaeb0..a45b28bad 100644 --- a/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml +++ b/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml @@ -364,7 +364,7 @@ spec: # Allowed values: string # Default value: "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: diff --git a/samples/storage_csm_powerflex_v2101.yaml b/samples/storage_csm_powerflex_v2101.yaml index 751a2e6db..533236334 100644 --- a/samples/storage_csm_powerflex_v2101.yaml +++ b/samples/storage_csm_powerflex_v2101.yaml @@ -23,7 +23,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.10.1" + image: "docker.io/dellemc/csi-vxflexos:v2.10.1" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -55,11 +55,11 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false - image: dellemc/sdc:4.5.1 + image: docker.io/dellemc/sdc:4.5.1 envs: - name: HOST_PID value: "1" @@ -180,7 +180,7 @@ spec: # operator: "Exists" # effect: "NoSchedule" initContainers: - - image: dellemc/sdc:4.5.1 + - image: docker.io/dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: @@ -194,7 +194,7 @@ spec: configVersion: v1.10.1 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -213,7 +213,7 @@ spec: enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: docker.io/dellemc/csm-topology:v1.8.1 # 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 @@ -233,7 +233,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 @@ -247,7 +247,7 @@ spec: # Allowed values: string # Default value: "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 @@ -259,7 +259,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.8.1 + image: docker.io/dellemc/csm-metrics-powerflex:v1.8.1 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int @@ -326,7 +326,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.8.1 + image: docker.io/dellemc/dell-csi-replicator:v1.8.1 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -340,7 +340,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.8.1 + image: docker.io/dellemc/dell-replication-controller:v1.8.1 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 @@ -376,7 +376,7 @@ spec: configVersion: v1.9.1 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: docker.io/dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-vxflexos" @@ -390,7 +390,7 @@ spec: - "--mode=controller" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.9.1 + image: docker.io/dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml index 7e9ff35dd..7cef7ad80 100644 --- a/samples/storage_csm_powerflex_v2110.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -23,7 +23,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.11.0" + image: "docker.io/dellemc/csi-vxflexos:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -55,11 +55,11 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.8.0 + image: docker.io/dellemc/csi-metadata-retriever:v1.8.0 # 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: @@ -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.11.0 + image: docker.io/dellemc/csm-authorization-sidecar:v1.11.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.9.0 + image: docker.io/dellemc/csm-topology:v1.9.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 @@ -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.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 @@ -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.9.0 + image: docker.io/dellemc/csm-metrics-powerflex:v1.9.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.9.0 + image: docker.io/dellemc/dell-csi-replicator:v1.9.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.9.0 + image: docker.io/dellemc/dell-replication-controller:v1.9.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.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.10.0 + image: docker.io/dellemc/podmon:v1.10.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.10.0 + image: docker.io/dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powerflex_v2120.yaml b/samples/storage_csm_powerflex_v2120.yaml index 9fbd30b56..ea31d5560 100644 --- a/samples/storage_csm_powerflex_v2120.yaml +++ b/samples/storage_csm_powerflex_v2120.yaml @@ -66,7 +66,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" @@ -194,7 +194,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: @@ -250,7 +250,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 @@ -264,7 +264,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 diff --git a/samples/storage_csm_powermax_v2101.yaml b/samples/storage_csm_powermax_v2101.yaml index a4f17274d..daa13b30d 100644 --- a/samples/storage_csm_powermax_v2101.yaml +++ b/samples/storage_csm_powermax_v2101.yaml @@ -46,7 +46,7 @@ spec: forceRemoveDriver: true common: # Image for CSI PowerMax driver v2.10.1 - image: dellemc/csi-powermax:v2.10.1 + image: docker.io/dellemc/csi-powermax:v2.10.1 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -233,7 +233,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor enabled: false @@ -256,7 +256,7 @@ spec: # image: Define the container images used for the reverse proxy # Default value: None # Example: "csipowermax-reverseproxy:v2.9.1" - image: dellemc/csipowermax-reverseproxy:v2.9.1 + image: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1 envs: # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key @@ -280,7 +280,7 @@ spec: configVersion: v1.10.1 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -303,7 +303,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.8.1 + image: docker.io/dellemc/dell-csi-replicator:v1.8.1 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -318,7 +318,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.8.1 + image: docker.io/dellemc/dell-replication-controller:v1.8.1 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 @@ -355,7 +355,7 @@ spec: enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: docker.io/dellemc/csm-topology:v1.8.1 # 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 @@ -375,7 +375,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 @@ -389,7 +389,7 @@ spec: # Allowed values: string # Default value: "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: @@ -401,7 +401,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.3.1 + image: docker.io/dellemc/csm-metrics-powermax:v1.3.1 envs: # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax # Allowed values: int diff --git a/samples/storage_csm_powermax_v2110.yaml b/samples/storage_csm_powermax_v2110.yaml index a7fc93350..05b755156 100644 --- a/samples/storage_csm_powermax_v2110.yaml +++ b/samples/storage_csm_powermax_v2110.yaml @@ -44,7 +44,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - image: dellemc/csi-powermax:v2.11.0 + image: docker.io/dellemc/csi-powermax:v2.11.0 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -243,7 +243,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.8.0 + image: docker.io/dellemc/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 @@ -265,7 +265,7 @@ spec: - name: csipowermax-reverseproxy # image: Define the container images used for the reverse proxy # Default value: None - image: dellemc/csipowermax-reverseproxy:v2.10.0 + image: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0 envs: # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key @@ -289,7 +289,7 @@ spec: configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -312,7 +312,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.9.0 + image: docker.io/dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -327,7 +327,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.9.0 + image: docker.io/dellemc/dell-replication-controller:v1.9.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 @@ -364,7 +364,7 @@ spec: enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.9.0 + image: docker.io/dellemc/csm-topology:v1.9.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 @@ -384,7 +384,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 @@ -398,7 +398,7 @@ spec: # Allowed values: string # Default value: "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: @@ -410,7 +410,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.4.0 + image: docker.io/dellemc/csm-metrics-powermax:v1.4.0 envs: # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax # Allowed values: int @@ -465,7 +465,7 @@ spec: configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.10.0 + image: docker.io/dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-powermax" @@ -480,7 +480,7 @@ spec: - "--driver-config-params=/powermax-config-params/driver-config-params.yaml" - "--driverPath=csi-powermax.dellemc.com" - name: podmon-node - image: dellemc/podmon:v1.10.0 + image: docker.io/dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powermax_v2120.yaml b/samples/storage_csm_powermax_v2120.yaml index 243e52275..f37a0d81f 100644 --- a/samples/storage_csm_powermax_v2120.yaml +++ b/samples/storage_csm_powermax_v2120.yaml @@ -398,7 +398,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: diff --git a/samples/storage_csm_powerscale_v2101.yaml b/samples/storage_csm_powerscale_v2101.yaml index cdbd15d33..100a9388d 100644 --- a/samples/storage_csm_powerscale_v2101.yaml +++ b/samples/storage_csm_powerscale_v2101.yaml @@ -26,7 +26,7 @@ spec: forceRemoveDriver: true common: # Image for CSI PowerScale driver v2.10.1 - image: "dellemc/csi-isilon:v2.10.1" + image: "docker.io/dellemc/csi-isilon:v2.10.1" imagePullPolicy: IfNotPresent envs: # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs @@ -246,7 +246,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor enabled: false @@ -265,7 +265,7 @@ spec: configVersion: v1.10.1 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -288,7 +288,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.8.1 + image: docker.io/dellemc/dell-csi-replicator:v1.8.1 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -303,7 +303,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.8.1 + image: docker.io/dellemc/dell-replication-controller:v1.8.1 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 @@ -340,7 +340,7 @@ spec: enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: docker.io/dellemc/csm-topology:v1.8.1 # 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 @@ -360,7 +360,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 @@ -374,7 +374,7 @@ spec: # Allowed values: string # Default value: "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: @@ -387,7 +387,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: docker.io/dellemc/csm-metrics-powerscale:v1.5.1 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int @@ -459,7 +459,7 @@ spec: configVersion: v1.9.1 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: docker.io/dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-isilon" @@ -474,7 +474,7 @@ spec: - "--driverPath=csi-isilon.dellemc.com" - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.9.1 + image: docker.io/dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powerscale_v2110.yaml b/samples/storage_csm_powerscale_v2110.yaml index 2c6ea397a..5840ace7b 100644 --- a/samples/storage_csm_powerscale_v2110.yaml +++ b/samples/storage_csm_powerscale_v2110.yaml @@ -24,7 +24,7 @@ spec: # Uninstall CSI Driver and/or modules when CR is deleted forceRemoveDriver: true common: - image: "dellemc/csi-isilon:v2.11.0" + image: "docker.io/dellemc/csi-isilon:v2.11.0" imagePullPolicy: IfNotPresent envs: # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs @@ -243,7 +243,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.8.0 + image: docker.io/dellemc/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 @@ -262,7 +262,7 @@ spec: configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -285,7 +285,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.9.0 + image: docker.io/dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -300,7 +300,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.9.0 + image: docker.io/dellemc/dell-replication-controller:v1.9.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 @@ -337,7 +337,7 @@ spec: enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.9.0 + image: docker.io/dellemc/csm-topology:v1.9.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 @@ -357,7 +357,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 @@ -371,7 +371,7 @@ spec: # Allowed values: string # Default value: "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: @@ -384,7 +384,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.6.0 + image: docker.io/dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int @@ -456,7 +456,7 @@ spec: configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.10.0 + image: docker.io/dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-isilon" @@ -471,7 +471,7 @@ spec: - "--driverPath=csi-isilon.dellemc.com" - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.10.0 + image: docker.io/dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powerscale_v2120.yaml b/samples/storage_csm_powerscale_v2120.yaml index a854941f8..76b400bc8 100644 --- a/samples/storage_csm_powerscale_v2120.yaml +++ b/samples/storage_csm_powerscale_v2120.yaml @@ -371,7 +371,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: diff --git a/samples/storage_csm_powerstore_v2101.yaml b/samples/storage_csm_powerstore_v2101.yaml index 27a8d1cd2..558e06c1a 100644 --- a/samples/storage_csm_powerstore_v2101.yaml +++ b/samples/storage_csm_powerstore_v2101.yaml @@ -45,7 +45,7 @@ spec: forceRemoveDriver: true common: # Image for CSI PowerStore driver v2.10.1 - image: "dellemc/csi-powerstore:v2.10.1" + image: "docker.io/dellemc/csi-powerstore:v2.10.1" imagePullPolicy: IfNotPresent envs: - name: X_CSI_POWERSTORE_NODE_NAME_PREFIX @@ -73,7 +73,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor enabled: false @@ -189,7 +189,7 @@ spec: configVersion: v1.9.1 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: docker.io/dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-powerstore" @@ -204,7 +204,7 @@ spec: - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" - "--driverPath=csi-powerstore.dellemc.com" - name: podmon-node - image: dellemc/podmon:v1.9.1 + image: docker.io/dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powerstore_v2110.yaml b/samples/storage_csm_powerstore_v2110.yaml index 7d93470cb..972bb27f1 100644 --- a/samples/storage_csm_powerstore_v2110.yaml +++ b/samples/storage_csm_powerstore_v2110.yaml @@ -43,7 +43,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-powerstore:v2.11.0" + image: "docker.io/dellemc/csi-powerstore:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_POWERSTORE_NODE_NAME_PREFIX @@ -71,7 +71,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.8.0 + image: docker.io/dellemc/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 @@ -187,7 +187,7 @@ spec: configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.10.0 + image: docker.io/dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-powerstore" @@ -202,7 +202,7 @@ spec: - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" - "--driverPath=csi-powerstore.dellemc.com" - name: podmon-node - image: dellemc/podmon:v1.10.0 + image: docker.io/dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_unity_v2101.yaml b/samples/storage_csm_unity_v2101.yaml index 27fddfc86..3c29695e8 100644 --- a/samples/storage_csm_unity_v2101.yaml +++ b/samples/storage_csm_unity_v2101.yaml @@ -26,7 +26,7 @@ spec: forceRemoveDriver: true common: # Image for CSI Unity driver v2.10.1 - image: "dellemc/csi-unity:v2.10.1" + image: "docker.io/dellemc/csi-unity:v2.10.1" imagePullPolicy: IfNotPresent envs: # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode. @@ -93,7 +93,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity diff --git a/samples/storage_csm_unity_v2110.yaml b/samples/storage_csm_unity_v2110.yaml index e696e43df..26881293a 100644 --- a/samples/storage_csm_unity_v2110.yaml +++ b/samples/storage_csm_unity_v2110.yaml @@ -24,7 +24,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-unity:v2.11.0" + image: "docker.io/dellemc/csi-unity:v2.11.0" imagePullPolicy: IfNotPresent envs: # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode. @@ -96,7 +96,7 @@ spec: - name: snapshotter image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.8.0 + image: docker.io/dellemc/csi-metadata-retriever:v1.8.0 # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity From f7a667e30710432005f7a81285b3aca1cd2ba535 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Wed, 6 Nov 2024 22:00:50 +0000 Subject: [PATCH 04/14] add registry to missed images and filter images by tag and sha --- .../dell-csm-operator.clusterserviceversion.yaml | 14 +++++++------- .../csm_authorization_proxy_server_v1110.yaml | 2 +- samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml | 4 ++-- samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml | 2 +- .../ocp/1.6.0/storage_csm_powerscale_v2110.yaml | 2 +- samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml | 4 ++-- samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml | 2 +- .../ocp/1.6.1/storage_csm_powerscale_v2110.yaml | 2 +- samples/storage_csm_powerflex_v2101.yaml | 2 +- samples/storage_csm_powerflex_v2110.yaml | 4 ++-- samples/storage_csm_powerflex_v2120.yaml | 2 +- samples/storage_csm_powermax_v2101.yaml | 2 +- samples/storage_csm_powermax_v2110.yaml | 2 +- samples/storage_csm_powermax_v2120.yaml | 4 ++-- samples/storage_csm_powerscale_v2101.yaml | 2 +- samples/storage_csm_powerscale_v2110.yaml | 2 +- samples/storage_csm_powerscale_v2120.yaml | 4 ++-- scripts/csm-offline-bundle.sh | 14 ++++++++++---- 18 files changed, 38 insertions(+), 32 deletions(-) diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index a89ca9769..abde9ff79 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -253,11 +253,11 @@ 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", - "name": "otel-collector", + "image": "docker.io/otel/opentelemetry-collector:0.42.0", + "name": "docker.io/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": "" }, @@ -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": "" }, diff --git a/samples/authorization/csm_authorization_proxy_server_v1110.yaml b/samples/authorization/csm_authorization_proxy_server_v1110.yaml index 50c4154a3..dc73d841b 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1110.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v1110.yaml @@ -33,7 +33,7 @@ spec: 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: ddocker.io/ellemc/csm-authorization-storage:v1.11.0 + storageService: docker.io/ellemc/csm-authorization-storage:v1.11.0 opa: docker.io/openpolicyagent/opa opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:0.11 # certificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates diff --git a/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml index 32bc54a1e..6545a04eb 100644 --- a/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml +++ b/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,7 +241,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" # enabled: Enable/Disable cert-manager diff --git a/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml index 4c636e284..0175e4e1a 100644 --- a/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml @@ -385,7 +385,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml index 0388b2e94..86702509b 100644 --- a/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powerscale_v2110.yaml @@ -362,7 +362,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml index 9511bc448..3b82af4c7 100644 --- a/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml +++ b/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,7 +241,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" # enabled: Enable/Disable cert-manager diff --git a/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml index 5c1dfe5c3..74da52beb 100644 --- a/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml +++ b/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml @@ -385,7 +385,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml index a45b28bad..c7fb8753c 100644 --- a/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml +++ b/samples/ocp/1.6.1/storage_csm_powerscale_v2110.yaml @@ -362,7 +362,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/storage_csm_powerflex_v2101.yaml b/samples/storage_csm_powerflex_v2101.yaml index 533236334..f547e17ef 100644 --- a/samples/storage_csm_powerflex_v2101.yaml +++ b/samples/storage_csm_powerflex_v2101.yaml @@ -245,7 +245,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" # enabled: Enable/Disable cert-manager diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml index 7cef7ad80..892a91204 100644 --- a/samples/storage_csm_powerflex_v2110.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -196,7 +196,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: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server @@ -248,7 +248,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" # enabled: Enable/Disable cert-manager diff --git a/samples/storage_csm_powerflex_v2120.yaml b/samples/storage_csm_powerflex_v2120.yaml index ea31d5560..273b0b41a 100644 --- a/samples/storage_csm_powerflex_v2120.yaml +++ b/samples/storage_csm_powerflex_v2120.yaml @@ -262,7 +262,7 @@ spec: envs: # image of nginx proxy image # Allowed values: string - # Default value: "nginxinc/nginx-unprivileged:1.27" + # Default value: "docker.io/nginxinc/nginx-unprivileged:1.27" - name: "NGINX_PROXY_IMAGE" value: "docker.io/nginxinc/nginx-unprivileged:1.27" # enabled: Enable/Disable cert-manager diff --git a/samples/storage_csm_powermax_v2101.yaml b/samples/storage_csm_powermax_v2101.yaml index daa13b30d..9b4f76369 100644 --- a/samples/storage_csm_powermax_v2101.yaml +++ b/samples/storage_csm_powermax_v2101.yaml @@ -387,7 +387,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/storage_csm_powermax_v2110.yaml b/samples/storage_csm_powermax_v2110.yaml index 05b755156..0e6c4a614 100644 --- a/samples/storage_csm_powermax_v2110.yaml +++ b/samples/storage_csm_powermax_v2110.yaml @@ -396,7 +396,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/storage_csm_powermax_v2120.yaml b/samples/storage_csm_powermax_v2120.yaml index f37a0d81f..8fe01c27b 100644 --- a/samples/storage_csm_powermax_v2120.yaml +++ b/samples/storage_csm_powermax_v2120.yaml @@ -384,7 +384,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 @@ -396,7 +396,7 @@ spec: envs: # image of nginx proxy image # Allowed values: string - # Default value: "nginxinc/nginx-unprivileged:1.27" + # Default value: "docker.io/nginxinc/nginx-unprivileged:1.27" - name: "NGINX_PROXY_IMAGE" value: "docker.io/nginxinc/nginx-unprivileged:1.27" - name: cert-manager diff --git a/samples/storage_csm_powerscale_v2101.yaml b/samples/storage_csm_powerscale_v2101.yaml index 100a9388d..d756f6ce1 100644 --- a/samples/storage_csm_powerscale_v2101.yaml +++ b/samples/storage_csm_powerscale_v2101.yaml @@ -372,7 +372,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/storage_csm_powerscale_v2110.yaml b/samples/storage_csm_powerscale_v2110.yaml index 5840ace7b..8ef7c5cd9 100644 --- a/samples/storage_csm_powerscale_v2110.yaml +++ b/samples/storage_csm_powerscale_v2110.yaml @@ -369,7 +369,7 @@ 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: "docker.io/nginxinc/nginx-unprivileged:1.20" - name: cert-manager diff --git a/samples/storage_csm_powerscale_v2120.yaml b/samples/storage_csm_powerscale_v2120.yaml index 76b400bc8..b4467d0e2 100644 --- a/samples/storage_csm_powerscale_v2120.yaml +++ b/samples/storage_csm_powerscale_v2120.yaml @@ -357,7 +357,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 @@ -369,7 +369,7 @@ spec: envs: # image of nginx proxy image # Allowed values: string - # Default value: "nginxinc/nginx-unprivileged:1.27" + # Default value: "docker.io/nginxinc/nginx-unprivileged:1.27" - name: "NGINX_PROXY_IMAGE" value: "docker.io/nginxinc/nginx-unprivileged:1.27" - name: cert-manager diff --git a/scripts/csm-offline-bundle.sh b/scripts/csm-offline-bundle.sh index a80711db9..9f6146389 100755 --- a/scripts/csm-offline-bundle.sh +++ b/scripts/csm-offline-bundle.sh @@ -62,8 +62,6 @@ run_command() { # build_image_manifest # builds a manifest of all the images referred to by the latest operator csv build_image_manifest() { - local REGEX="([-_./:A-Za-z0-9]{3,})[^@sha256]:([-_.A-Za-z0-9]{1,})|([-_./:A-Za-z0-9]{3,})@sha256:([-_.A-Za-z0-9]{1,})" - status "Building image manifest file" if [ -e "${IMAGEFILEDIR}" ]; then rm -rf "${IMAGEFILEDIR}" @@ -72,6 +70,9 @@ build_image_manifest() { rm -rf "${IMAGEMANIFEST}" fi + local TAG_REGEX="([-_./:A-Za-z0-9]{3,}):([-_.A-Za-z0-9]{1,})" + local SHA_REGEX="([-_./:A-Za-z0-9]{3,})@sha256:([-_.A-Za-z0-9]{1,})" + for F in ${FILES_WITH_IMAGE_NAMES[@]}; do echo " Processing file ${F}" if [ ! -f "${F}" ]; then @@ -81,7 +82,11 @@ build_image_manifest() { # - search all files for strings that make $REGEX # - exclude anything with double '//'' as that is a URL and not an image name # - make sure at least one '/' is found - egrep -oh "${REGEX}" ${F} | egrep -v '//' | egrep '/' >> "${IMAGEMANIFEST}.tmp" + + # use TAG_REGEX to match image names by tag + egrep -oh "${TAG_REGEX}" ${F} | egrep -v '//' | egrep '/' >> "${IMAGEMANIFEST}.tmp" + # use SHA_REGEX to match image names by sha + egrep -oh "${SHA_REGEX}" ${F} | egrep -v '//' | egrep '/' >> "${IMAGEMANIFEST}.tmp" fi done @@ -190,10 +195,11 @@ IMAGEFILEDIR="${REPODIR}/scripts/images.tar" # directories to search all files for image names +shopt -s globstar FILES_WITH_IMAGE_NAMES=( "${REPODIR}/operatorconfig/driverconfig/common/default.yaml" "${REPODIR}/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml" - "${REPODIR}/samples/ocp/*/*.yaml" + "${REPODIR}/samples/**/*.yaml" ) # list of all files to be included From 4281c945f91545e7e279b709e836de5e69b22744 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Wed, 6 Nov 2024 22:02:49 +0000 Subject: [PATCH 05/14] fix otel image name in csv --- bundle/manifests/dell-csm-operator.clusterserviceversion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index abde9ff79..feafa0d78 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -257,7 +257,7 @@ metadata: } ], "image": "docker.io/otel/opentelemetry-collector:0.42.0", - "name": "docker.io/otel-collector", + "name": "otel-collector", "privateKey": "" }, { From 9fe417488d7a8e67c97151bd5452de2b1f56d9e6 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Wed, 6 Nov 2024 22:41:37 +0000 Subject: [PATCH 06/14] use latest tag for opa --- samples/authorization/csm_authorization_proxy_server_v1101.yaml | 2 +- samples/authorization/csm_authorization_proxy_server_v1110.yaml | 2 +- samples/authorization/csm_authorization_proxy_server_v1120.yaml | 2 +- .../csm_authorization_proxy_server_v200-alpha.yaml | 2 +- samples/authorization/csm_authorization_proxy_server_v200.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/authorization/csm_authorization_proxy_server_v1101.yaml b/samples/authorization/csm_authorization_proxy_server_v1101.yaml index d66309f6a..bb7289df3 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1101.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v1101.yaml @@ -34,7 +34,7 @@ spec: 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 + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v1110.yaml b/samples/authorization/csm_authorization_proxy_server_v1110.yaml index dc73d841b..38311108b 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1110.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v1110.yaml @@ -34,7 +34,7 @@ spec: tenantService: docker.io/dellemc/csm-authorization-tenant:v1.11.0 roleService: docker.io/dellemc/csm-authorization-role:v1.11.0 storageService: docker.io/ellemc/csm-authorization-storage:v1.11.0 - opa: docker.io/openpolicyagent/opa + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v1120.yaml b/samples/authorization/csm_authorization_proxy_server_v1120.yaml index 6e4a69557..b2236ee66 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1120.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v1120.yaml @@ -34,7 +34,7 @@ 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: docker.io/openpolicyagent/opa + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml b/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml index c8aaa9c89..44ba18a65 100644 --- a/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml @@ -38,7 +38,7 @@ spec: roleServiceReplicas: 1 storageService: docker.io/dellemc/csm-authorization-storage:v2.0.0-alpha storageServiceReplicas: 1 - opa: docker.io/openpolicyagent/opa + 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 diff --git a/samples/authorization/csm_authorization_proxy_server_v200.yaml b/samples/authorization/csm_authorization_proxy_server_v200.yaml index d728a8af1..2d0ec9289 100644 --- a/samples/authorization/csm_authorization_proxy_server_v200.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v200.yaml @@ -38,7 +38,7 @@ spec: roleServiceReplicas: 1 storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.0.0 storageServiceReplicas: 1 - opa: docker.io/openpolicyagent/opa + 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 From 4ea0981547660d3658c20a190379f4a2813cf3c3 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Fri, 8 Nov 2024 13:40:03 +0000 Subject: [PATCH 07/14] undo sample images --- scripts/csm-offline-bundle.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/scripts/csm-offline-bundle.sh b/scripts/csm-offline-bundle.sh index 9f6146389..5a533f031 100755 --- a/scripts/csm-offline-bundle.sh +++ b/scripts/csm-offline-bundle.sh @@ -62,6 +62,8 @@ run_command() { # build_image_manifest # builds a manifest of all the images referred to by the latest operator csv build_image_manifest() { + local REGEX="([-_./:A-Za-z0-9]{3,}):([-_.A-Za-z0-9]{1,})" + status "Building image manifest file" if [ -e "${IMAGEFILEDIR}" ]; then rm -rf "${IMAGEFILEDIR}" @@ -70,9 +72,6 @@ build_image_manifest() { rm -rf "${IMAGEMANIFEST}" fi - local TAG_REGEX="([-_./:A-Za-z0-9]{3,}):([-_.A-Za-z0-9]{1,})" - local SHA_REGEX="([-_./:A-Za-z0-9]{3,})@sha256:([-_.A-Za-z0-9]{1,})" - for F in ${FILES_WITH_IMAGE_NAMES[@]}; do echo " Processing file ${F}" if [ ! -f "${F}" ]; then @@ -82,11 +81,7 @@ build_image_manifest() { # - search all files for strings that make $REGEX # - exclude anything with double '//'' as that is a URL and not an image name # - make sure at least one '/' is found - - # use TAG_REGEX to match image names by tag - egrep -oh "${TAG_REGEX}" ${F} | egrep -v '//' | egrep '/' >> "${IMAGEMANIFEST}.tmp" - # use SHA_REGEX to match image names by sha - egrep -oh "${SHA_REGEX}" ${F} | egrep -v '//' | egrep '/' >> "${IMAGEMANIFEST}.tmp" + egrep -oh "${REGEX}" ${F} | egrep -v '//' | egrep '/' >> "${IMAGEMANIFEST}.tmp" fi done @@ -195,11 +190,9 @@ IMAGEFILEDIR="${REPODIR}/scripts/images.tar" # directories to search all files for image names -shopt -s globstar FILES_WITH_IMAGE_NAMES=( "${REPODIR}/operatorconfig/driverconfig/common/default.yaml" "${REPODIR}/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml" - "${REPODIR}/samples/**/*.yaml" ) # list of all files to be included From 5be5307ebe655b89bf4ef22d5e0ff4a43376b3ae Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Fri, 8 Nov 2024 17:25:51 +0000 Subject: [PATCH 08/14] update config samples --- config/samples/storage_v1_csm_powerflex.yaml | 6 +++--- config/samples/storage_v1_csm_powermax.yaml | 2 +- config/samples/storage_v1_csm_powerscale.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index 99c8f120b..a2596e917 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/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: @@ -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 diff --git a/config/samples/storage_v1_csm_powermax.yaml b/config/samples/storage_v1_csm_powermax.yaml index 1f469f722..71c7d63c4 100644 --- a/config/samples/storage_v1_csm_powermax.yaml +++ b/config/samples/storage_v1_csm_powermax.yaml @@ -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: diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml index 1dc760bae..21ca94738 100644 --- a/config/samples/storage_v1_csm_powerscale.yaml +++ b/config/samples/storage_v1_csm_powerscale.yaml @@ -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: From c1d107e28de035617d251c8c4dcce0cce7037528 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Fri, 8 Nov 2024 17:28:50 +0000 Subject: [PATCH 09/14] update config samples --- config/samples/storage_v1_csm_powerflex.yaml | 2 +- config/samples/storage_v1_csm_powermax.yaml | 2 +- config/samples/storage_v1_csm_powerscale.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index a2596e917..009ad4ec2 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/config/samples/storage_v1_csm_powerflex.yaml @@ -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 diff --git a/config/samples/storage_v1_csm_powermax.yaml b/config/samples/storage_v1_csm_powermax.yaml index 71c7d63c4..edcfe4e63 100644 --- a/config/samples/storage_v1_csm_powermax.yaml +++ b/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 diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml index 21ca94738..394bbd660 100644 --- a/config/samples/storage_v1_csm_powerscale.yaml +++ b/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 From 986cac0c725712286ca68fc9c4bb09c2fcbe9efe Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Mon, 11 Nov 2024 14:49:42 -0500 Subject: [PATCH 10/14] fix typo --- samples/authorization/csm_authorization_proxy_server_v1110.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/authorization/csm_authorization_proxy_server_v1110.yaml b/samples/authorization/csm_authorization_proxy_server_v1110.yaml index 38311108b..6ab1db21a 100644 --- a/samples/authorization/csm_authorization_proxy_server_v1110.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v1110.yaml @@ -33,7 +33,7 @@ spec: 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/ellemc/csm-authorization-storage: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 From 60533e7d69029688db15d3ce6775d9603dae1671 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Tue, 12 Nov 2024 13:57:01 +0000 Subject: [PATCH 11/14] add code coverage --- pkg/modules/authorization.go | 1 + pkg/modules/authorization_test.go | 11 ++++++++ ...powerscale_auth_missing_skip_cert_env.yaml | 25 +++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 pkg/modules/testdata/cr_powerscale_auth_missing_skip_cert_env.yaml diff --git a/pkg/modules/authorization.go b/pkg/modules/authorization.go index 623120aa5..46017c512 100644 --- a/pkg/modules/authorization.go +++ b/pkg/modules/authorization.go @@ -308,6 +308,7 @@ func getAuthApplyCR(cr csmv1.ContainerStorageModule, op utils.OperatorConfig) (* break } } + fmt.Println(component) // If SKIP_CERTIFICATE_VALIDATION is not found, add it if !skipcertFound { authModule.Components[i].Envs = append(authModule.Components[i].Envs, corev1.EnvVar{ diff --git a/pkg/modules/authorization_test.go b/pkg/modules/authorization_test.go index d016d975a..fdd88b01d 100644 --- a/pkg/modules/authorization_test.go +++ b/pkg/modules/authorization_test.go @@ -225,6 +225,17 @@ func TestAuthInjectDeployment(t *testing.T) { } return true, true, controllerYAML.Deployment, operatorConfig, customResource }, + "success - greenfield injection mising 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 { diff --git a/pkg/modules/testdata/cr_powerscale_auth_missing_skip_cert_env.yaml b/pkg/modules/testdata/cr_powerscale_auth_missing_skip_cert_env.yaml new file mode 100644 index 000000000..32cada074 --- /dev/null +++ b/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" From b737da8dcadb9095fa7fafc3b06a523aee58fb3c Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Tue, 12 Nov 2024 14:08:08 +0000 Subject: [PATCH 12/14] remove print --- pkg/modules/authorization.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/modules/authorization.go b/pkg/modules/authorization.go index 46017c512..a1a9acf4c 100644 --- a/pkg/modules/authorization.go +++ b/pkg/modules/authorization.go @@ -308,7 +308,7 @@ func getAuthApplyCR(cr csmv1.ContainerStorageModule, op utils.OperatorConfig) (* break } } - fmt.Println(component) + // If SKIP_CERTIFICATE_VALIDATION is not found, add it if !skipcertFound { authModule.Components[i].Envs = append(authModule.Components[i].Envs, corev1.EnvVar{ From 401ded1e3bb9508f1d4e7272aa1a98de61736efc Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Tue, 12 Nov 2024 14:08:28 +0000 Subject: [PATCH 13/14] remove print --- pkg/modules/authorization.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/modules/authorization.go b/pkg/modules/authorization.go index a1a9acf4c..623120aa5 100644 --- a/pkg/modules/authorization.go +++ b/pkg/modules/authorization.go @@ -308,7 +308,6 @@ func getAuthApplyCR(cr csmv1.ContainerStorageModule, op utils.OperatorConfig) (* break } } - // If SKIP_CERTIFICATE_VALIDATION is not found, add it if !skipcertFound { authModule.Components[i].Envs = append(authModule.Components[i].Envs, corev1.EnvVar{ From 9c7675590ae98d05dfd644e46518fc0b939aac28 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Tue, 12 Nov 2024 17:19:20 +0000 Subject: [PATCH 14/14] fix typo --- pkg/modules/authorization_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/modules/authorization_test.go b/pkg/modules/authorization_test.go index fdd88b01d..0f4dcfb7e 100644 --- a/pkg/modules/authorization_test.go +++ b/pkg/modules/authorization_test.go @@ -225,7 +225,7 @@ func TestAuthInjectDeployment(t *testing.T) { } return true, true, controllerYAML.Deployment, operatorConfig, customResource }, - "success - greenfield injection mising skip certificate validation env": func(*testing.T) (bool, bool, applyv1.DeploymentApplyConfiguration, utils.OperatorConfig, csmv1.ContainerStorageModule) { + "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)