Merge pull request #1914 from eyyu/crdhook-annotations

Add CRDHook annotations

Author: Slach

deploy/helm/clickhouse-operator/templates/hooks/crd-install-configmap.yaml

@@ -11,6 +11,9 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-7"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    {{- with .Values.crdHook.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 data:
   clickhouseinstallations.yaml: |
 {{ .Files.Get "crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml" | indent 4 }}

deploy/helm/clickhouse-operator/templates/hooks/crd-install-job.yaml

@@ -11,6 +11,9 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    {{- with .Values.crdHook.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   template:
     metadata:

deploy/helm/clickhouse-operator/templates/hooks/crd-install-rbac.yaml

@@ -12,6 +12,9 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-6"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    {{- with .Values.crdHook.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -24,6 +27,9 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-6"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    {{- with .Values.crdHook.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 rules:
 - apiGroups:
   - apiextensions.k8s.io
@@ -47,6 +53,9 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-6"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    {{- with .Values.crdHook.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

deploy/helm/clickhouse-operator/values.yaml

@@ -32,6 +32,8 @@ crdHook:
   tolerations: []
   # crdHook.affinity -- affinity for CRD installation job
   affinity: {}
+  # crdHook.annotations -- additional annotations for CRD installation job
+  annotations: {}
 operator:
   image:
     # operator.image.repository -- image repository