From 46b4b7a8da53120acb0fdf69f29204c4cfdec4b7 Mon Sep 17 00:00:00 2001 From: EnnnOK <710720732@qq.com> Date: Tue, 21 Mar 2023 19:53:14 -0700 Subject: [PATCH] feat(charts): add annotation to apiserver service, add tolerations and nodeselector to jobs Signed-off-by: EnnnOK <710720732@qq.com> docs(chart): add apiServer.serviceAnnotations, pre/post job tolerations and nodeSelector Signed-off-by: EnnnOK <710720732@qq.com> --- charts/karmada/README.md | 7 +++++++ charts/karmada/templates/karmada-apiserver.yaml | 4 ++++ charts/karmada/templates/post-delete-job.yaml | 8 ++++++++ charts/karmada/templates/post-install-job.yaml | 8 ++++++++ charts/karmada/templates/pre-install-job.yaml | 8 ++++++++ charts/karmada/values.yaml | 7 +++++++ 6 files changed, 42 insertions(+) diff --git a/charts/karmada/README.md b/charts/karmada/README.md index 3b222f5ae..1a7aa278e 100644 --- a/charts/karmada/README.md +++ b/charts/karmada/README.md @@ -295,6 +295,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `controllerManager.controllers` | Controllers of the karmada-controller-manager | `""` | | `controllerManager.extraCommandArgs` | extra command args of the karmada-controller-manager | `{}` | | `apiServer.labels` | Labels of the karmada-apiserver deployment | `{"app": "karmada-apiserver"}` | +| `apiServer.serviceAnnotations` | Annotations of the karmada-apiserver service | `{}` | | `apiServer.replicaCount` | Target replicas of the karmada-apiserver | `1` | | `apiServer.podLabels` | Labels of the karmada-apiserver pods | `{}` | | `apiServer.podAnnotations` | Annotations of the karmada-apiserver pods | `{}` | @@ -383,3 +384,9 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `search.strategy` | Strategy of the search | `{"type": "RollingUpdate", "rollingUpdate": {"maxUnavailable": "0", "maxSurge": "50%"} }` | | `search.certs` | Certs of the search | `karmada-cert` | | `search.kubeconfig` | Kubeconfig of the search | `karmada-kubeconfig` | +| `preInstallJob.tolerations` | Tolerations of pre-install-job | `[]` | +| `preInstallJob.nodeSelector` | NodeSelector of pre-install-job | `{}` | +| `postInstallJob.tolerations` | Tolerations of post-install-job | `[]` | +| `postInstallJob.nodeSelector` | NodeSelector of post-install-job | `{}` | +| `postDeleteJob.tolerations` | Tolerations of post-delete-job | `[]` | +| `postDeleteJob.nodeSelector` | NodeSelector of post-delete-job | `{}` | diff --git a/charts/karmada/templates/karmada-apiserver.yaml b/charts/karmada/templates/karmada-apiserver.yaml index 95ef1cca3..d8b44f534 100644 --- a/charts/karmada/templates/karmada-apiserver.yaml +++ b/charts/karmada/templates/karmada-apiserver.yaml @@ -154,6 +154,10 @@ metadata: namespace: {{ include "karmada.namespace" . }} labels: {{- include "karmada.apiserver.labels" . | nindent 4 }} + {{- with .Values.apiServer.serviceAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.apiServer.serviceType }} ports: diff --git a/charts/karmada/templates/post-delete-job.yaml b/charts/karmada/templates/post-delete-job.yaml index c53e9ae72..4fba350f8 100644 --- a/charts/karmada/templates/post-delete-job.yaml +++ b/charts/karmada/templates/post-delete-job.yaml @@ -23,6 +23,14 @@ spec: labels: helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: + {{- with .Values.postDeleteJob.tolerations}} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.postDeleteJob.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: {{ $name }}-pre-job restartPolicy: Never containers: diff --git a/charts/karmada/templates/post-install-job.yaml b/charts/karmada/templates/post-install-job.yaml index 6c16aed4f..4ca01d28e 100644 --- a/charts/karmada/templates/post-install-job.yaml +++ b/charts/karmada/templates/post-install-job.yaml @@ -80,6 +80,14 @@ spec: app.kubernetes.io/instance: {{ $name | quote }} helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: + {{- with .Values.postInstallJob.tolerations}} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.postInstallJob.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} restartPolicy: Never containers: - name: post-install diff --git a/charts/karmada/templates/pre-install-job.yaml b/charts/karmada/templates/pre-install-job.yaml index 4bad52030..be83d4b30 100644 --- a/charts/karmada/templates/pre-install-job.yaml +++ b/charts/karmada/templates/pre-install-job.yaml @@ -145,6 +145,14 @@ spec: app.kubernetes.io/instance: {{ $name | quote }} helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: + {{- with .Values.preInstallJob.tolerations}} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.preInstallJob.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: {{ $name }}-pre-job restartPolicy: Never initContainers: diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml index e016fe2a4..d4403dee1 100644 --- a/charts/karmada/values.yaml +++ b/charts/karmada/values.yaml @@ -60,12 +60,18 @@ kubectl: ## pre-install job config preInstallJob: + tolerations: [] + nodeSelector: {} ## post-install job config postInstallJob: + tolerations: [] + nodeSelector: {} ## post-delete job config postDeleteJob: + tolerations: [] + nodeSelector: {} ## karmada certificate config certs: @@ -306,6 +312,7 @@ apiServer: ## @param apiServer.labels labels of the karmada-apiserver deployment labels: app: karmada-apiserver + serviceAnnotations: {} ## @param apiServer.replicaCount target replicas of the karmada-apiserver replicaCount: 1 ## @param apiServer.podAnnotations annotations of the karmada-apiserver pods