CIS: updated clusterrolebinding name

also removed the unnecessary hook for deleting role binding
pull/2394/head
vardhaman 2023-02-07 13:36:01 +05:30
parent 7d09394cc0
commit 0f5ef706c1
4 changed files with 4 additions and 31 deletions

View File

@ -1,27 +0,0 @@
---
apiVersion: batch/v1
kind: Job
metadata:
name: delete-rolebinding
annotations:
"helm.sh/hook": pre-upgrade
"helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation, hook-failed
spec:
template:
spec:
serviceAccountName: cis-operator-serviceaccount
nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
{{- if .Values.nodeSelector }}
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
{{- if .Values.tolerations }}
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
restartPolicy: Never
containers:
- name: delete-binding
image: "{{ template "system_default_registry" . }}{{ .Values.global.kubectl.repository }}:{{ .Values.global.kubectl.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
command: ["kubectl", "delete", "clusterrolebinding", "cis-operator-rolebinding", "cis-operator-installer"]
backoffLimit: 1

View File

@ -115,7 +115,7 @@ metadata:
labels:
app.kubernetes.io/name: rancher-cis-benchmark
app.kubernetes.io/instance: release-name
name: cis-operator-rolebinding
name: cis-operator-clusterrolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole

View File

@ -1,5 +1,5 @@
url: local
version: 3.0.1-rc7
version: 3.0.1-rc8
additionalCharts:
- workingDir: charts-crd
crdOptions:

View File

@ -31,9 +31,9 @@ rancher-backup:
rancher-backup-crd:
- 102.0.0+up3.1.0-rc1
rancher-cis-benchmark:
- 3.0.1-rc7
- 3.0.1-rc8
rancher-cis-benchmark-crd:
- 3.0.1-rc7
- 3.0.1-rc8
rancher-csp-adapter:
- 2.0.1+up2.0.1-rc1
rancher-eks-operator: