diff --git a/Makefile b/Makefile index 6749dafe2a..e0bed8b8b2 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,10 @@ SOURCES:=$(shell find . -name "*.go") MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")) # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ -DNS_CONTROLLER_TAG=1.8.0-beta.1 +DNS_CONTROLLER_TAG=1.8.0-beta.2 -KOPS_RELEASE_VERSION = 1.8.0-beta.1 -KOPS_CI_VERSION = 1.8.0-beta.2 +KOPS_RELEASE_VERSION = 1.8.0-beta.2 +KOPS_CI_VERSION = 1.8.0-beta.3 # kops local location KOPS = ${LOCAL}/kops diff --git a/channels/alpha b/channels/alpha index e523750513..c3553d12bd 100644 --- a/channels/alpha +++ b/channels/alpha @@ -40,7 +40,7 @@ spec: requiredVersion: 1.4.2 kopsVersions: - range: ">=1.8.0-alpha.1" - recommendedVersion: 1.8.0-beta.1 + recommendedVersion: 1.8.0-beta.2 #requiredVersion: 1.8.0 kubernetesVersion: 1.8.4 - range: ">=1.7.0-alpha.1" diff --git a/cmd/kops/BUILD.bazel b/cmd/kops/BUILD.bazel index 712b40a973..dd721b9daa 100644 --- a/cmd/kops/BUILD.bazel +++ b/cmd/kops/BUILD.bazel @@ -120,7 +120,7 @@ go_binary( library = ":go_default_library", visibility = ["//visibility:public"], x_defs = { - "k8s.io/kops.Version": "1.8.0-beta.1", # keep + "k8s.io/kops.Version": "1.8.0-beta.2", # keep "k8s.io/kops.GitVersion": "{BUILD_SCM_REVISION}", # keep }, ) diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template index 7636641df9..fd909ffc99 100644 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template @@ -6,7 +6,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.8.0-beta.1 + version: v1.8.0-beta.2 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.8.0-beta.1 + version: v1.8.0-beta.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' # For 1.6, we keep the old tolerations in case of a downgrade to 1.5 @@ -33,7 +33,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.8.0-beta.1 + image: kope/dns-controller:1.8.0-beta.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template index 55b2d5a146..adf0da3db6 100644 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template @@ -6,7 +6,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.8.0-beta.1 + version: v1.8.0-beta.2 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.8.0-beta.1 + version: v1.8.0-beta.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.8.0-beta.1 + image: kope/dns-controller:1.8.0-beta.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 15884d8eb4..3e3edff6e1 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -191,7 +191,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.8.0-beta.1" + version := "1.8.0-beta.2" { location := key + "/pre-k8s-1.6.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 8ce7f27050..f97bcad6d8 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml @@ -41,14 +41,14 @@ spec: name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.8.0-beta.1 + version: 1.8.0-beta.2 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.8.0-beta.1 + version: 1.8.0-beta.2 - id: v1.7.0 kubernetesVersion: '>=1.7.0' manifest: storage-aws.addons.k8s.io/v1.7.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 1c4117095d..6546647a39 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -41,14 +41,14 @@ spec: name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.8.0-beta.1 + version: 1.8.0-beta.2 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.8.0-beta.1 + version: 1.8.0-beta.2 - id: v1.7.0 kubernetesVersion: '>=1.7.0' manifest: storage-aws.addons.k8s.io/v1.7.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index a09ad79fad..6c61a2a638 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -41,14 +41,14 @@ spec: name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.8.0-beta.1 + version: 1.8.0-beta.2 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.8.0-beta.1 + version: 1.8.0-beta.2 - id: v1.7.0 kubernetesVersion: '>=1.7.0' manifest: storage-aws.addons.k8s.io/v1.7.0.yaml