Skip to content

Commit b836a72

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

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

cluster/config-defaults.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,10 @@ teapot_admission_controller_crd_role_provisioning_allowed_api_groups: "flink.k8s
591591
teapot_admission_controller_topology_spread: optin
592592
teapot_admission_controller_topology_spread_timeout: 7m
593593

594+
# Inject custom default service account to identify client pods using default SA
595+
# to read from the Kubernetes API.
596+
teapot_admission_controller_custom_default_service_account: "false"
597+
594598

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ data:
6161
podfactory.base-image-check.namespaces: "{{ .Cluster.ConfigItems.teapot_admission_controller_validate_base_images_namespaces }}"
6262
{{- end }}
6363

64+
{{- if eq .Cluster.ConfigItems.teapot_admission_controller_custom_default_service_account "true"}}
65+
podfactory.custom-default-service-account.enable: "true"
66+
{{- end }}
67+
6468
# This setting enables and disables the container image compliance checks
6569
pod.image-check.enable: "{{ .Cluster.ConfigItems.teapot_admission_controller_validate_pod_images }}"
6670

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

Lines changed: 7 additions & 1 deletion
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-198
208+
# - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-198
209+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/staging_namespace/teapot/admission-controller:pr-202-12
209210
name: admission-controller
210211
lifecycle:
211212
preStop:
@@ -273,7 +274,12 @@ write_files:
273274
- mountPath: /etc/kubernetes/ssl
274275
name: ssl-certs-kubernetes
275276
readOnly: true
277+
<<<<<<< HEAD
276278
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-128
279+
=======
280+
# - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-127
281+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/staging_namespace/teapot/k8s-authnz-webhook:pr-159-1
282+
>>>>>>> 3a6b5fb65 (Optional support for custom default service account)
277283
name: webhook
278284
ports:
279285
- containerPort: 8081

0 commit comments

Comments
 (0)