diff --git a/Makefile b/Makefile index 9f0adfbf49f39..cdf13df76c238 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ GOVERSION=1.7.4 MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")) # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ -DNS_CONTROLLER_TAG=1.5.0 +DNS_CONTROLLER_TAG=1.5.1 ifndef VERSION # To keep both CI and end-users building from source happy, @@ -43,7 +43,7 @@ ifndef VERSION # We expect that if you are uploading nodeup/protokube, you will set # VERSION (along with S3_BUCKET), either directly or by setting CI=1 ifndef CI - VERSION=1.5.0-alpha3 + VERSION=1.5.0-alpha4 else VERSION := git-$(shell git describe --always) endif 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 3c2eee7caef9b..2c087eb2025f3 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.0 + - version: 1.5.1 selector: k8s-addon: dns-controller.addons.k8s.io - manifest: v1.5.0.yaml + manifest: v1.5.1.yaml diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.0.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.1.yaml.template similarity index 91% rename from upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.0.yaml.template rename to upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.1.yaml.template index 1222427bbcba5..a859c56066673 100644 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.0.yaml.template +++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.1.yaml.template @@ -6,7 +6,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.5.0 + version: v1.5.1 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.5.0 + version: v1.5.1 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.5.0 + image: kope/dns-controller:1.5.1 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index e0202eba6a856..e99e63d85cf3f 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.0" + version := "1.5.1" 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 87c65cc31667b..1d70617c534ac 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.0.yaml + - manifest: dns-controller.addons.k8s.io/v1.5.1.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.5.0 + version: 1.5.1 - 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 6b4070976996b..4a6acff9f9041 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.0.yaml + - manifest: dns-controller.addons.k8s.io/v1.5.1.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.5.0 + version: 1.5.1 - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml name: storage-aws.addons.k8s.io selector: