Skip to content

Commit

Permalink
Optional support for custom default service account
Browse files Browse the repository at this point in the history
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
  • Loading branch information
mikkeloscar committed Apr 3, 2024
1 parent 828752c commit 81a916e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
4 changes: 4 additions & 0 deletions cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,10 @@ teapot_admission_controller_crd_role_provisioning_allowed_api_groups: "flink.k8s
teapot_admission_controller_topology_spread: optin
teapot_admission_controller_topology_spread_timeout: 7m

# Inject custom default service account to identify client pods using default SA
# to read from the Kubernetes API.
teapot_admission_controller_custom_default_service_account: "false"


# Enable and configure runtime-policy annotation
{{if eq .Cluster.Environment "production"}}
Expand Down
4 changes: 4 additions & 0 deletions cluster/manifests/01-admission-control/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ data:
podfactory.base-image-check.namespaces: "{{ .Cluster.ConfigItems.teapot_admission_controller_validate_base_images_namespaces }}"
{{- end }}

{{- if eq .Cluster.ConfigItems.teapot_admission_controller_custom_default_service_account "true"}}
podfactory.custom-default-service-account.enable: "true"
{{- end }}

# This setting enables and disables the container image compliance checks
pod.image-check.enable: "{{ .Cluster.ConfigItems.teapot_admission_controller_validate_pod_images }}"

Expand Down
8 changes: 7 additions & 1 deletion cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ write_files:
limits:
memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
{{- end }}
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-198
# - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-198
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/staging_namespace/teapot/admission-controller:pr-202-12
name: admission-controller
lifecycle:
preStop:
Expand Down Expand Up @@ -273,7 +274,12 @@ write_files:
- mountPath: /etc/kubernetes/ssl
name: ssl-certs-kubernetes
readOnly: true
<<<<<<< HEAD
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-128
=======
# - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-127
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/staging_namespace/teapot/k8s-authnz-webhook:pr-159-1
>>>>>>> 3a6b5fb65 (Optional support for custom default service account)
name: webhook
ports:
- containerPort: 8081
Expand Down

0 comments on commit 81a916e

Please sign in to comment.