From 341cb342b25a316a2dcc68ecd98c4d9f7cac7cdb Mon Sep 17 00:00:00 2001 From: Matthew Beckett Date: Wed, 2 Sep 2020 21:53:52 +0100 Subject: [PATCH] Patch helm chart to stable with v3.5.0 --- charts/code-server/templates/_helpers.tpl | 20 +++++++++++++ charts/code-server/templates/deployment.yaml | 2 +- charts/code-server/templates/ingress.yaml | 30 +++++++++++--------- charts/code-server/values.yaml | 2 +- 4 files changed, 38 insertions(+), 16 deletions(-) diff --git a/charts/code-server/templates/_helpers.tpl b/charts/code-server/templates/_helpers.tpl index 811252b9e..bb36e8c21 100644 --- a/charts/code-server/templates/_helpers.tpl +++ b/charts/code-server/templates/_helpers.tpl @@ -31,6 +31,26 @@ Create chart name and version as used by the chart label. {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Common labels +*/}} +{{- define "code-server.labels" -}} +helm.sh/chart: {{ include "code-server.chart" . }} +{{ include "code-server.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "code-server.selectorLabels" -}} +app.kubernetes.io/name: {{ include "code-server.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + {{/* Create the name of the service account to use */}} diff --git a/charts/code-server/templates/deployment.yaml b/charts/code-server/templates/deployment.yaml index 63a84d61d..52c1ee954 100644 --- a/charts/code-server/templates/deployment.yaml +++ b/charts/code-server/templates/deployment.yaml @@ -98,7 +98,7 @@ spec: {{- end }} ports: - name: http - containerPort: 8443 + containerPort: 8080 protocol: TCP livenessProbe: httpGet: diff --git a/charts/code-server/templates/ingress.yaml b/charts/code-server/templates/ingress.yaml index 1858bb5f2..07a3abd0b 100644 --- a/charts/code-server/templates/ingress.yaml +++ b/charts/code-server/templates/ingress.yaml @@ -1,39 +1,41 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "code-server.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} apiVersion: extensions/v1beta1 +{{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: - app.kubernetes.io/name: {{ include "code-server.name" . }} - helm.sh/chart: {{ include "code-server.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "code-server.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: -{{- if .Values.ingress.tls }} + {{- if .Values.ingress.tls }} tls: - {{- range .Values.ingress.tls }} + {{- range .Values.ingress.tls }} - hosts: - {{- range .hosts }} + {{- range .hosts }} - {{ . | quote }} - {{- end }} + {{- end }} secretName: {{ .secretName }} + {{- end }} {{- end }} -{{- end }} rules: - {{- range .Values.ingress.hosts }} + {{- range .Values.ingress.hosts }} - host: {{ .host | quote }} http: paths: - {{- range .paths }} + {{- range .paths }} - path: {{ . }} backend: serviceName: {{ $fullName }} - servicePort: http - {{- end }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} {{- end }} -{{- end }} diff --git a/charts/code-server/values.yaml b/charts/code-server/values.yaml index 408741115..72dc5501e 100644 --- a/charts/code-server/values.yaml +++ b/charts/code-server/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: 1.1156-vsc1.33.1 + tag: '3.5.0' pullPolicy: Always imagePullSecrets: []