Skip to content

Commit

Permalink
Clarify distroless images in Helm values
Browse files Browse the repository at this point in the history
Responds to hugoShaka feedback.
  • Loading branch information
ptgott authored and github-actions committed Jan 8, 2025
1 parent 1f0481d commit 9b9a439
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,8 @@ For this reason, it is strongly discouraged to set a custom image when using
automatic updates. Teleport Cloud uses automatic updates by default.
</Admonition>

Hardened distroless images are used by default.
By default, the image contains only the Teleport application and its runtime
dependencies, and does not contain a shell.
This setting only takes effect when [`enterprise`](#enterprise) is `false`.
When running an enterprise version, you must use
[`enterpriseImage`](#enterpriseImage) instead.
Expand All @@ -1138,7 +1139,8 @@ Teleport-published image.
using automatic updates. Teleport Cloud uses automatic updates by default.
</Admonition>

Hardened distroless images are used by default.
By default, the image contains only the Teleport application and its runtime
dependencies, and does not contain a shell.
This setting only takes effect when [`enterprise`](#enterprise) is `true`.
When running an enterprise version, you must use [`image`](#image) instead.

Expand Down
10 changes: 6 additions & 4 deletions examples/chart/teleport-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -568,11 +568,13 @@ tls:
# Values that you shouldn't need to change.
##################################################

# Container image for the cluster.
# Hardened distroless images are used by default.
# Container image for the cluster. By default, the image contains only the
# Teleport application and its runtime dependencies, and does not contain a
# shell.
image: public.ecr.aws/gravitational/teleport-distroless
# Enterprise version of the image
# Hardened distroless images are used by default.
# Enterprise version of the image. By default, the image contains only the
# Teleport application and its runtime dependencies, and does not contain a
# shell.
enterpriseImage: public.ecr.aws/gravitational/teleport-ent-distroless
# Optional array of imagePullSecrets, to use when pulling from a private registry
imagePullSecrets: []
Expand Down
6 changes: 4 additions & 2 deletions examples/chart/teleport-kube-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,8 @@ adminClusterRoleBinding:
# automatic updates. Teleport Cloud uses automatic updates by default.
# </Admonition>
#
# Hardened distroless images are used by default.
# By default, the image contains only the Teleport application and its runtime
# dependencies, and does not contain a shell.
# This setting only takes effect when [`enterprise`](#enterprise) is `false`.
# When running an enterprise version, you must use
# [`enterpriseImage`](#enterpriseImage) instead.
Expand All @@ -902,7 +903,8 @@ image: public.ecr.aws/gravitational/teleport-distroless
# using automatic updates. Teleport Cloud uses automatic updates by default.
# </Admonition>
#
# Hardened distroless images are used by default.
# By default, the image contains only the Teleport application and its runtime
# dependencies, and does not contain a shell.
# This setting only takes effect when [`enterprise`](#enterprise) is `true`.
# When running an enterprise version, you must use [`image`](#image) instead.
enterpriseImage: public.ecr.aws/gravitational/teleport-ent-distroless
Expand Down

0 comments on commit 9b9a439

Please sign in to comment.