Update Samples file in config (#530)

* update samples file in config * update yaml config files * update yaml file
dell · Mar 19, 2024 · 5a711be · 5a711be
1 parent 94166c5
commit 5a711be
Show file tree

Hide file tree

Showing 9 changed files with 247 additions and 24 deletions.
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -8,7 +8,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=dell-csm-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
@@ -170,13 +170,35 @@ metadata:
                   "args": [
                     "--volume-name-prefix=csipscale"
                   ],
+                  "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0",
                   "name": "provisioner"
                 },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0",
+                  "name": "attacher"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0",
+                  "name": "registrar"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0",
+                  "name": "resizer"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1",
+                  "name": "snapshotter"
+                },
+                {
+                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "name": "csi-metadata-retriever"
+                },
                 {
                   "args": [
                     "--monitor-interval=60s"
                   ],
                   "enabled": false,
+                  "image": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0",
                   "name": "external-health-monitor"
                 }
               ]
@@ -253,6 +275,7 @@ metadata:
               {
                 "components": [
                   {
+                    "certificate": "",
                     "enabled": false,
                     "envs": [
                       {
@@ -261,9 +284,11 @@ metadata:
                       }
                     ],
                     "image": "dellemc/csm-topology:v1.8.0",
-                    "name": "topology"
+                    "name": "topology",
+                    "privateKey": ""
                   },
                   {
+                    "certificate": "",
                     "enabled": false,
                     "envs": [
                       {
@@ -272,7 +297,8 @@ metadata:
                       }
                     ],
                     "image": "otel/opentelemetry-collector:0.42.0",
-                    "name": "otel-collector"
+                    "name": "otel-collector",
+                    "privateKey": ""
                   },
                   {
                     "enabled": false,
@@ -510,13 +536,35 @@ metadata:
                   "args": [
                     "--volume-name-prefix=pmax"
                   ],
+                  "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0",
                   "name": "provisioner"
                 },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0",
+                  "name": "attacher"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0",
+                  "name": "registrar"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0",
+                  "name": "resizer"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1",
+                  "name": "snapshotter"
+                },
+                {
+                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "name": "csi-metadata-retriever"
+                },
                 {
                   "args": [
                     "--monitor-interval=60s"
                   ],
                   "enabled": false,
+                  "image": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0",
                   "name": "external-health-monitor"
                 }
               ]
@@ -619,6 +667,7 @@ metadata:
               {
                 "components": [
                   {
+                    "certificate": "",
                     "enabled": false,
                     "envs": [
                       {
@@ -627,9 +676,11 @@ metadata:
                       }
                     ],
                     "image": "dellemc/csm-topology:v1.8.0",
-                    "name": "topology"
+                    "name": "topology",
+                    "privateKey": ""
                   },
                   {
+                    "certificate": "",
                     "enabled": false,
                     "envs": [
                       {
@@ -638,7 +689,8 @@ metadata:
                       }
                     ],
                     "image": "otel/opentelemetry-collector:0.42.0",
-                    "name": "otel-collector"
+                    "name": "otel-collector",
+                    "privateKey": ""
                   },
                   {
                     "enabled": false,
@@ -778,13 +830,35 @@ metadata:
                   "args": [
                     "--volume-name-prefix=csivol"
                   ],
+                  "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0",
                   "name": "provisioner"
                 },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0",
+                  "name": "attacher"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0",
+                  "name": "registrar"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0",
+                  "name": "resizer"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1",
+                  "name": "snapshotter"
+                },
+                {
+                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "name": "csi-metadata-retriever"
+                },
                 {
                   "args": [
                     "--monitor-interval=60s"
                   ],
                   "enabled": false,
+                  "image": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0",
                   "name": "external-health-monitor"
                 }
               ]
@@ -925,13 +999,35 @@ metadata:
                   "args": [
                     "--volume-name-prefix=csivol"
                   ],
+                  "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0",
                   "name": "provisioner"
                 },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0",
+                  "name": "attacher"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0",
+                  "name": "registrar"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0",
+                  "name": "resizer"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1",
+                  "name": "snapshotter"
+                },
+                {
+                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "name": "csi-metadata-retriever"
+                },
                 {
                   "args": [
                     "--monitor-interval=60s"
                   ],
                   "enabled": false,
+                  "image": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0",
                   "name": "external-health-monitor"
                 }
               ]
@@ -1045,8 +1141,29 @@ metadata:
                   "args": [
                     "--volume-name-prefix=k8s"
                   ],
+                  "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0",
                   "name": "provisioner"
                 },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0",
+                  "name": "attacher"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0",
+                  "name": "registrar"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0",
+                  "name": "resizer"
+                },
+                {
+                  "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1",
+                  "name": "snapshotter"
+                },
+                {
+                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "name": "csi-metadata-retriever"
+                },
                 {
                   "enabled": false,
                   "envs": [
@@ -1067,6 +1184,7 @@ metadata:
                     "--monitor-interval=60s"
                   ],
                   "enabled": false,
+                  "image": "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0",
                   "name": "csi-external-health-monitor-controller"
                 }
               ]
@@ -1096,6 +1214,7 @@ metadata:
               {
                 "components": [
                   {
+                    "certificate": "",
                     "enabled": false,
                     "envs": [
                       {
@@ -1104,9 +1223,11 @@ metadata:
                       }
                     ],
                     "image": "dellemc/csm-topology:v1.8.0",
-                    "name": "topology"
+                    "name": "topology",
+                    "privateKey": ""
                   },
                   {
+                    "certificate": "",
                     "enabled": false,
                     "envs": [
                       {
@@ -1115,7 +1236,8 @@ metadata:
                       }
                     ],
                     "image": "otel/opentelemetry-collector:0.42.0",
-                    "name": "otel-collector"
+                    "name": "otel-collector",
+                    "privateKey": ""
                   },
                   {
                     "enabled": false,
@@ -1271,7 +1393,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Storage
     containerImage: docker.io/dellemc/dell-csm-operator:v1.5.0
-    createdAt: "2024-03-08T07:26:57Z"
+    createdAt: "2024-03-19T11:05:35Z"
     description: Easily install and manage Dell’s CSI Drivers and CSM
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "false"
@@ -3662,5 +3784,5 @@ spec:
   - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
     name: cert-persister
   skips:
-  - dell-csm-operator.v1.4.2
+  - dell-csm-operator.v1.4.3
   version: 1.5.0
diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml
@@ -1261,5 +1261,5 @@ spec:
   - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
     name: kube-rbac-proxy
   skips:
-  - dell-csm-operator.v1.4.2
+  - dell-csm-operator.v1.4.3
   version: 1.5.0
diff --git a/config/samples/storage_v1_csm_connectivity_client.yaml b/config/samples/storage_v1_csm_connectivity_client.yaml
@@ -24,12 +24,3 @@ spec:
       - name: cert-persister
         image: dellemc/connectivity-cert-persister-k8s:0.11.0
         imagePullPolicy: IfNotPresent
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: connectivity-client-docker-k8s-cert
-  namespace: dell-connectivity-client
-type: Opaque
-data:
-  cert.pem: ""
diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml
@@ -33,7 +33,7 @@ spec:
           value: "true"
         # Specify kubelet config dir path.
         # Ensure that the config.yaml file is present at this path.
-        # Default value: None
+        # Default value: /var/lib/kubelet
         - name: KUBELET_CONFIG_DIR
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
@@ -44,7 +44,18 @@ spec:
     sideCars:
     # 'k8s' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
         args: ["--volume-name-prefix=k8s"]
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+      - name: csi-metadata-retriever
+        image: dellemc/csi-metadata-retriever:v1.7.2
 
     # sdc-monitor is disabled by default, due to high CPU usage
       - name: sdc-monitor
@@ -61,6 +72,7 @@ spec:
       - name: csi-external-health-monitor-controller
         enabled: false
         args: ["--monitor-interval=60s"]
+        image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
     # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity
     # Configure when the storageCapacity is set as "true"
     # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m
@@ -212,6 +224,14 @@ spec:
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
           image: dellemc/csm-topology:v1.8.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
+          certificate: ""
+          # privateKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
+          #  for self-signed certs, leave empty string
+          # Allowed values: string
+          privateKey: ""
           envs:
             # topology log level
             # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -225,6 +245,14 @@ spec:
           # image: Defines otel-collector image. This shouldn't be changed
           # Allowed values: string
           image: 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
+          certificate: ""
+          # privateKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
+          #  for self-signed certs, leave empty string
+          # Allowed values: string
+          privateKey: ""
           envs:
             # image of nginx proxy image
             # Allowed values: string