diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/addon.yaml b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/addon.yaml index 2c087eb202..a7d52cecfd 100644 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/addon.yaml +++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/addon.yaml @@ -3,8 +3,8 @@ metadata: name: dns-controller spec: addons: - - version: 1.5.1 + - version: 1.5.2 selector: k8s-addon: dns-controller.addons.k8s.io - manifest: v1.5.1.yaml + manifest: v1.5.2.yaml diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.4.0.yaml b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.4.0.yaml deleted file mode 100644 index 2d72026998..0000000000 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.4.0.yaml +++ /dev/null @@ -1,39 +0,0 @@ -kind: Deployment -apiVersion: extensions/v1beta1 -metadata: - name: dns-controller - namespace: kube-system - labels: - k8s-addon: dns-controller.addons.k8s.io - k8s-app: dns-controller - version: v1.4.0 -spec: - replicas: 1 - selector: - matchLabels: - k8s-app: dns-controller - template: - metadata: - labels: - k8s-addon: dns-controller.addons.k8s.io - k8s-app: dns-controller - version: v1.4.0 - annotations: - scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]' - spec: - nodeSelector: - kubernetes.io/role: master - dnsPolicy: Default # Don't use cluster DNS (we are likely running before kube-dns) - containers: - - name: dns-controller - image: kope/dns-controller:1.4.0 - command: - - /usr/bin/dns-controller - - --watch-ingress=false - - --dns=aws-route53 - - -v=8 - resources: - requests: - cpu: 50m - memory: 50Mi diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.1.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.1.yaml.template deleted file mode 100644 index a859c56066..0000000000 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.1.yaml.template +++ /dev/null @@ -1,39 +0,0 @@ -kind: Deployment -apiVersion: extensions/v1beta1 -metadata: - name: dns-controller - namespace: kube-system - labels: - k8s-addon: dns-controller.addons.k8s.io - k8s-app: dns-controller - version: v1.5.1 -spec: - replicas: 1 - selector: - matchLabels: - k8s-app: dns-controller - template: - metadata: - labels: - k8s-addon: dns-controller.addons.k8s.io - k8s-app: dns-controller - version: v1.5.1 - annotations: - scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]' - spec: - nodeSelector: - kubernetes.io/role: master - dnsPolicy: Default # Don't use cluster DNS (we are likely running before kube-dns) - hostNetwork: true - containers: - - name: dns-controller - image: kope/dns-controller:1.5.1 - command: -{{ range $arg := DnsControllerArgv }} - - "{{ $arg }}" -{{ end }} - resources: - requests: - cpu: 50m - memory: 50Mi diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.4.1.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.2.yaml.template similarity index 91% rename from upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.4.1.yaml.template rename to upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.2.yaml.template index 35fa6b8a51..ad62255d08 100644 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.4.1.yaml.template +++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.2.yaml.template @@ -6,7 +6,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.4.1 + version: v1.5.2 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.4.1 + version: v1.5.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]' @@ -28,7 +28,7 @@ spec: hostNetwork: true containers: - name: dns-controller - image: kope/dns-controller:1.4.1 + image: kope/dns-controller:1.5.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index f5ea095827..785b5daf5a 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -115,7 +115,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri { key := "dns-controller.addons.k8s.io" - version := "1.5.1" + version := "1.5.2" location := key + "/v" + version + ".yaml" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml index e7233e0eb3..a3e971fe03 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml @@ -19,11 +19,11 @@ spec: selector: k8s-addon: limit-range.addons.k8s.io version: 1.5.0 - - manifest: dns-controller.addons.k8s.io/v1.5.1.yaml + - manifest: dns-controller.addons.k8s.io/v1.5.2.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.5.1 + version: 1.5.2 - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml name: storage-aws.addons.k8s.io selector: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 232c9db25f..0a819819fc 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -19,11 +19,11 @@ spec: selector: k8s-addon: limit-range.addons.k8s.io version: 1.5.0 - - manifest: dns-controller.addons.k8s.io/v1.5.1.yaml + - manifest: dns-controller.addons.k8s.io/v1.5.2.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.5.1 + version: 1.5.2 - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml name: storage-aws.addons.k8s.io selector: