From 383c76adc82523dbe5d926362dc87d273958b45f Mon Sep 17 00:00:00 2001 From: HarishH-DELL Date: Mon, 11 Mar 2024 14:22:01 +0530 Subject: [PATCH 1/2] Finial Manifest update --- ...vity-client-docker-k8s-cert_v1_secret.yaml | 7 ++ ...ll-csm-operator.clusterserviceversion.yaml | 66 +++---------------- bundle/metadata/annotations.yaml | 8 +-- ...ll-csm-operator.clusterserviceversion.yaml | 14 ++-- deploy/operator.yaml | 29 -------- 5 files changed, 25 insertions(+), 99 deletions(-) create mode 100644 bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml diff --git a/bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml b/bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml new file mode 100644 index 000000000..577bea69c --- /dev/null +++ b/bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +data: + cert.pem: "" +kind: Secret +metadata: + name: connectivity-client-docker-k8s-cert +type: Opaque diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 605d18eb3..165f5b859 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -1271,9 +1271,16 @@ metadata: capabilities: Seamless Upgrades categories: Storage containerImage: docker.io/dellemc/dell-csm-operator:v1.5.0 - createdAt: "2024-02-23T08:11:16Z" + createdAt: "2024-03-08T07:26:57Z" description: Easily install and manage Dell’s CSI Drivers and CSM - operators.operatorframework.io/builder: operator-sdk-v1.32.0 + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "false" + features.operators.openshift.io/proxy-aware: "false" + features.operators.openshift.io/tls-profiles: "false" + features.operators.openshift.io/token-auth-aws: "false" + features.operators.openshift.io/token-auth-azure: "false" + features.operators.openshift.io/token-auth-gcp: "false" + operators.operatorframework.io/builder: operator-sdk-v1.34.1 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/dell/csm-operator support: Dell Technologies @@ -3599,61 +3606,6 @@ spec: provider: name: Dell Technologies url: https://github.com/dell/csm-operator - relatedImages: - - image: docker.io/dellemc/dell-csm-operator:v1.4.1 - name: dell-csm-operator - - image: docker.io/dellemc/csi-isilon:v2.9.1 - name: csi-isilon - - image: docker.io/dellemc/csi-powermax:v2.9.1 - name: csi-powermax - - image: docker.io/dellemc/csipowermax-reverseproxy:v2.8.1 - name: csipowermax-reverseproxy - - image: docker.io/dellemc/csi-powerstore:v2.9.1 - name: csi-powerstore - - image: docker.io/dellemc/csi-unity:v2.9.1 - name: csi-unity - - image: docker.io/dellemc/csi-vxflexos:v2.9.1 - name: csi-vxflexos - - image: docker.io/dellemc/sdc:4.5.1 - name: sdc - - image: docker.io/dellemc/csm-authorization-sidecar:v1.10.0 - name: karavi-authorization-proxy - - image: docker.io/dellemc/dell-csi-replicator:v1.8.0 - name: dell-csi-replicator - - image: docker.io/dellemc/dell-replication-controller:v1.8.0 - name: dell-replication-controller-manager - - image: docker.io/dellemc/csm-topology:v1.8.0 - name: topology - - image: docker.io/otel/opentelemetry-collector:0.42.0 - name: otel-collector - - image: docker.io/dellemc/csm-metrics-powerscale:v1.5.0 - name: metrics-powerscale - - image: docker.io/dellemc/csm-metrics-powermax:v1.3.0 - name: metrics-powermax - - image: docker.io/dellemc/csm-metrics-powerflex:v1.8.0 - name: metrics-powerflex - - image: docker.io/dellemc/podmon:v1.9.0 - name: podmon-node - - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 - name: kube-rbac-proxy - - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 - name: attacher - - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 - name: provisioner - - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: snapshotter - - 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-external-health-monitor-controller:v0.11.0 - name: externalhealthmonitorcontroller - - image: dellemc/csi-metadata-retriever:v1.7.2 - name: metadataretriever - - image: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3 - name: dell-connectivity-client - - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 - name: cert-persister skips: - dell-csm-operator.v1.4.2 version: 1.5.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 6121835d1..2b6b0846d 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,15 +4,11 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: dell-csm-operator - operators.operatorframework.io.bundle.channels.v1: stable - operators.operatorframework.io.bundle.channel.default.v1: stable - operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 + operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 operators.operatorframework.io.test.config.v1: tests/scorecard/ - - # Annotations to specify supported OCP versions. - com.redhat.openshift.versions: v4.13-v4.14 \ No newline at end of file diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index 2b2862eac..32f284419 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -2,19 +2,19 @@ apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: annotations: - features.operators.openshift.io/disconnected : "true" - features.operators.openshift.io/fips-compliant: "false" - features.operators.openshift.io/proxy-aware: "false" - features.operators.openshift.io/token-auth-azure: "false" - features.operators.openshift.io/token-auth-gcp: "false" - features.operators.openshift.io/tls-profiles: "false" - features.operators.openshift.io/token-auth-aws: "false" alm-examples: '[]' capabilities: Seamless Upgrades categories: Storage containerImage: docker.io/dellemc/dell-csm-operator:v1.5.0 createdAt: "2022-03-29T11:59:59Z" description: Easily install and manage Dell’s CSI Drivers and CSM + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "false" + features.operators.openshift.io/proxy-aware: "false" + features.operators.openshift.io/tls-profiles: "false" + features.operators.openshift.io/token-auth-aws: "false" + features.operators.openshift.io/token-auth-azure: "false" + features.operators.openshift.io/token-auth-gcp: "false" repository: https://github.com/dell/csm-operator support: Dell Technologies name: dell-csm-operator.v1.5.0 diff --git a/deploy/operator.yaml b/deploy/operator.yaml index a0bfa2913..a05f1a2a9 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1102,8 +1102,6 @@ rules: - list - update - watch - - get - - patch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -1161,31 +1159,6 @@ subjects: namespace: dell-csm-operator --- apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: application-mobility-velero-server -rules: -- apiGroups: - - '*' - resources: - - '*' - verbs: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: application-mobility-velero-server-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: application-mobility-velero-server -subjects: -- kind: ServiceAccount - name: dell-csm-operator-manager-service-account - namespace: dell-csm-operator ---- -apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: dell-csm-operator-proxy-rolebinding @@ -1249,8 +1222,6 @@ spec: metadata: labels: control-plane: controller-manager - annotations: - storage.dell.com/CSMVersion: v1.10.0 spec: containers: - args: From 73ad8dd7adfe804bf57f972ca2889f801189bd28 Mon Sep 17 00:00:00 2001 From: HarishH-DELL Date: Mon, 11 Mar 2024 18:48:30 +0530 Subject: [PATCH 2/2] Code review comments addressed --- ...vity-client-docker-k8s-cert_v1_secret.yaml | 7 --- ...ll-csm-operator.clusterserviceversion.yaml | 55 +++++++++++++++++++ bundle/metadata/annotations.yaml | 6 +- deploy/operator.yaml | 29 ++++++++++ 4 files changed, 89 insertions(+), 8 deletions(-) delete mode 100644 bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml diff --git a/bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml b/bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml deleted file mode 100644 index 577bea69c..000000000 --- a/bundle/manifests/connectivity-client-docker-k8s-cert_v1_secret.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - cert.pem: "" -kind: Secret -metadata: - name: connectivity-client-docker-k8s-cert -type: Opaque diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 165f5b859..c6d6c7e56 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -3606,6 +3606,61 @@ spec: provider: name: Dell Technologies url: https://github.com/dell/csm-operator + relatedImages: + - image: docker.io/dellemc/dell-csm-operator:v1.4.1 + name: dell-csm-operator + - image: docker.io/dellemc/csi-isilon:v2.9.1 + name: csi-isilon + - image: docker.io/dellemc/csi-powermax:v2.9.1 + name: csi-powermax + - image: docker.io/dellemc/csipowermax-reverseproxy:v2.8.1 + name: csipowermax-reverseproxy + - image: docker.io/dellemc/csi-powerstore:v2.9.1 + name: csi-powerstore + - image: docker.io/dellemc/csi-unity:v2.9.1 + name: csi-unity + - image: docker.io/dellemc/csi-vxflexos:v2.9.1 + name: csi-vxflexos + - image: docker.io/dellemc/sdc:4.5.1 + name: sdc + - image: docker.io/dellemc/csm-authorization-sidecar:v1.10.0 + name: karavi-authorization-proxy + - image: docker.io/dellemc/dell-csi-replicator:v1.8.0 + name: dell-csi-replicator + - image: docker.io/dellemc/dell-replication-controller:v1.8.0 + name: dell-replication-controller-manager + - image: docker.io/dellemc/csm-topology:v1.8.0 + name: topology + - image: docker.io/otel/opentelemetry-collector:0.42.0 + name: otel-collector + - image: docker.io/dellemc/csm-metrics-powerscale:v1.5.0 + name: metrics-powerscale + - image: docker.io/dellemc/csm-metrics-powermax:v1.3.0 + name: metrics-powermax + - image: docker.io/dellemc/csm-metrics-powerflex:v1.8.0 + name: metrics-powerflex + - image: docker.io/dellemc/podmon:v1.9.0 + name: podmon-node + - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 + name: kube-rbac-proxy + - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + name: attacher + - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + name: provisioner + - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + name: snapshotter + - 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-external-health-monitor-controller:v0.11.0 + name: externalhealthmonitorcontroller + - image: dellemc/csi-metadata-retriever:v1.7.2 + name: metadataretriever + - image: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3 + name: dell-connectivity-client + - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 + name: cert-persister skips: - dell-csm-operator.v1.4.2 version: 1.5.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 2b6b0846d..765906674 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,7 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: dell-csm-operator - operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.bundle.channels.v1: stable + operators.operatorframework.io.bundle.channel.default.v1: stable operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 @@ -12,3 +13,6 @@ annotations: # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 operators.operatorframework.io.test.config.v1: tests/scorecard/ + + # Annotations to specify supported OCP versions. + com.redhat.openshift.versions: v4.13-v4.14 \ No newline at end of file diff --git a/deploy/operator.yaml b/deploy/operator.yaml index a05f1a2a9..a0bfa2913 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1102,6 +1102,8 @@ rules: - list - update - watch + - get + - patch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -1159,6 +1161,31 @@ subjects: namespace: dell-csm-operator --- apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: application-mobility-velero-server +rules: +- apiGroups: + - '*' + resources: + - '*' + verbs: + - '*' +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: application-mobility-velero-server-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: application-mobility-velero-server +subjects: +- kind: ServiceAccount + name: dell-csm-operator-manager-service-account + namespace: dell-csm-operator +--- +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: dell-csm-operator-proxy-rolebinding @@ -1222,6 +1249,8 @@ spec: metadata: labels: control-plane: controller-manager + annotations: + storage.dell.com/CSMVersion: v1.10.0 spec: containers: - args: