Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(chart): bump chart version to 7.2.0 #8882

Merged
merged 3 commits into from
Apr 5, 2024
Merged

feat(chart): bump chart version to 7.2.0 #8882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d92ddbd
remove rollme annotation and use checksum based on csrf secret content
floreks Apr 5, 2024
2517e48
bump chart to 7.2.0
floreks Apr 5, 2024
d0f1a94
bump api image to 1.4.1
floreks Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/kubernetes-dashboard/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

apiVersion: v2
name: kubernetes-dashboard
version: 7.1.3
version: 7.2.0
description: General-purpose web UI for Kubernetes clusters
keywords:
- kubernetes
Expand Down
10 changes: 10 additions & 0 deletions charts/kubernetes-dashboard/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@ app.kubernetes.io/part-of: {{ include "kubernetes-dashboard.name" . }}
{{- printf "private.key" }}
{{- end -}}

{{- define "kubernetes-dashboard.app.csrf.secret.value" -}}
{{- $secretName := (include "kubernetes-dashboard.app.csrf.secret.name" .) -}}
{{- $secret := lookup "v1" "Secret" .Release.Namespace $secretName -}}
{{- if and $secret (hasKey $secret "data") (hasKey $secret.data "private.key") (index $secret.data "private.key") -}}
private.key: {{ index $secret.data "private.key" }}
{{- else -}}
private.key: {{ randBytes 256 | b64enc | quote }}
{{- end -}}
{{- end -}}

{{- define "kubernetes-dashboard.metrics-scraper.name" -}}
{{- printf "%s-%s" ( include "kubernetes-dashboard.fullname" . ) ( .Values.metricsScraper.role )}}
{{- end -}}
Expand Down
3 changes: 1 addition & 2 deletions charts/kubernetes-dashboard/templates/deployments/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ spec:
app.kubernetes.io/version: {{ .Values.api.image.tag }}
app.kubernetes.io/component: {{ .Values.api.role }}
annotations:
{{/* Ensure that the deployment is rolled on upgrade since CSRF key will be regenerated. */}}
rollme: {{ randAlphaNum 5 | quote }}
checksum/config: {{ include (print $.Template.BasePath "/secrets/csrf.yaml") . | sha256sum }}
{{- with .Values.api.annotations }}
{{ toYaml . | nindent 8 }}
{{- end }}
Expand Down
3 changes: 1 addition & 2 deletions charts/kubernetes-dashboard/templates/deployments/auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ spec:
app.kubernetes.io/version: {{ .Values.auth.image.tag }}
app.kubernetes.io/component: {{ .Values.auth.role }}
annotations:
{{/* Ensure that the deployment is rolled on upgrade since CSRF key will be regenerated. */}}
rollme: {{ randAlphaNum 5 | quote }}
checksum/config: {{ include (print $.Template.BasePath "/secrets/csrf.yaml") . | sha256sum }}
{{- with .Values.auth.annotations }}
{{ toYaml . | nindent 8 }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/kubernetes-dashboard/templates/secrets/csrf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ metadata:
{{- include "kubernetes-dashboard.labels" . | nindent 4 }}
name: {{ template "kubernetes-dashboard.app.csrf.secret.name" . }}
data:
{{ template "kubernetes-dashboard.app.csrf.secret.key" . }}: {{ randBytes 256 | b64enc | quote }}
{{ (include "kubernetes-dashboard.app.csrf.secret.value" . ) -}}
6 changes: 3 additions & 3 deletions charts/kubernetes-dashboard/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ auth:
limits:
cpu: 250m
memory: 400Mi
automountServiceAccountToken: false
automountServiceAccountToken: true
volumes:
# Create on-disk volume to store exec logs (required)
- name: tmp-volume
Expand All @@ -158,7 +158,7 @@ api:
role: api
image:
repository: docker.io/kubernetesui/dashboard-api
tag: 1.4.0
tag: 1.4.1
scaling:
replicas: 1
revisionHistoryLimit: 10
Expand Down Expand Up @@ -341,7 +341,7 @@ kong:
enabled: true
## Configuration reference: https://docs.konghq.com/gateway/3.6.x/reference/configuration
env:
dns_order: A,CNAME,LAST,SRV
dns_order: A,CNAME,LAST,AAAA,SRV
plugins: 'off'
nginx_worker_processes: 1
ingressController:
Expand Down
Loading