Skip to content

Commit 6d9bbcf

Browse files
authored
feat(chart): bump chart version to 7.2.0 (#8882)
* remove rollme annotation and use checksum based on csrf secret content * bump chart to 7.2.0 * bump api image to 1.4.1
1 parent 7e19397 commit 6d9bbcf

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

charts/kubernetes-dashboard/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
apiVersion: v2
1616
name: kubernetes-dashboard
17-
version: 7.1.3
17+
version: 7.2.0
1818
description: General-purpose web UI for Kubernetes clusters
1919
keywords:
2020
- kubernetes

charts/kubernetes-dashboard/templates/_helpers.tpl

+10
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,16 @@ app.kubernetes.io/part-of: {{ include "kubernetes-dashboard.name" . }}
7575
{{- printf "private.key" }}
7676
{{- end -}}
7777

78+
{{- define "kubernetes-dashboard.app.csrf.secret.value" -}}
79+
{{- $secretName := (include "kubernetes-dashboard.app.csrf.secret.name" .) -}}
80+
{{- $secret := lookup "v1" "Secret" .Release.Namespace $secretName -}}
81+
{{- if and $secret (hasKey $secret "data") (hasKey $secret.data "private.key") (index $secret.data "private.key") -}}
82+
private.key: {{ index $secret.data "private.key" }}
83+
{{- else -}}
84+
private.key: {{ randBytes 256 | b64enc | quote }}
85+
{{- end -}}
86+
{{- end -}}
87+
7888
{{- define "kubernetes-dashboard.metrics-scraper.name" -}}
7989
{{- printf "%s-%s" ( include "kubernetes-dashboard.fullname" . ) ( .Values.metricsScraper.role )}}
8090
{{- end -}}

charts/kubernetes-dashboard/templates/deployments/api.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ spec:
4646
app.kubernetes.io/version: {{ .Values.api.image.tag }}
4747
app.kubernetes.io/component: {{ .Values.api.role }}
4848
annotations:
49-
{{/* Ensure that the deployment is rolled on upgrade since CSRF key will be regenerated. */}}
50-
rollme: {{ randAlphaNum 5 | quote }}
49+
checksum/config: {{ include (print $.Template.BasePath "/secrets/csrf.yaml") . | sha256sum }}
5150
{{- with .Values.api.annotations }}
5251
{{ toYaml . | nindent 8 }}
5352
{{- end }}

charts/kubernetes-dashboard/templates/deployments/auth.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ spec:
4949
app.kubernetes.io/version: {{ .Values.auth.image.tag }}
5050
app.kubernetes.io/component: {{ .Values.auth.role }}
5151
annotations:
52-
{{/* Ensure that the deployment is rolled on upgrade since CSRF key will be regenerated. */}}
53-
rollme: {{ randAlphaNum 5 | quote }}
52+
checksum/config: {{ include (print $.Template.BasePath "/secrets/csrf.yaml") . | sha256sum }}
5453
{{- with .Values.auth.annotations }}
5554
{{ toYaml . | nindent 8 }}
5655
{{- end }}

charts/kubernetes-dashboard/templates/secrets/csrf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ metadata:
1919
{{- include "kubernetes-dashboard.labels" . | nindent 4 }}
2020
name: {{ template "kubernetes-dashboard.app.csrf.secret.name" . }}
2121
data:
22-
{{ template "kubernetes-dashboard.app.csrf.secret.key" . }}: {{ randBytes 256 | b64enc | quote }}
22+
{{ (include "kubernetes-dashboard.app.csrf.secret.value" . ) -}}

charts/kubernetes-dashboard/values.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ auth:
145145
limits:
146146
cpu: 250m
147147
memory: 400Mi
148-
automountServiceAccountToken: false
148+
automountServiceAccountToken: true
149149
volumes:
150150
# Create on-disk volume to store exec logs (required)
151151
- name: tmp-volume
@@ -160,7 +160,7 @@ api:
160160
role: api
161161
image:
162162
repository: docker.io/kubernetesui/dashboard-api
163-
tag: 1.4.0
163+
tag: 1.4.1
164164
scaling:
165165
replicas: 1
166166
revisionHistoryLimit: 10
@@ -343,7 +343,7 @@ kong:
343343
enabled: true
344344
## Configuration reference: https://docs.konghq.com/gateway/3.6.x/reference/configuration
345345
env:
346-
dns_order: A,CNAME,LAST,SRV
346+
dns_order: A,CNAME,LAST,AAAA,SRV
347347
plugins: 'off'
348348
nginx_worker_processes: 1
349349
ingressController:

0 commit comments

Comments
 (0)