diff --git a/roles/kubernetes-apps/ansible/templates/coredns-clusterrole.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-clusterrole.yml.j2 index 4136d603e98c6dcfc4e4b6a101bd967cf18878c6..812d95211155f0ac860274eb5c6c1137d2b88e23 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-clusterrole.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-clusterrole.yml.j2 @@ -4,7 +4,6 @@ kind: ClusterRole metadata: labels: kubernetes.io/bootstrapping: rbac-defaults - addonmanager.kubernetes.io/mode: Reconcile name: system:coredns rules: - apiGroups: diff --git a/roles/kubernetes-apps/ansible/templates/coredns-clusterrolebinding.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-clusterrolebinding.yml.j2 index 89becd5b44b1ee2a767d4ebed83cc23ea52c9b7a..bbda5ebc430cffa5b0d30b2db4fb54a96ef6c45e 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-clusterrolebinding.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-clusterrolebinding.yml.j2 @@ -6,7 +6,6 @@ metadata: rbac.authorization.kubernetes.io/autoupdate: "true" labels: kubernetes.io/bootstrapping: rbac-defaults - addonmanager.kubernetes.io/mode: EnsureExists name: system:coredns roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 index a89d3fc9edb09d78883263966a4c85fba817e0fb..928f82cdf41863e29e38457c031386c634f08872 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 @@ -4,8 +4,6 @@ kind: ConfigMap metadata: name: coredns namespace: kube-system - labels: - addonmanager.kubernetes.io/mode: EnsureExists data: Corefile: | .:53 { @@ -27,4 +25,7 @@ data: proxy . /etc/resolv.conf {% endif %} cache 30 + loop + reload + loadbalance } diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 index 02442bcba93aa7f5cfa84d7f225644f5bd45ae31..aef110238e8499ba509f764795ae6c521d8a33c3 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 @@ -6,9 +6,7 @@ metadata: namespace: kube-system labels: k8s-app: coredns{{ coredns_ordinal_suffix | default('') }} - kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile - kubernetes.io/name: "CoreDNS" + kubernetes.io/name: "coredns{{ coredns_ordinal_suffix | default('') }}" spec: replicas: {{ coredns_replicas }} strategy: @@ -79,6 +77,14 @@ spec: - containerPort: 9153 name: metrics protocol: TCP + securityContext: + allowPrivilegeEscalation: false + capabilities: + add: + - NET_BIND_SERVICE + drop: + - all + readOnlyRootFilesystem: true livenessProbe: httpGet: path: /health diff --git a/roles/kubernetes-apps/ansible/templates/coredns-sa.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-sa.yml.j2 index 64d9c4dae27d29ae9eeabd9c763861da69cb5d82..8d2b47c46cf19561fce25b10bc9dd5ba0bcce8ca 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-sa.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-sa.yml.j2 @@ -4,6 +4,3 @@ kind: ServiceAccount metadata: name: coredns namespace: kube-system - labels: - kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile diff --git a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 index 7f08d17ca370b3f1c783ed667994a92dffaabac0..1eb3947ad32b0d915fb6c7c036cecbd06bc4fefe 100644 --- a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 @@ -7,8 +7,7 @@ metadata: labels: k8s-app: coredns{{ coredns_ordinal_suffix | default('') }} kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile - kubernetes.io/name: "CoreDNS" + kubernetes.io/name: "coredns{{ coredns_ordinal_suffix | default('') }}" annotations: prometheus.io/path: /metrics prometheus.io/port: "9153" diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2 b/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2 index e29ed4dac54bb710f492d0be2046cf5863719004..dba3ff73d9b5c31d2c82dd44aceccaf990e48483 100644 --- a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2 +++ b/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2 @@ -21,7 +21,7 @@ metadata: rules: - apiGroups: [""] resources: ["nodes"] - verbs: ["list"] + verbs: ["list", "watch"] - apiGroups: [""] resources: ["replicationcontrollers/scale"] verbs: ["get", "update"]