Skip to content

Commit

Permalink
Merge pull request #5985 from rajansandeep/1.2.4
Browse files Browse the repository at this point in the history
Bump CoreDNS version to 1.2.4 and update manifest
  • Loading branch information
k8s-ci-robot committed Oct 27, 2018
2 parents 3245388 + b6b6c66 commit f7a0b38
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ rules:
verbs:
- list
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
Expand Down Expand Up @@ -55,7 +61,6 @@ data:
Corefile: |
.:53 {
errors
log
health
kubernetes {{ KubeDNS.Domain }}. in-addr.arpa ip6.arpa {
pods insecure
Expand Down Expand Up @@ -99,9 +104,11 @@ spec:
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.2.2
image: k8s.gcr.io/coredns:1.2.4
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if kubeDNS.Provider == "CoreDNS" {
{
key := "coredns.addons.k8s.io"
version := "1.2.2-kops.1"
version := "1.2.4-kops.1"

{
location := key + "/k8s-1.6.yaml"
Expand Down

0 comments on commit f7a0b38

Please sign in to comment.