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.

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

helm: Remove deprecated hubble.tls.ca #25261

Merged
merged 1 commit into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/gettingstarted/hubble-configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ specifying the options below to Helm at install or upgrade time.
::

--set hubble.tls.auto.enabled=false # disable automatic TLS certificate generation
--set-file hubble.tls.ca.cert=ca.crt.b64 # certificate of the CA that signs all certificates
--set-file tls.ca.cert=ca.crt.b64 # certificate of the CA that signs all certificates
--set-file hubble.tls.server.cert=server.crt.b64 # certificate for Hubble server
--set-file hubble.tls.server.key=server.key.b64 # private key for the Hubble server certificate
--set-file hubble.relay.tls.client.cert=relay-client.crt.b64 # client certificate for Hubble Relay to connect to Hubble instances
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,8 @@ spec:
{{- end }}
- "--ca-generate"
- "--ca-reuse-secret"
{{- if .Values.hubble.tls.ca.cert }}
- "--ca-secret-name=hubble-ca-secret"
{{- else -}}
{{- if and .Values.tls.ca.cert .Values.tls.ca.key }}
{{- if and .Values.tls.ca.cert .Values.tls.ca.key }}
- "--ca-secret-name=cilium-ca"
{{- end }}
{{- end }}
- "--hubble-server-cert-generate"
- "--hubble-server-cert-common-name={{ list "*" (.Values.cluster.name | replace "." "-") "hubble-grpc.cilium.io" | join "." }}"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ rules:
- secrets
resourceNames:
- cilium-ca
- hubble-ca-secret
verbs:
- get
- update
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,13 @@ certificate would be signed by a different CA.
{{- if and $crt $key }}
{{- $ca = buildCustomCert $crt $key -}}
{{- else }}
{{- with lookup "v1" "Secret" .Release.Namespace "hubble-ca-secret" }}
{{- $_ := include "cilium.ca.setup" . -}}
{{- with lookup "v1" "Secret" .Release.Namespace .commonCASecretName }}
{{- $crt := index .data "ca.crt" }}
{{- $key := index .data "ca.key" }}
{{- $ca = buildCustomCert $crt $key -}}
{{- else }}
{{- $_ := include "cilium.ca.setup" . -}}
{{- with lookup "v1" "Secret" .Release.Namespace .commonCASecretName }}
{{- $crt := index .data "ca.crt" }}
{{- $key := index .data "ca.key" }}
{{- $ca = buildCustomCert $crt $key -}}
{{- else }}
{{- $ca = .commonCA -}}
{{- end }}
{{- $ca = .commonCA -}}
{{- end }}
{{- end }}
{{- $_ := set . "ca" $ca -}}
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
namespace: {{ .Release.Namespace }}
type: kubernetes.io/tls
data:
ca.crt: {{ .Values.hubble.tls.ca.cert }}
ca.crt: {{ .Values.tls.ca.cert }}
tls.crt: {{ .Values.hubble.relay.tls.client.cert | required "missing hubble.relay.tls.client.cert" }}
tls.key: {{ .Values.hubble.relay.tls.client.key | required "missing hubble.relay.tls.client.key" }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
namespace: {{ .Release.Namespace }}
type: kubernetes.io/tls
data:
ca.crt: {{ .Values.hubble.tls.ca.cert }}
ca.crt: {{ .Values.tls.ca.cert }}
tls.crt: {{ .Values.hubble.relay.tls.server.cert | required "missing hubble.relay.tls.server.cert" }}
tls.key: {{ .Values.hubble.relay.tls.server.key | required "missing hubble.relay.tls.server.key" }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
namespace: {{ .Release.Namespace }}
type: kubernetes.io/tls
data:
ca.crt: {{ .Values.hubble.tls.ca.cert }}
ca.crt: {{ .Values.tls.ca.cert }}
tls.crt: {{ .Values.hubble.tls.server.cert | required "missing hubble.tls.server.cert" }}
tls.key: {{ .Values.hubble.tls.server.key | required "missing hubble.tls.server.key" }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
namespace: {{ .Release.Namespace }}
type: kubernetes.io/tls
data:
ca.crt: {{ .Values.hubble.tls.ca.cert }}
ca.crt: {{ .Values.tls.ca.cert }}
tls.crt: {{ .Values.hubble.ui.tls.client.cert | required "missing hubble.ui.tls.client.cert" }}
tls.key: {{ .Values.hubble.ui.tls.client.key | required "missing hubble.ui.tls.client.key" }}
{{- end }}