starlingx
/
platform-armada-app
Code Issues Proposed changes

Merge "Enable rbd-provisioner namespace overrides"

This commit is contained in:
Zuul 2019-05-22 16:45:38 +00:00 committed by Gerrit Code Review
parent 7d0f6d6a03 62e2ae4c03
commit fc47c762d1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/clusterrole.yaml
View File

@ -20,7 +20,7 @@ rules:
verbs: ["get", "list", "watch", "update"] verbs: ["get", "list", "watch", "update"]
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["storageclasses"] resources: ["storageclasses"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch", "patch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["events"] resources: ["events"]
verbs: ["create", "update", "patch"] verbs: ["create", "update", "patch"]

9
stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/pre-install-check-ceph.yaml
View File

@ -82,6 +82,8 @@ data:
echo"Error creating secret ${CEPH_USER_SECRET} in ${NAMESPACE}, exit" echo"Error creating secret ${CEPH_USER_SECRET} in ${NAMESPACE}, exit"
exit 1 exit 1
fi fi
else
echo "Secret ${CEPH_USER_SECRET} already exists"
fi fi
# Support creating namespaces and Ceph user secrets for additional # Support creating namespaces and Ceph user secrets for additional
@ -135,9 +137,12 @@ metadata:
heritage: {{$root.Release.Service | quote }} heritage: {{$root.Release.Service | quote }}
release: {{$root.Release.Name | quote }} release: {{$root.Release.Name | quote }}
chart: "{{$root.Chart.Name}}-{{$root.Chart.Version}}" chart: "{{$root.Chart.Name}}-{{$root.Chart.Version}}"
annotations:
"helm.sh/hook": "post-install, pre-upgrade, pre-rollback"
"helm.sh/hook-delete-policy": "before-hook-creation"
spec: spec:
backoffLimit: 3 # Limit the number of job restart in case of failure backoffLimit: 5 # Limit the number of job restart in case of failure: ~5 minutes.
activeDeadlineSeconds: 180 activeDeadlineSeconds: 360
template: template:
metadata: metadata:
name: "{{$root.Release.Name}}" name: "{{$root.Release.Name}}"