Use /healthz and reuse labels in Helm chart (#7604)

This commit is contained in:
egvimo 2026-01-08 22:40:04 +01:00 committed by GitHub
parent ac7322ce56
commit 41f7ba903f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 32 deletions

View File

@ -3,10 +3,7 @@ kind: Deployment
metadata: metadata:
name: {{ include "code-server.fullname" . }} name: {{ include "code-server.fullname" . }}
labels: labels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.labels" . | nindent 4 }}
helm.sh/chart: {{ include "code-server.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.annotations }} {{- if .Values.annotations }}
annotations: {{- toYaml .Values.annotations | nindent 4 }} annotations: {{- toYaml .Values.annotations | nindent 4 }}
{{- end }} {{- end }}
@ -16,13 +13,11 @@ spec:
type: Recreate type: Recreate
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.selectorLabels" . | nindent 6 }}
app.kubernetes.io/instance: {{ .Release.Name }}
template: template:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.selectorLabels" . | nindent 8 }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Values.podAnnotations }} {{- if .Values.podAnnotations }}
annotations: {{- toYaml .Values.podAnnotations | nindent 8 }} annotations: {{- toYaml .Values.podAnnotations | nindent 8 }}
{{- end }} {{- end }}
@ -130,11 +125,11 @@ spec:
{{- end }} {{- end }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: / path: /healthz
port: http port: http
readinessProbe: readinessProbe:
httpGet: httpGet:
path: / path: /healthz
port: http port: http
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}

View File

@ -9,10 +9,7 @@ metadata:
{{ toYaml . | indent 4 }} {{ toYaml . | indent 4 }}
{{- end }} {{- end }}
labels: labels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.labels" . | nindent 4 }}
helm.sh/chart: {{ include "code-server.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.accessMode | quote }} - {{ .Values.persistence.accessMode | quote }}

View File

@ -6,10 +6,7 @@ metadata:
annotations: annotations:
"helm.sh/hook": "pre-install" "helm.sh/hook": "pre-install"
labels: labels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.labels" . | nindent 4 }}
helm.sh/chart: {{ include "code-server.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
type: Opaque type: Opaque
data: data:
{{- if .Values.password }} {{- if .Values.password }}

View File

@ -3,10 +3,7 @@ kind: Service
metadata: metadata:
name: {{ include "code-server.fullname" . }} name: {{ include "code-server.fullname" . }}
labels: labels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.labels" . | nindent 4 }}
helm.sh/chart: {{ include "code-server.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}
ports: ports:

View File

@ -3,9 +3,6 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.labels" . | nindent 4 }}
helm.sh/chart: {{ include "code-server.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
name: {{ template "code-server.serviceAccountName" . }} name: {{ template "code-server.serviceAccountName" . }}
{{- end -}} {{- end -}}

View File

@ -3,16 +3,13 @@ kind: Pod
metadata: metadata:
name: "{{ include "code-server.fullname" . }}-test-connection" name: "{{ include "code-server.fullname" . }}-test-connection"
labels: labels:
app.kubernetes.io/name: {{ include "code-server.name" . }} {{- include "code-server.labels" . | nindent 4 }}
helm.sh/chart: {{ include "code-server.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
annotations: annotations:
"helm.sh/hook": test-success "helm.sh/hook": test
spec: spec:
containers: containers:
- name: wget - name: wget
image: busybox image: busybox
command: ['wget'] command: ['wget']
args: ['{{ include "code-server.fullname" . }}:{{ .Values.service.port }}'] args: ['{{ include "code-server.fullname" . }}:{{ .Values.service.port }}/healthz']
restartPolicy: Never restartPolicy: Never