Update UBI image and manifests

dell · Mar 8, 2022 · 6b7c2d2 · 6b7c2d2
1 parent e1a93a3
commit 6b7c2d2
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ COPY pkg/ pkg/
 
 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@sha256:3aa3f379a81013bd3264faa0af87d201cdaa5981050d78c567b48fdfd5b38bb8
+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-csi-operator-certified.clusterserviceversion.yaml b/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml
@@ -89,6 +89,14 @@ metadata:
               },
               "replicas": 2,
               "sideCars": [
+                {
+                  "args": [
+                    "--leader-election-lease-duration=15s",
+                    "--leader-election-renew-deadline=10s",
+                    "--leader-election-retry-period=5s"
+                  ],
+                  "name": "common"
+                },
                 {
                   "args": [
                     "--volume-name-prefix=csipscale"
@@ -249,8 +257,16 @@ metadata:
                 "imagePullPolicy": "IfNotPresent"
               },
               "configVersion": "v2.2.0",
+              "controller": {
+                "nodeSelector": null,
+                "tolerations": null
+              },
               "dnsPolicy": "ClusterFirstWithHostNet",
               "forceUpdate": false,
+              "node": {
+                "nodeSelector": null,
+                "tolerations": null
+              },
               "replicas": 2,
               "sideCars": [
                 {

diff --git a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml
@@ -89,6 +89,14 @@ metadata:
               },
               "replicas": 2,
               "sideCars": [
+                {
+                  "args": [
+                    "--leader-election-lease-duration=15s",
+                    "--leader-election-renew-deadline=10s",
+                    "--leader-election-retry-period=5s"
+                  ],
+                  "name": "common"
+                },
                 {
                   "args": [
                     "--volume-name-prefix=csipscale"
@@ -249,8 +257,16 @@ metadata:
                 "imagePullPolicy": "IfNotPresent"
               },
               "configVersion": "v2.2.0",
+              "controller": {
+                "nodeSelector": null,
+                "tolerations": null
+              },
               "dnsPolicy": "ClusterFirstWithHostNet",
               "forceUpdate": false,
+              "node": {
+                "nodeSelector": null,
+                "tolerations": null
+              },
               "replicas": 2,
               "sideCars": [
                 {

diff --git a/config/samples/storage_v1_csiisilon.yaml b/config/samples/storage_v1_csiisilon.yaml
@@ -175,5 +175,7 @@ spec:
       #    effect: "NoExecute"
 
     sideCars:
+      - name: common
+        args: ["--leader-election-lease-duration=15s", "--leader-election-renew-deadline=10s", "--leader-election-retry-period=5s"]
       - name: provisioner
         args: ["--volume-name-prefix=csipscale"]
diff --git a/config/samples/storage_v1_csipowerstore.yaml b/config/samples/storage_v1_csipowerstore.yaml
@@ -84,4 +84,3 @@ spec:
       #  - key: "node-role.kubernetes.io/worker"
       #    operator: "Exists"
       #    effect: "NoSchedule"
-
diff --git a/config/samples/storage_v1_csiunity.yaml b/config/samples/storage_v1_csiunity.yaml
@@ -17,3 +17,42 @@ spec:
         args: ["--volume-name-prefix=csiunity","--default-fstype=ext4"]
       - name: snapshotter
         args: ["--snapshot-name-prefix=csiunitysnap"]
+    controller:
+      # nodeSelector: Define node selection constraints for controller pods.
+      # For the pod to be eligible to run on a node, the node must have each
+      # of the indicated key-value pairs as labels.
+      # Leave as blank to consider all nodes
+      # Allowed values: map of key-value pairs
+      # Default value: None
+      # Examples:
+      #   node-role.kubernetes.io/master: ""
+      nodeSelector:
+      #   node-role.kubernetes.io/master: ""
+
+      # tolerations: Define tolerations for the controllers, if required.
+      # Leave as blank to install controller on worker nodes
+      # Default value: None
+      tolerations:
+      #  - key: "node-role.kubernetes.io/master"
+      #    operator: "Exists"
+      #    effect: "NoSchedule"
+
+    node:
+      # nodeSelector: Define node selection constraints for node pods.
+      # For the pod to be eligible to run on a node, the node must have each
+      # of the indicated key-value pairs as labels.
+      # Leave as blank to consider all nodes
+      # Allowed values: map of key-value pairs
+      # Default value: None
+      # Examples:
+      #   node-role.kubernetes.io/master: ""
+      nodeSelector:
+      #   node-role.kubernetes.io/master: ""
+
+      # tolerations: Define tolerations for the controllers, if required.
+      # Leave as blank to install controller on worker nodes
+      # Default value: None
+      tolerations:
+      #  - key: "node-role.kubernetes.io/master"
+      #    operator: "Exists"
+      #    effect: "NoSchedule"
diff --git a/test/driver/Readme.md b/test/driver/Readme.md
@@ -9,9 +9,8 @@ Files present
 ## How to Execute?
 1. Take a copy of sample_driver_config file and rename (according to your csi-driver)
 2. Furnish the newly created driver config file with all the required values (including driver build number and driver yaml file name)
-3. Manually furnish the pre-requisites (like namespaes, secrets etc.)
+3. Manually furnish the pre-requisites (like namespaces, secrets etc.)
 4. Execute the following command with operator build number (in the format of dell-csi-operator:v1.2.0) to create csi-operator and then csi drivers (controller and node)
     1. sh install_csi_driver.sh "<operator build name>"
 5. Wait for the script to finish and check the existence of csi-operator and controller/node by normal kubectl commands.
-6. This script will pull the specified operator build
-5.As of unity/powermax driver has been tested. Other drivers are yet to be tested.
+6. This script will pull the specified operator build. Unity/powermax driver has been tested. Other drivers are yet to be tested.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,4 +84,3 @@ spec:
		# - key: "node-role.kubernetes.io/worker"
		# operator: "Exists"
		# effect: "NoSchedule"