Skip to content

Commit

Permalink
kube: expose cluster domain to statefulset pod (#46144) (#46152)
Browse files Browse the repository at this point in the history
This PR corrects a typo that didn't exposed the cluster domain in the statefulset, when it was introduced in PR #43584.

Changelog: Extend Teleport ability to use non-default cluster domains in Kubernetes, avoiding the assumption of `cluster.local`.

Signed-off-by: Tiago Silva <[email protected]>
  • Loading branch information
tigrato authored Sep 3, 2024
1 parent 4e9f834 commit 636a3ab
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 0 deletions.
4 changes: 4 additions & 0 deletions examples/chart/teleport-kube-agent/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ spec:
- name: TELEPORT_EXT_UPGRADER_VERSION
value: {{ include "teleport-kube-agent.version" . }}
{{- end }}
{{- if .Values.clusterDomain }}
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: {{ .Values.clusterDomain | quote }}
{{- end }}
{{- if .Values.tls.existingCASecretName }}
- name: SSL_CERT_FILE
value: /etc/teleport-tls-ca/ca.pem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ sets Pod annotations when specified:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -84,6 +86,8 @@ sets Pod labels when specified:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -176,6 +180,8 @@ sets StatefulSet labels when specified:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -272,6 +278,8 @@ should add insecureSkipProxyTLSVerify to args when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -340,6 +348,8 @@ should add volumeClaimTemplate for data volume when using StatefulSet and action
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -428,6 +438,8 @@ should add volumeClaimTemplate for data volume when using StatefulSet and is Fre
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -506,6 +518,8 @@ should add volumeMount for data volume when using StatefulSet:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -574,6 +588,8 @@ should expose diag port:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -642,6 +658,8 @@ should generate Statefulset when storage is disabled and mode is a Upgrade:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -724,6 +742,8 @@ should have multiple replicas when replicaCount is set (using .replicaCount, dep
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -804,6 +824,8 @@ should have multiple replicas when replicaCount is set (using highAvailability.r
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -872,6 +894,8 @@ should have one replica when replicaCount is not set:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -940,6 +964,8 @@ should install Statefulset when storage is disabled and mode is a Fresh Install:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1010,6 +1036,8 @@ should mount extraVolumes and extraVolumeMounts:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1083,6 +1111,8 @@ should mount tls.existingCASecretName and set environment when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
- name: SSL_CERT_FILE
value: /etc/teleport-tls-ca/ca.pem
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
Expand Down Expand Up @@ -1161,6 +1191,8 @@ should mount tls.existingCASecretName and set extra environment when set in valu
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
- name: SSL_CERT_FILE
value: /etc/teleport-tls-ca/ca.pem
- name: HTTPS_PROXY
Expand Down Expand Up @@ -1241,6 +1273,8 @@ should not add emptyDir for data when using StatefulSet:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1309,6 +1343,8 @@ should provision initContainer correctly when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1413,6 +1449,8 @@ should set SecurityContext:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1501,6 +1539,8 @@ should set affinity when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1569,6 +1609,8 @@ should set default serviceAccountName when not set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1648,6 +1690,8 @@ should set environment when extraEnv set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
- name: HTTPS_PROXY
value: http://username:[email protected]:3128
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
Expand Down Expand Up @@ -1718,6 +1762,8 @@ should set image and tag correctly:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:12.2.1
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1786,6 +1832,8 @@ should set imagePullPolicy when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: Always
livenessProbe:
Expand Down Expand Up @@ -1854,6 +1902,8 @@ should set nodeSelector if set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -1936,6 +1986,8 @@ should set preferred affinity when more than one replica is used:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -2004,6 +2056,8 @@ should set probeTimeoutSeconds when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -2082,6 +2136,8 @@ should set required affinity when highAvailability.requireAntiAffinity is set:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -2150,6 +2206,8 @@ should set resources when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -2225,6 +2283,8 @@ should set serviceAccountName when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -2293,6 +2353,8 @@ should set storage.requests when set in values and action is an Upgrade:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -2361,6 +2423,8 @@ should set storage.storageClassName when set in values and action is an Upgrade:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down Expand Up @@ -2429,6 +2493,8 @@ should set tolerations when set in values:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: RELEASE-NAME
- name: TELEPORT_KUBE_CLUSTER_DOMAIN
value: cluster.local
image: public.ecr.aws/gravitational/teleport-distroless:14.3.30
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down

0 comments on commit 636a3ab

Please sign in to comment.