changes for 2.10.4 and UBI lockdown (#1204)

hemalathagajendran · “hemalathagajendran” · web-flow · commit 7b61b7f8ca09 · 2024-08-26T15:47:39.000+05:30
Signed-off-by: “hemalathagajendran” &lt;“hemalatha.gajendran@ibm.com”&gt;
Co-authored-by: “hemalathagajendran” &lt;“hemalatha.gajendran@ibm.com”&gt;
diff --git a/cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/case.yaml b/cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/case.yaml
@@ -1,7 +1,7 @@
 name: ibm-spectrum-scale-csi-operator
 specVersion: 1.0.0
-version: 2.10.3
-appVersion: 2.10.3
+version: 2.10.4
+appVersion: 2.10.4
 description: "Represents a deployment of the IBM CSI Storage Scale driver."
 displayName: "IBM CSI Storage Scale Driver CASE" 
 displayDescription: "Represents a deployment of the IBM CSI Storage Scale driver."
diff --git a/cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperator/resources.yaml b/cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperator/resources.yaml
@@ -9,7 +9,7 @@ resources:
     - metadata:
         name: ibm_spectrum_scale_csi_driver
       image: cp/spectrum/scale/csi/ibm-spectrum-scale-csi-driver
-      tag: v2.10.3
+      tag: v2.10.4
       digest: sha256:57b4ee494ca48342d1ffaf22a166286202b0406b88316e4dcbe87212df6ca8f0
       mediaType: application/vnd.docker.distribution.manifest.list.v2
       registries:
@@ -20,19 +20,19 @@ resources:
         platform:
           architecture: amd64
           os: linux
-        tag: v2.10.3-amd64
+        tag: v2.10.4-amd64
       - digest: sha256:4bcdd8eccc13908d8b6c9c21b4ffed63177c53b410d7d50a2bd036ff8398ef46
         mediaType: application/vnd.docker.distribution.manifest.v2
         platform:
           architecture: ppc64le
           os: linux
-        tag: v2.10.3-ppc64le
+        tag: v2.10.4-ppc64le
       - digest: sha256:17d0601ca92224d38abc78a6a5771827ef130a49379270e536b3ca26cc9fc89f
         mediaType: application/vnd.docker.distribution.manifest.v2
         platform:
           architecture: s390x
           os: linux
-        tag: v2.10.3-s390x
+        tag: v2.10.4-s390x
 
     - metadata:
         name: csi_snapshotter
diff --git a/cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperatorSetup/resources.yaml b/cloudpak/stable/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperatorSetup/resources.yaml
@@ -9,7 +9,7 @@ resources:
     - metadata:
         name: ibm_spectrum_scale_csi_operator
       image: cpopen/ibm-spectrum-scale-csi-operator
-      tag: v2.10.3
+      tag: v2.10.4
       digest: sha256:e3d2f9fb68b2d7cd1faf84002bb73626da10bed5d81f91945a592d41893e2fda
       mediaType: application/vnd.docker.distribution.manifest.list.v2
       registries:
@@ -20,19 +20,19 @@ resources:
         platform:
           architecture: amd64
           os: linux
-        tag: v2.10.3-amd64
+        tag: v2.10.4-amd64
       - digest: sha256:4d2ddb810b219aa0caf3e581d1c811dea6deefc1c491f09ff3d68b33b7875434
         mediaType: application/vnd.docker.distribution.manifest.v2
         platform:
           architecture: ppc64le
           os: linux
-        tag: v2.10.3-ppc64le
+        tag: v2.10.4-ppc64le
       - digest: sha256:e299883ecd8932ca2b245246f91f7111c35de1dd0469f0daae2c7e71ee9ea7a1
         mediaType: application/vnd.docker.distribution.manifest.v2
         platform:
           architecture: s390x
           os: linux
-        tag: v2.10.3-s390x
+        tag: v2.10.4-s390x
     files:
     - mediaType: application/vnd.case.resource.k8s.v1+yaml
       ref: cluster/deploy/crds/csi_v1_csiscaleoperator.yaml
diff --git a/driver/build/Dockerfile b/driver/build/Dockerfile
@@ -20,8 +20,8 @@ ENV REVISION $commit
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags "-X 'main.gitCommit=${REVISION}' -extldflags '-static'" -o _output/ibm-spectrum-scale-csi ./cmd/ibm-spectrum-scale-csi
 # RUN chmod +x,u+s _output/ibm-spectrum-scale-csi
 
-FROM registry.access.redhat.com/ubi9-minimal:9.4-949.1717074713
-ARG version=2.10.3
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1194
+ARG version=2.10.4
 ARG commit
 ARG build_date
 
diff --git a/driver/cmd/ibm-spectrum-scale-csi/main.go b/driver/cmd/ibm-spectrum-scale-csi/main.go
@@ -41,7 +41,7 @@ var (
 	driverName     = flag.String("drivername", "spectrumscale.csi.ibm.com", "name of the driver")
 	nodeID         = flag.String("nodeid", "", "node id")
 	kubeletRootDir = flag.String("kubeletRootDirPath", "/var/lib/kubelet", "kubelet root directory path")
-	vendorVersion  = "2.10.3"
+	vendorVersion  = "2.10.4"
 )
 
 func main() {
diff --git a/generated/installer/ibm-spectrum-scale-csi-operator-dev.yaml b/generated/installer/ibm-spectrum-scale-csi-operator-dev.yaml
@@ -10,7 +10,7 @@ metadata:
     product: ibm-spectrum-scale-csi
     release: ibm-spectrum-scale-csi-operator
   annotations:
-    productVersion: 2.10.3
+    productVersion: 2.10.4
 spec:
   replicas: 1
   selector:
@@ -28,7 +28,7 @@ spec:
       annotations:
         productID: ibm-spectrum-scale-csi-operator
         productName: IBM Spectrum Scale CSI Operator
-        productVersion: 2.10.3
+        productVersion: 2.10.4
     spec:
       serviceAccountName: ibm-spectrum-scale-csi-operator
       containers:
diff --git a/generated/installer/ibm-spectrum-scale-csi-operator-ocp-rhel.yaml b/generated/installer/ibm-spectrum-scale-csi-operator-ocp-rhel.yaml
@@ -10,7 +10,7 @@ metadata:
     product: ibm-spectrum-scale-csi
     release: ibm-spectrum-scale-csi-operator
   annotations:
-    productVersion: 2.10.3
+    productVersion: 2.10.4
 spec:
   replicas: 1
   selector:
@@ -28,12 +28,12 @@ spec:
       annotations:
         productID: ibm-spectrum-scale-csi-operator
         productName: IBM Spectrum Scale CSI Operator
-        productVersion: 2.10.3
+        productVersion: 2.10.4
     spec:
       serviceAccountName: ibm-spectrum-scale-csi-operator
       containers:
       - name: operator
-        image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:529abf9cafd49ecbb25fe0dadbd2879dc60dcee527775c6f65b33cd3b8160840
+        image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:529abf9cafd49ecbb25fe0dadbd2879dc60dcee527775c6f65b33cd3b8160840
         args:
         - --leaderElection=true
         env:
@@ -44,7 +44,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: CSI_DRIVER_IMAGE
-          value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:5aeeecb8f73b1a075038a90c3dbb616fe0b5b474f7c2acfffc87e052812f9455
+          value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:5aeeecb8f73b1a075038a90c3dbb616fe0b5b474f7c2acfffc87e052812f9455
         resources:
           limits:
             cpu: 600m
diff --git a/generated/installer/ibm-spectrum-scale-csi-operator.yaml b/generated/installer/ibm-spectrum-scale-csi-operator.yaml
@@ -10,7 +10,7 @@ metadata:
     product: ibm-spectrum-scale-csi
     release: ibm-spectrum-scale-csi-operator
   annotations:
-    productVersion: 2.10.3
+    productVersion: 2.10.4
 spec:
   replicas: 1
   selector:
@@ -28,12 +28,12 @@ spec:
       annotations:
         productID: ibm-spectrum-scale-csi-operator
         productName: IBM Spectrum Scale CSI Operator
-        productVersion: 2.10.3
+        productVersion: 2.10.4
     spec:
       serviceAccountName: ibm-spectrum-scale-csi-operator
       containers:
       - name: operator
-        image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:529abf9cafd49ecbb25fe0dadbd2879dc60dcee527775c6f65b33cd3b8160840
+        image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:529abf9cafd49ecbb25fe0dadbd2879dc60dcee527775c6f65b33cd3b8160840
         args:
         - --leaderElection=true
         env:
@@ -44,7 +44,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: CSI_DRIVER_IMAGE
-          value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:5aeeecb8f73b1a075038a90c3dbb616fe0b5b474f7c2acfffc87e052812f9455
+          value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:5aeeecb8f73b1a075038a90c3dbb616fe0b5b474f7c2acfffc87e052812f9455
         resources:
           limits:
             cpu: 600m
diff --git a/operator/Makefile b/operator/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 2.10.3
+VERSION ?= 2.10.4
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
diff --git a/operator/build/Dockerfile b/operator/build/Dockerfile
@@ -33,7 +33,7 @@ RUN CGO_ENABLED=0 go build -ldflags="-X 'main.gitCommit=${REVISION}'" -a -o mana
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /
-ARG version=2.10.3
+ARG version=2.10.4
 ARG commit
 ARG build_date
 
diff --git a/operator/config/manager/kustomization.yaml b/operator/config/manager/kustomization.yaml
@@ -3,4 +3,4 @@ resources:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 commonAnnotations:
-  productVersion: 2.10.3
+  productVersion: 2.10.4
diff --git a/operator/config/manager/manager.yaml b/operator/config/manager/manager.yaml
@@ -20,7 +20,7 @@ spec:
       annotations:
         productID: ibm-spectrum-scale-csi-operator
         productName: IBM Spectrum Scale CSI Operator
-        productVersion: 2.10.3
+        productVersion: 2.10.4
       labels:
         app.kubernetes.io/instance: ibm-spectrum-scale-csi-operator
         app.kubernetes.io/managed-by: ibm-spectrum-scale-csi-operator
diff --git a/operator/config/overlays/default/kustomization.yaml b/operator/config/overlays/default/kustomization.yaml
@@ -24,9 +24,9 @@ patches:
           spec:
             containers:
               - name: operator
-                image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:529abf9cafd49ecbb25fe0dadbd2879dc60dcee527775c6f65b33cd3b8160840
+                image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:529abf9cafd49ecbb25fe0dadbd2879dc60dcee527775c6f65b33cd3b8160840
                 env:
                   - name: METRICS_BIND_ADDRESS
                   - name: WATCH_NAMESPACE
                   - name: CSI_DRIVER_IMAGE
-                    value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:5aeeecb8f73b1a075038a90c3dbb616fe0b5b474f7c2acfffc87e052812f9455
+                    value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:5aeeecb8f73b1a075038a90c3dbb616fe0b5b474f7c2acfffc87e052812f9455
diff --git a/operator/controllers/config/constants.go b/operator/controllers/config/constants.go
@@ -71,8 +71,8 @@ const (
 	ENVKubeVersion  = "KUBE_VERSION"
 	ENVCGPrefix     = "CSI_CG_PREFIX"
 	ENVSymDirPath   = "SYMLINK_DIR_PATH"
-	DriverVersion   = "2.10.3"
-	OperatorVersion = "2.10.3"
+	DriverVersion   = "2.10.4"
+	OperatorVersion = "2.10.4"
 
 	// Number of replica pods for CSI Sidecar deployment
 	ReplicaCount = int32(2)
@@ -88,7 +88,7 @@ const (
 	IBMSystem390 = "s390x"
 
 	//  Default images for containers
-	CSIDriverPluginImage = "quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver:v2.10.3"
+	CSIDriverPluginImage = "quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver:v2.10.4"
 	//  registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
 	CSINodeDriverRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar@sha256:f6717ce72a2615c7fbc746b4068f788e78579c54c43b8716e5ce650d97af2df1" // #nosec G101 false positive
 	//  registry.k8s.io/sig-storage/livenessprobe:v2.10.0
diff --git a/tools/ansible/common/dev-env.yaml b/tools/ansible/common/dev-env.yaml
@@ -2,7 +2,7 @@
 - name: Set environment facts
   set_fact:
     OPERATOR_SDK_VER: "v1.15.0"
-    OPERATOR_VERSION: "2.10.3"
+    OPERATOR_VERSION: "2.10.4"
     GO_VERSION:       "go1.20"
 
 # Something is wrong with this bit.
diff --git a/tools/ansible/common/runtime-env.yaml b/tools/ansible/common/runtime-env.yaml
@@ -2,7 +2,7 @@
 - name: Set environment facts
   set_fact:
     OPERATOR_SDK_VER: "v1.15.0"
-    OPERATOR_VERSION: "2.10.3"
+    OPERATOR_VERSION: "2.10.4"
 
 #- name: Ensure 'python3' is installed
 #  package:

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ var (`
`41`	`41`	`driverName = flag.String("drivername", "spectrumscale.csi.ibm.com", "name of the driver")`
`42`	`42`	`nodeID = flag.String("nodeid", "", "node id")`
`43`	`43`	`kubeletRootDir = flag.String("kubeletRootDirPath", "/var/lib/kubelet", "kubelet root directory path")`
`44`		`- vendorVersion = "2.10.3"`
	`44`	`+ vendorVersion = "2.10.4"`
`45`	`45`	`)`
`46`	`46`
`47`	`47`	`func main() {`