Update UBI image, config and image versions of driver and module (#62)

dell · Mar 7, 2022 · 9994f6e · 9994f6e
1 parent 1b48808
commit 9994f6e
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 28 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,7 +21,7 @@ COPY tests/ tests/
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-230.1645809059
+FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:21504085e8d740e62b52573fe9a1a0d58a3e7dba589cac69734ad2fa81d66635
 
 RUN microdnf install yum \
     && yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \

diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
@@ -109,10 +109,10 @@ metadata:
                         "value": true
                       }
                     ],
-                    "image": "dellemc/csm-authorization-sidecar:v1.0.0"
+                    "image": "dellemc/csm-authorization-sidecar:v1.2.0"
                   }
                 ],
-                "configVersion": "v2.0.0",
+                "configVersion": "v2.2.0",
                 "enabled": false,
                 "name": "authorization"
               }
@@ -207,8 +207,8 @@ spec:
       - description: CSIDriverSpec is the specification for CSIDriver
         displayName: CSI Driver Spec
         path: driver.csiDriverSpec
-      - description: CSIDriverType is the CSI Driver type for Dell Technologies - e.g, powermax,
-          powerflex,...
+      - description: CSIDriverType is the CSI Driver type for Dell Technologies -
+          e.g, powermax, powerflex,...
         displayName: CSI Driver Type
         path: driver.csiDriverType
       - description: DNSPolicy is the dnsPolicy of the daemonset for Node plugin

diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml
@@ -88,8 +88,8 @@ spec:
       - description: CSIDriverSpec is the specification for CSIDriver
         displayName: CSI Driver Spec
         path: driver.csiDriverSpec
-      - description: CSIDriverType is the CSI Driver type for Dell Technologies - e.g, powermax,
-          powerflex,...
+      - description: CSIDriverType is the CSI Driver type for Dell Technologies -
+          e.g, powermax, powerflex,...
         displayName: CSI Driver Type
         path: driver.csiDriverType
       - description: DNSPolicy is the dnsPolicy of the daemonset for Node plugin

diff --git a/config/samples/storage_v1_csm_observability.yaml b/config/samples/storage_v1_csm_observability.yaml
@@ -136,10 +136,10 @@ spec:
     - name: authorization
       # enable: Enable/Disable csm-authorization
       enabled: false
-      configVersion: v2.0.0
+      configVersion: v2.2.0
       components:
         - name: karavi-authorization-proxy
-          image: dellemc/csm-authorization-sidecar:v1.0.0
+          image: dellemc/csm-authorization-sidecar:v1.2.0
           envs:
             # proxyHost: hostname of the csm-authorization server
             - name: "PROXY_HOST"

diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml
@@ -8,7 +8,7 @@ spec:
     siDriverType: "powerscale"
     k8sVersion: v1.23
 
-    # Config version for CSI PowerScale v2.0.0 driver
+    # Config version for CSI PowerScale v2.2.0 driver
     configVersion: v2.2.0
 
     # volumeNamePrefix: defines a string prepended to each volume created by the CSI driver.
@@ -146,9 +146,9 @@ spec:
     - name: authorization
       # enable: Enable/Disable csm-authorization
       enabled: false
-      configVersion: v2.0.0
+      configVersion: v2.2.0
       components:
-        - image: dellemc/csm-authorization-sidecar:v1.0.0
+        - image: dellemc/csm-authorization-sidecar:v1.2.0
           envs:
             # proxyHost: hostname of the csm-authorization server
             - name: "PROXY_HOST"

diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go
@@ -640,7 +640,7 @@ func addModuleToCSM(csm *csmv1.ContainerStorageModule) {
 		{
 			Name:          "authorization",
 			Enabled:       true,
-			ConfigVersion: "v1.0.0",
+			ConfigVersion: "v1.2.0",
 			Components: []csmv1.ContainerTemplate{
 				{
 					Name: "karavi-authorization-proxy",

diff --git a/operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml b/operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml
@@ -194,7 +194,6 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: snapshotter
-          #image: quay.io/k8scsi/csi-snapshotter:v1.0.0
           image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
           imagePullPolicy: IfNotPresent
           args:

diff --git a/...onfig/authorization/v1.0.0/container.yaml → ...onfig/authorization/v1.2.0/container.yaml b/...onfig/authorization/v1.0.0/container.yaml → ...onfig/authorization/v1.2.0/container.yaml
@@ -1,6 +1,6 @@
 name: karavi-authorization-proxy
 imagePullPolicy: IfNotPresent
-image: dellemc/csm-authorization-sidecar:v1.0.0
+image: dellemc/csm-authorization-sidecar:v1.2.0
 env:
   - name: PROXY_HOST
     value: ""

diff --git a/...econfig/authorization/v1.0.0/volumes.yaml → ...econfig/authorization/v1.2.0/volumes.yaml b/...econfig/authorization/v1.0.0/volumes.yaml → ...econfig/authorization/v1.2.0/volumes.yaml
diff --git a/operatorconfig/moduleconfig/common/version-values.yaml b/operatorconfig/moduleconfig/common/version-values.yaml
@@ -1,7 +1,5 @@
 # Driver Type
 powerscale:
   # List of Driver versions and modules that supports the version
-  v2.0.0:
-      authorization: "v1.0.0"
   v2.2.0:
-      authorization: "v1.0.0"
+      authorization: "v1.2.0"
diff --git a/pkg/modules/authorization_test.go b/pkg/modules/authorization_test.go
@@ -264,7 +264,7 @@ func TestAuthorizationPreCheck(t *testing.T) {
 			drivertype := string(customResource.Spec.Driver.CSIDriverType)
 			tmpCR := customResource
 			auth := tmpCR.Spec.Modules[0]
-			auth.ConfigVersion = "v1.0.0"
+			auth.ConfigVersion = "v1.2.0"
 
 			karaviAuthconfig := getSecret(namespace, "karavi-authorization-config")
 			proxyAuthzTokens := getSecret(namespace, "proxy-authz-tokens")

diff --git a/pkg/modules/testdata/cr_powerscale_auth.yaml b/pkg/modules/testdata/cr_powerscale_auth.yaml
@@ -19,7 +19,7 @@ spec:
       enabled: true
       components:
       - name: karavi-authorization-proxy
-        image: dellemc/csm-authorization-sidecar:v1.0.0
+        image: dellemc/csm-authorization-sidecar:v1.2.0
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"

diff --git a/samples/storage_csm_powerscale.yaml b/samples/storage_csm_powerscale.yaml
@@ -180,10 +180,10 @@ spec:
     - name: authorization
       # enable: Enable/Disable csm-authorization
       enabled: false
-      configVersion: v1.0.0
+      configVersion: v1.2.0
       components:
       - name: karavi-authorization-proxy
-        image: dellemc/csm-authorization-sidecar:v1.0.0
+        image: dellemc/csm-authorization-sidecar:v1.2.0
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"

diff --git a/tests/config/driverconfig/powerscale/v2.2.0/controller.yaml b/tests/config/driverconfig/powerscale/v2.2.0/controller.yaml
@@ -165,7 +165,6 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: snapshotter
-          #image: quay.io/k8scsi/csi-snapshotter:v1.0.0
           image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1
           imagePullPolicy: IfNotPresent
           args:
@@ -181,7 +180,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: driver
-          image: dellemc/csi-isilon:v2.0.0
+          image: dellemc/csi-isilon:v2.2.0
           imagePullPolicy: IfNotPresent
           command: [ "/csi-isilon" ]
           args:

diff --git a/tests/e2e/testfiles/storage_csm_powerscale.yaml b/tests/e2e/testfiles/storage_csm_powerscale.yaml
@@ -177,10 +177,10 @@ spec:
     - name: authorization
       # enable: Enable/Disable csm-authorization
       enabled: false
-      configVersion: v1.0.0
+      configVersion: v1.2.0
       components:
       - name: karavi-authorization-proxy
-        image: dellemc/csm-authorization-sidecar:v1.0.0
+        image: dellemc/csm-authorization-sidecar:v1.2.0
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"

diff --git a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml
@@ -177,10 +177,10 @@ spec:
     - name: authorization
       # enable: Enable/Disable csm-authorization
       enabled: true
-      configVersion: v1.0.0
+      configVersion: v1.2.0
       components:
       - name: karavi-authorization-proxy
-        image: dellemc/csm-authorization-sidecar:v1.0.0
+        image: dellemc/csm-authorization-sidecar:v1.2.0
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"