Skip to content

Commit

Permalink
Merge branch 'main' into usr/anathoodell/zonevalidation
Browse files Browse the repository at this point in the history
  • Loading branch information
anathoodell committed Dec 18, 2024
2 parents 580c5da + f54c83a commit 33834fd
Show file tree
Hide file tree
Showing 299 changed files with 11,370 additions and 1,341 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ LABEL vendor="Dell Inc." \
name="dell-csm-operator" \
summary="Operator for installing Dell CSI Drivers and Dell CSM Modules" \
description="Common Operator for installing various Dell CSI Drivers and Dell CSM Modules" \
version="1.7.0" \
version="1.8.0" \
license="Dell CSM Operator Apache License"

# copy the licenses folder
Expand Down
2 changes: 1 addition & 1 deletion api/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ type Driver struct {

// ForceRemoveDriver is the boolean flag used to remove driver deployment when CR is deleted
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Force Remove Driver"
ForceRemoveDriver bool `json:"forceRemoveDriver,omitempty" yaml:"forceRemoveDriver"`
ForceRemoveDriver *bool `json:"forceRemoveDriver,omitempty" yaml:"forceRemoveDriver"`
}

// ContainerTemplate template
Expand Down
5 changes: 5 additions & 0 deletions api/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

220 changes: 110 additions & 110 deletions bundle/manifests/dell-csm-operator.clusterserviceversion.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/install/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ bases:
images:
- name: controller
newName: quay.io/dell/container-storage-modules/dell-csm-operator
newTag: v1.7.0
newTag: v1.8.0
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/dell/container-storage-modules/dell-csm-operator
newTag: v1.7.0
newTag: v1.8.0
44 changes: 22 additions & 22 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,65 +29,65 @@ spec:
imagePullPolicy: Always
name: manager
env:
- value: quay.io/dell/container-storage-modules/dell-csm-operator:v1.7.0
- value: quay.io/dell/container-storage-modules/dell-csm-operator:v1.8.0
name: RELATED_IMAGE_dell-csm-operator
- value: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0
- value: quay.io/dell/container-storage-modules/csi-isilon:v2.13.0
name: RELATED_IMAGE_csi-isilon
- value: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0
- value: quay.io/dell/container-storage-modules/csi-powermax:v2.13.0
name: RELATED_IMAGE_csi-powermax
- value: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
- value: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.12.0
name: RELATED_IMAGE_csipowermax-reverseproxy
- value: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0
- value: quay.io/dell/container-storage-modules/csi-powerstore:v2.13.0
name: RELATED_IMAGE_csi-powerstore
- value: quay.io/dell/container-storage-modules/csi-unity:v2.12.0
- value: quay.io/dell/container-storage-modules/csi-unity:v2.13.0
name: RELATED_IMAGE_csi-unity
- value: quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0
- value: quay.io/dell/container-storage-modules/csi-vxflexos:v2.13.0
name: RELATED_IMAGE_csi-vxflexos
- value: docker.io/dellemc/sdc:4.5.2.1
name: RELATED_IMAGE_sdc
- name: RELATED_IMAGE_karavi-authorization-proxy
value: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v2.0.0
value: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v2.1.0
- name: RELATED_IMAGE_csm-authorization-proxy
value: quay.io/dell/container-storage-modules/csm-authorization-proxy:v2.0.0
value: quay.io/dell/container-storage-modules/csm-authorization-proxy:v2.1.0
- name: RELATED_IMAGE_csm-authorization-tenant
value: quay.io/dell/container-storage-modules/csm-authorization-tenant:v2.0.0
value: quay.io/dell/container-storage-modules/csm-authorization-tenant:v2.1.0
- name: RELATED_IMAGE_csm-authorization-role
value: quay.io/dell/container-storage-modules/csm-authorization-role:v2.0.0
value: quay.io/dell/container-storage-modules/csm-authorization-role:v2.1.0
- name: RELATED_IMAGE_csm-authorization-storage
value: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.0.0
value: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.1.0
- name: RELATED_IMAGE_csm-authorization-controller
value: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.0.0
- value: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
value: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.1.0
- value: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.11.0
name: RELATED_IMAGE_dell-csi-replicator
- value: quay.io/dell/container-storage-modules/dell-replication-controller:v1.10.0
- value: quay.io/dell/container-storage-modules/dell-replication-controller:v1.11.0
name: RELATED_IMAGE_dell-replication-controller-manager
- value: quay.io/dell/container-storage-modules/csm-topology:v1.10.0
- value: quay.io/dell/container-storage-modules/csm-topology:v1.11.0
name: RELATED_IMAGE_topology
- value: docker.io/otel/opentelemetry-collector:0.42.0
name: RELATED_IMAGE_otel-collector
- value: quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.7.0
- value: quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.8.0
name: RELATED_IMAGE_metrics-powerscale
- value: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.5.0
- value: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.6.0
name: RELATED_IMAGE_metrics-powermax
- value: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0
- value: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.11.0
name: RELATED_IMAGE_metrics-powerflex
- value: quay.io/dell/container-storage-modules/podmon:v1.11.0
- value: quay.io/dell/container-storage-modules/podmon:v1.12.0
name: RELATED_IMAGE_podmon-node
- value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9:v4.16.0-202409051837.p0.g8ea2c99.assembly.stream.el9
name: RELATED_IMAGE_kube-rbac-proxy
- value: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
name: RELATED_IMAGE_attacher
- value: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
name: RELATED_IMAGE_provisioner
- value: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
- value: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
name: RELATED_IMAGE_snapshotter
- value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
name: RELATED_IMAGE_registrar
- value: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
name: RELATED_IMAGE_resizer
- value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
name: RELATED_IMAGE_externalhealthmonitorcontroller
- value: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0
- value: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.10.0
name: RELATED_IMAGE_metadataretriever
securityContext:
allowPrivilegeEscalation: false
Expand Down
52 changes: 26 additions & 26 deletions config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
alm-examples: "[]"
capabilities: Seamless Upgrades
categories: Storage
containerImage: quay.io/dell/container-storage-modules/dell-csm-operator:v1.7.0
containerImage: quay.io/dell/container-storage-modules/dell-csm-operator:v1.8.0
createdAt: "2022-03-29T11:59:59Z"
description: Easily install and manage Dell’s CSI Drivers and CSM
features.operators.openshift.io/disconnected: "true"
Expand All @@ -17,7 +17,7 @@ metadata:
features.operators.openshift.io/token-auth-gcp: "false"
repository: https://github.com/dell/csm-operator
support: Dell Technologies
name: dell-csm-operator.v1.7.0
name: dell-csm-operator.v1.8.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1732,66 +1732,66 @@ spec:
name: Dell Technologies
url: https://github.com/dell/csm-operator
relatedImages:
- image: quay.io/dell/container-storage-modules/dell-csm-operator:v1.7.0
- image: quay.io/dell/container-storage-modules/dell-csm-operator:v1.8.0
name: dell-csm-operator
- image: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0
- image: quay.io/dell/container-storage-modules/csi-isilon:v2.13.0
name: csi-isilon
- image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0s
- image: quay.io/dell/container-storage-modules/csi-powermax:v2.13.0
name: csi-powermax
- image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
- image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.12.0
name: csipowermax-reverseproxy
- image: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0
- image: quay.io/dell/container-storage-modules/csi-powerstore:v2.13.0
name: csi-powerstore
- image: quay.io/dell/container-storage-modules/csi-unity:v2.12.0
- image: quay.io/dell/container-storage-modules/csi-unity:v2.13.0
name: csi-unity
- image: quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0
- image: quay.io/dell/container-storage-modules/csi-vxflexos:v2.13.0
name: csi-vxflexos
- image: docker.io/dellemc/sdc:4.5.2.1
name: sdc
- image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v2.0.0
- image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v2.1.0
name: karavi-authorization-proxy
- image: quay.io/dell/container-storage-modules/csm-authorization-proxy:v2.0.0
- image: quay.io/dell/container-storage-modules/csm-authorization-proxy:v2.1.0
name: csm-authorization-proxy
- image: quay.io/dell/container-storage-modules/csm-authorization-tenant:v2.0.0
- image: quay.io/dell/container-storage-modules/csm-authorization-tenant:v2.1.0
name: csm-authorization-tenant
- image: quay.io/dell/container-storage-modules/csm-authorization-role:v2.0.0
- image: quay.io/dell/container-storage-modules/csm-authorization-role:v2.1.0
name: csm-authorization-role
- image: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.0.0
- image: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.1.0
name: csm-authorization-storage
- image: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.0.0
- image: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.1.0
name: csm-authorization-controller
- image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
- image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.11.0
name: dell-csi-replicator
- image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.10.0
- image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.11.0
name: dell-replication-controller-manager
- image: quay.io/dell/container-storage-modules/csm-topology:v1.10.0
- image: quay.io/dell/container-storage-modules/csm-topology:v1.11.0
name: topology
- image: docker.io/otel/opentelemetry-collector:0.42.0
name: otel-collector
- image: quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.7.0
- image: quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.8.0
name: metrics-powerscale
- image: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.5.0
- image: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.6.0
name: metrics-powermax
- image: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0
- image: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.11.0
name: metrics-powerflex
- image: quay.io/dell/container-storage-modules/podmon:v1.11.0
- image: quay.io/dell/container-storage-modules/podmon:v1.12.0
name: podmon-node
- image: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9:v4.16.0-202409051837.p0.g8ea2c99.assembly.stream.el9
name: kube-rbac-proxy
- image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
name: attacher
- image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
name: provisioner
- image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
- image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
name: snapshotter
- image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
name: registrar
- image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
name: resizer
- image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
name: externalhealthmonitorcontroller
- image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0
- image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.10.0
name: metadataretriever
skips:
- dell-csm-operator.v1.6.0
version: 1.7.0
- dell-csm-operator.v1.7.0
version: 1.8.0
12 changes: 6 additions & 6 deletions config/samples/storage_v1_csm_authorization_v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: authorization-proxy-server
# enable: Enable/Disable csm-authorization
enabled: true
configVersion: v2.0.0
configVersion: v2.1.0
forceRemoveModule: true
components:
# For Kubernetes Container Platform only
Expand All @@ -30,17 +30,17 @@ spec:
- name: proxy-server
# enable: Enable/Disable csm-authorization proxy server
enabled: true
proxyService: quay.io/dell/container-storage-modules/csm-authorization-proxy:v2.0.0
proxyService: quay.io/dell/container-storage-modules/csm-authorization-proxy:v2.1.0
proxyServiceReplicas: 1
tenantService: quay.io/dell/container-storage-modules/csm-authorization-tenant:v2.0.0
tenantService: quay.io/dell/container-storage-modules/csm-authorization-tenant:v2.1.0
tenantServiceReplicas: 1
roleService: quay.io/dell/container-storage-modules/csm-authorization-role:v2.0.0
roleService: quay.io/dell/container-storage-modules/csm-authorization-role:v2.1.0
roleServiceReplicas: 1
storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.0.0
storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.1.0
storageServiceReplicas: 1
opa: docker.io/openpolicyagent/opa:latest
opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:8.5.10
authorizationController: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.0.0
authorizationController: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.1.0
authorizationControllerReplicas: 1
leaderElection: true
# controllerReconcileInterval: interval for the authorization controllers to reconcile with Redis.
Expand Down
Loading

0 comments on commit 33834fd

Please sign in to comment.