Skip to content

Commit

Permalink
Merge pull request #1854 from zalando-incubator/drop-dns-labels
Browse files Browse the repository at this point in the history
Remove cluster-dns label from nodes
  • Loading branch information
mikkeloscar authored Feb 28, 2019
2 parents 4e892c5 + 1bb8eaf commit aa0a722
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion cluster/node-pools/master-default/userdata.clc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ systemd:
--node-labels=node-role.kubernetes.io/master,kubernetes.io/role=master,master=true \
--node-labels=cluster-lifecycle-controller.zalan.do/replacement-strategy=ensure-minimum-healthy-nodes \
--node-labels=kubernetes.io/node-pool={{ .NodePool.Name }}{{if index .NodePool.ConfigItems "labels"}},{{.NodePool.ConfigItems.labels}}{{end}} \
--node-labels=cluster-dns={{ .Cluster.ConfigItems.cluster_dns }} \
--node-labels={{ .Values.node_labels }} \
--pod-manifest-path=/etc/kubernetes/manifests \
--cluster-dns=${PRIVATE_EC2_IPV4} \
Expand Down
1 change: 0 additions & 1 deletion cluster/node-pools/worker-default/userdata.clc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ systemd:
--node-labels=kubernetes.io/role=worker \
--node-labels=kubernetes.io/node-pool={{ .NodePool.Name }}{{if index .NodePool.ConfigItems "labels"}},{{.NodePool.ConfigItems.labels}}{{end}} \
--node-labels=${SPOT_LABEL} \
--node-labels=cluster-dns={{ .Cluster.ConfigItems.cluster_dns }} \
{{- if eq .Cluster.ConfigItems.node_update_prepare_replacement_node "true" }}
--node-labels=${REPLACEMENT_STRATEGY_LABEL} \
{{- end }}
Expand Down

0 comments on commit aa0a722

Please sign in to comment.