Skip to content

Commit 4e9c80d

Browse files
committed
helm: remove csi RBAC from the operator
CSI template and RBAC's are shipped as another charts. we dont need to add the csi RBAC to the operator charts. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
1 parent 2633c8f commit 4e9c80d

32 files changed

Lines changed: 2 additions & 1565 deletions

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ build-helm-installer: manifests generate kustomize helmify ## Generate helm char
206206
cp deploy/charts/ceph-csi-operator/values.yaml deploy/charts/ceph-csi-operator/values.yaml.bak; \
207207
fi
208208
cd build && echo "$$BUILD_INSTALLER_OVERLAY" > kustomization.yaml
209-
cd build && $(KUSTOMIZE) edit add resource ../config/default/
209+
cd build && $(KUSTOMIZE) edit add resource ../config/rbac ../config/manager ../config/crd
210210
$(KUSTOMIZE) build build | $(HELMIFY) -preserve-ns -image-pull-secrets deploy/charts/ceph-csi-operator
211211
hack/patch-csi-operator-helm-chart.sh deploy/charts/ceph-csi-operator
212212
@# Restore the manually maintained values.yaml
@@ -235,7 +235,7 @@ build-csi-rbac:
235235
verify-helm-values: manifests generate kustomize helmify ## Verify operator values.yaml is in sync with generated output.
236236
@mkdir -p build
237237
@cd build && echo "$$BUILD_INSTALLER_OVERLAY" > kustomization.yaml
238-
@cd build && $(KUSTOMIZE) edit add resource ../config/default/
238+
@cd build && $(KUSTOMIZE) edit add resource ../config/rbac ../config/manager ../config/crd
239239
@mkdir -p build/tmp-chart
240240
@$(KUSTOMIZE) build build | $(HELMIFY) -preserve-ns -image-pull-secrets build/tmp-chart > /dev/null 2>&1
241241
@# Compare values by stripping comments from the maintained file

deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-cr-rbac.yaml

Lines changed: 0 additions & 206 deletions
This file was deleted.

deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-crb-rbac.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-r-rbac.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-rb-rbac.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-cr-rbac.yaml

Lines changed: 0 additions & 62 deletions
This file was deleted.

deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-crb-rbac.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)