diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template index bc99a79cc2..bcbf4131a2 100644 --- a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template @@ -7,7 +7,7 @@ metadata: kubernetes.io/cluster-service: "true" k8s-addon: coredns.addons.k8s.io --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: @@ -32,7 +32,7 @@ rules: verbs: - get --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: @@ -75,7 +75,7 @@ data: reload } --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: coredns @@ -98,6 +98,7 @@ spec: labels: k8s-app: kube-dns spec: + priorityClassName: system-cluster-critical serviceAccountName: coredns tolerations: - key: "CriticalAddonsOnly" @@ -106,7 +107,7 @@ spec: beta.kubernetes.io/os: linux containers: - name: coredns - image: k8s.gcr.io/coredns:1.3.0 + image: k8s.gcr.io/coredns:1.3.1 imagePullPolicy: IfNotPresent resources: limits: @@ -146,6 +147,11 @@ spec: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 + readinessProbe: + httpGet: + path: /health + port: 8080 + scheme: HTTP dnsPolicy: Default volumes: - name: config-volume @@ -179,3 +185,6 @@ spec: - name: dns-tcp port: 53 protocol: TCP + - name: metrics + port: 9153 + protocol: TCP diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index e8133a8a3f..ce427e707c 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -211,7 +211,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri if kubeDNS.Provider == "CoreDNS" { { key := "coredns.addons.k8s.io" - version := "1.3.0-kops.2" + version := "1.3.1-kops.2" { location := key + "/k8s-1.6.yaml"