Skip to content

Store static cluster config as secret and enforce TLS #533

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

Open
thokra-nav wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Store static cluster config as secret and enforce TLS #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acae155
Store static cluster config as secret and enforce TLS
thokra-nav Sep 30, 2026
2912928
Merge branch 'main' into static_tls_secret
thokra-nav Oct 1, 2026
00c628e
Merge branch 'main' into static_tls_secret
thokra-nav Oct 2, 2026
e520333
Merge branch 'main' into static_tls_secret
thokra-nav Oct 8, 2026
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
4 changes: 0 additions & 4 deletions charts/nais-api/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ spec:
env:
- name: KUBERNETES_CLUSTERS
value: "{{ .Values.kubernetes.clusters }}"
{{- if .Values.kubernetes.static }}
- name: KUBERNETES_CLUSTERS_STATIC
value: "{{ .Values.kubernetes.static }}"
{{- end }}
- name: TENANT
value: "{{ .Values.fasit.tenant.name }}"
- name: TENANT_DOMAIN
Expand Down
3 changes: 3 additions & 0 deletions charts/nais-api/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
app: "{{ .Release.Name }}"
type: Opaque
stringData:
{{- if .Values.kubernetes.static }}
KUBERNETES_CLUSTERS_STATIC: {{ .Values.kubernetes.static | quote }}
{{- end }}
HOOKD_PSK: "{{ .Values.hookd.psk }}"
REST_PRE_SHARED_KEY: "{{ .Values.rest.psk }}"
OAUTH_CLIENT_SECRET: "{{ .Values.oauth.clientSecret }}"
Expand Down
3 changes: 0 additions & 3 deletions internal/kubernetes/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ func getStaticClusterConfigs(clusters []StaticCluster) ClusterConfigMap {
configs[cluster.Name] = &rest.Config{
Host: cluster.Host,
BearerToken: cluster.Token,
TLSClientConfig: rest.TLSClientConfig{
Insecure: true,
},
WrapTransport: func(rt http.RoundTripper) http.RoundTripper {
return otelhttp.NewTransport(rt, otelhttp.WithServerName(cluster.Name))
},
Expand Down
Loading