Merge branch 'main' into powerstore-nodeSelectors-toleration-changes

dell · Jun 7, 2022 · fdec6df · fdec6df
2 parents 46ab047 + 727c25d
commit fdec6df
Show file tree

Hide file tree

Showing 28 changed files with 195 additions and 111 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -13,6 +13,7 @@
 # Deepak Ghivari (Deepak-Ghivari)
 # Francis Nijay (francis-nijay)
 # Karthik K (karthikk92)
+# Keerthi Bandapati (bandak2)
 # Matt Schmaelzle (mjsdell)
 # Nitesh Rewatkar (nitesh3108)
 # Prasanna Muthukumaraswamy (prablr79)
@@ -22,4 +23,4 @@
 # Spandita Panigrahi (panigs7)
 
 # for all files:
-* @abhi16394 @bpjain2004 @boyamurthy @Deepak-Ghivari @francis-nijay @karthikk92 @mjsdell @nitesh3108 @prablr79 @rajendraindukuri @randeepsharma @rensyct @panigs7
+* @abhi16394 @bpjain2004 @boyamurthy @Deepak-Ghivari @francis-nijay @karthikk92 @bandak2 @mjsdell @nitesh3108 @prablr79 @rajendraindukuri @randeepsharma @rensyct @panigs7
diff --git a/.github/containerscan/allowedlist.yaml b/.github/containerscan/allowedlist.yaml
@@ -6,6 +6,7 @@ general:
     - CVE-2022-26280
     - CVE-2022-0778
     - CVE-2018-25032
+    - CVE-2022-1271
   bestPracticeViolations:
     # list of best practies violatied that needs a fix
     - DKL-DI-0006

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:21504085e8d740e62b52573fe9a1a0d58a3e7dba589cac69734ad2fa81d66635
+FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:9a81cce19ae2a962269d4a7fecd38aec60b852118ad798a265c3f6c4be0df610
 
 RUN microdnf install yum \
     && yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ The Dell CSI Operator is itself installed as a Kubernetes deployment.
 Dell CSI Operator has been tested and qualified with 
 
     * Upstream Kubernetes cluster v1.22, v1.23, v1.24
-    * OpenShift Clusters 4.9, 4.10, 4.10 EUS with RHEL 7.x & RHCOS worker nodes
+    * OpenShift Clusters 4.9, 4.10 with RHEL 7.x (with OCP 4.9), RHEL 8.x (with OCP 4.10) & RHCOS worker nodes
 
 ## Installation
 To install Dell CSI Operator please refer the steps given here at [https://dell.github.io/csm-docs/docs/csidriver/installation/operator/](https://dell.github.io/csm-docs/docs/csidriver/installation/operator/)

diff --git a/config/samples/storage_v1_csiisilon.yaml b/config/samples/storage_v1_csiisilon.yaml
@@ -162,9 +162,10 @@ spec:
       # Leave as blank to consider all nodes
       # Allowed values: map of key-value pairs
       # Default value: None
-      # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
       nodeSelector:
+      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
+      #  node-role.kubernetes.io/master: ""
+      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  node-role.kubernetes.io/control-plane: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.

diff --git a/config/samples/storage_v1_csipowerstore.yaml b/config/samples/storage_v1_csipowerstore.yaml
@@ -47,15 +47,19 @@ spec:
       # Leave as blank to consider all nodes
       # Allowed values: map of key-value pairs
       # Default value: None
-      # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
+      #  node-role.kubernetes.io/master: ""
+      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
+      #  node-role.kubernetes.io/control-plane: ""
 
       # tolerations: Define tolerations for the controllers, if required.
       # Leave as blank to install controller on worker nodes
       # Default value: None
       tolerations:
+      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint
+      #  - key: "node-role.kubernetes.io/master"
+      # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint
       #  - key: "node-role.kubernetes.io/control-plane"
       #    operator: "Exists"
       #    effect: "NoSchedule"         

diff --git a/samples/isilon_v220_k8s_121.yaml b/samples/isilon_v220_k8s_121.yaml
@@ -127,14 +127,14 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the controller deployment, if required.
       # Default value: None
       tolerations:
-      #  - key: "node-role.kubernetes.io/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Equal"
       #    value: "true"
       #    effect: "NoSchedule"
@@ -174,9 +174,9 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None

diff --git a/samples/isilon_v220_k8s_122.yaml b/samples/isilon_v220_k8s_122.yaml
@@ -127,14 +127,14 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the controller deployment, if required.
       # Default value: None
       tolerations:
-      #  - key: "node-role.kubernetes.io/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Equal"
       #    value: "true"
       #    effect: "NoSchedule"
@@ -174,9 +174,9 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None

diff --git a/samples/isilon_v220_k8s_123.yaml b/samples/isilon_v220_k8s_123.yaml
@@ -127,14 +127,14 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the controller deployment, if required.
       # Default value: None
       tolerations:
-      #  - key: "node-role.kubernetes.io/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Equal"
       #    value: "true"
       #    effect: "NoSchedule"
@@ -174,9 +174,9 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None

diff --git a/samples/isilon_v220_ops_48.yaml b/samples/isilon_v220_ops_48.yaml
@@ -118,14 +118,14 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the controller deployment, if required.
       # Default value: None
       tolerations:
-      #  - key: "node-role.kubernetes.io/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Equal"
       #    value: "true"
       #    effect: "NoSchedule"
@@ -157,9 +157,9 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None

diff --git a/samples/isilon_v220_ops_49.yaml b/samples/isilon_v220_ops_49.yaml
@@ -118,14 +118,14 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the controller deployment, if required.
       # Default value: None
       tolerations:
-      #  - key: "node-role.kubernetes.io/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Equal"
       #    value: "true"
       #    effect: "NoSchedule"
@@ -157,9 +157,9 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #  node-role.kubernetes.io/control-plane: ""
+      #  node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None

diff --git a/samples/powerstore_v220_k8s_121.yaml b/samples/powerstore_v220_k8s_121.yaml
@@ -63,15 +63,15 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   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/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Exists"
       #    effect: "NoSchedule"    
 

diff --git a/samples/powerstore_v220_k8s_122.yaml b/samples/powerstore_v220_k8s_122.yaml
@@ -63,15 +63,15 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   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/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Exists"
       #    effect: "NoSchedule"    
 

diff --git a/samples/powerstore_v220_k8s_123.yaml b/samples/powerstore_v220_k8s_123.yaml
@@ -64,15 +64,15 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   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/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Exists"
       #    effect: "NoSchedule"  
 

diff --git a/samples/powerstore_v220_ops_48.yaml b/samples/powerstore_v220_ops_48.yaml
@@ -48,15 +48,15 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   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/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Exists"
       #    effect: "NoSchedule"         
     node:

diff --git a/samples/powerstore_v220_ops_49.yaml b/samples/powerstore_v220_ops_49.yaml
@@ -48,15 +48,15 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   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/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Exists"
       #    effect: "NoSchedule"      
     node:

diff --git a/samples/powerstore_v230_ops_410.yaml b/samples/powerstore_v230_ops_410.yaml
@@ -65,7 +65,6 @@ spec:
       # - key: "node-role.kubernetes.io/control-plane"
       #   operator: "Exists"
       #   effect: "NoSchedule"
-
     node:
       envs:
         # Set to "true" to enable ISCSI CHAP Authentication

diff --git a/samples/unity_v220_k8s_121.yaml b/samples/unity_v220_k8s_121.yaml
@@ -40,15 +40,15 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   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/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Exists"
       #    effect: "NoSchedule"
 
@@ -68,9 +68,9 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None

diff --git a/samples/unity_v220_k8s_122.yaml b/samples/unity_v220_k8s_122.yaml
@@ -39,15 +39,15 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   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/control-plane"
+      #  - key: "node-role.kubernetes.io/master"
       #    operator: "Exists"
       #    effect: "NoSchedule"
 
@@ -67,9 +67,9 @@ spec:
       # Allowed values: map of key-value pairs
       # Default value: None
       # Examples:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
       nodeSelector:
-      #   node-role.kubernetes.io/control-plane: ""
+      #   node-role.kubernetes.io/master: ""
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None