Skip to content

Commit 08a82a4

Browse files
Merge dev to dev-to-kube-1.26
2 parents faeaea5 + fabc9a3 commit 08a82a4

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

cluster/config-defaults.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,15 @@ audit_webhook_batch_max_size: "250"
713713
kube2iam_cpu: "25m"
714714
kube2iam_memory: "100Mi"
715715

716+
# configure whether kube2iam should only run on worker nodes.
717+
# This depends on control_plane_asg_lifecycle_hook=false as kube-node-ready
718+
# doesn't work without kube2iam.
719+
{{if eq .Cluster.Environment "production"}}
720+
kube2iam_worker_only: "false"
721+
{{else}}
722+
kube2iam_worker_only: "true"
723+
{{end}}
724+
716725
# CIDR configuration for nodes and pods
717726
# Changing this will change the number of nodes and pods we can schedule in the
718727
# cluster: https://cloud.google.com/kubernetes-engine/docs/how-to/flexible-pod-cidr

cluster/manifests/kube2iam/daemonset.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ spec:
2121
annotations:
2222
logging/destination: "{{.Cluster.ConfigItems.log_destination_infra}}"
2323
spec:
24+
{{- if and (eq .Cluster.ConfigItems.kube2iam_worker_only "true") (eq .Cluster.ConfigItems.control_plane_asg_lifecycle_hook "false") }}
25+
nodeSelector:
26+
node.kubernetes.io/role: worker
27+
{{- end }}
2428
dnsConfig:
2529
options:
2630
- name: ndots

0 commit comments

Comments
 (0)