Skip to content

Commit 3a6b5fb

Browse files
committed
Optional support for custom default service account
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
1 parent 7391b34 commit 3a6b5fb

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

cluster/config-defaults.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,10 @@ teapot_admission_controller_crd_role_provisioning_allowed_api_groups: "flink.k8s
537537
teapot_admission_controller_topology_spread: optin
538538
teapot_admission_controller_topology_spread_timeout: 7m
539539

540+
# Inject custom default service account to identify client pods using default SA
541+
# to read from the Kubernetes API.
542+
teapot_admission_controller_custom_default_service_account: "false"
543+
540544

541545
# Enable and configure runtime-policy annotation
542546
{{if eq .Cluster.Environment "production"}}

cluster/manifests/01-admission-control/config.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ data:
5252
podfactory.base-image-check.namespaces: "{{ .Cluster.ConfigItems.teapot_admission_controller_validate_base_images_namespaces }}"
5353
{{- end }}
5454

55+
{{- if eq .Cluster.ConfigItems.teapot_admission_controller_custom_default_service_account "true"}}
56+
podfactory.custom-default-service-account.enable: "true"
57+
{{- end }}
58+
5559
# This setting enables and disables the container image compliance checks
5660
pod.image-check.enable: "{{ .Cluster.ConfigItems.teapot_admission_controller_validate_pod_images }}"
5761

cluster/node-pools/master-default/userdata.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ write_files:
205205
limits:
206206
memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
207207
{{- end }}
208-
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-178
208+
# - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-178
209+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/staging_namespace/teapot/admission-controller:pr-202-4
209210
name: admission-controller
210211
lifecycle:
211212
preStop:
@@ -273,7 +274,8 @@ write_files:
273274
- mountPath: /etc/kubernetes/ssl
274275
name: ssl-certs-kubernetes
275276
readOnly: true
276-
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-127
277+
# - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-127
278+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/staging_namespace/teapot/k8s-authnz-webhook:pr-159-1
277279
name: webhook
278280
ports:
279281
- containerPort: 8081

0 commit comments

Comments
 (0)