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>
This commit is contained in:
EnnnOK 2023-03-21 19:53:14 -07:00
parent 8f32181bf0
commit 46b4b7a8da
6 changed files with 42 additions and 0 deletions

View File

@ -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 | `{}` |

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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:

View File

@ -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