Skip to content

Commit 9b71713

Browse files
committed
Tag 1.8.0-beta.1
1 parent 9298547 commit 9b71713

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ SOURCES:=$(shell find . -name "*.go")
4343
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
4444

4545
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
46-
DNS_CONTROLLER_TAG=1.7.1
46+
DNS_CONTROLLER_TAG=1.8.0-beta.1
4747

48-
KOPS_RELEASE_VERSION = 1.8.0-alpha.1
49-
KOPS_CI_VERSION = 1.8.0-alpha.2
48+
KOPS_RELEASE_VERSION = 1.8.0-beta.1
49+
KOPS_CI_VERSION = 1.8.0-beta.2
5050

5151
# kops local location
5252
KOPS = ${LOCAL}/kops

upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
k8s-addon: dns-controller.addons.k8s.io
88
k8s-app: dns-controller
9-
version: v1.7.1
9+
version: v1.8.0-beta.1
1010
spec:
1111
replicas: 1
1212
selector:
@@ -17,7 +17,7 @@ spec:
1717
labels:
1818
k8s-addon: dns-controller.addons.k8s.io
1919
k8s-app: dns-controller
20-
version: v1.7.1
20+
version: v1.8.0-beta.1
2121
annotations:
2222
scheduler.alpha.kubernetes.io/critical-pod: ''
2323
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
@@ -33,7 +33,7 @@ spec:
3333
serviceAccount: dns-controller
3434
containers:
3535
- name: dns-controller
36-
image: kope/dns-controller:1.7.1
36+
image: kope/dns-controller:1.8.0-beta.1
3737
command:
3838
{{ range $arg := DnsControllerArgv }}
3939
- "{{ $arg }}"

upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
k8s-addon: dns-controller.addons.k8s.io
88
k8s-app: dns-controller
9-
version: v1.7.1
9+
version: v1.8.0-beta.1
1010
spec:
1111
replicas: 1
1212
selector:
@@ -17,7 +17,7 @@ spec:
1717
labels:
1818
k8s-addon: dns-controller.addons.k8s.io
1919
k8s-app: dns-controller
20-
version: v1.7.1
20+
version: v1.8.0-beta.1
2121
annotations:
2222
scheduler.alpha.kubernetes.io/critical-pod: ''
2323
scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
@@ -28,7 +28,7 @@ spec:
2828
hostNetwork: true
2929
containers:
3030
- name: dns-controller
31-
image: kope/dns-controller:1.7.1
31+
image: kope/dns-controller:1.8.0-beta.1
3232
command:
3333
{{ range $arg := DnsControllerArgv }}
3434
- "{{ $arg }}"

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
186186

187187
{
188188
key := "dns-controller.addons.k8s.io"
189-
version := "1.7.1"
189+
version := "1.8.0-beta.1"
190190

191191
{
192192
location := key + "/pre-k8s-1.6.yaml"

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ spec:
4141
name: dns-controller.addons.k8s.io
4242
selector:
4343
k8s-addon: dns-controller.addons.k8s.io
44-
version: 1.7.1
44+
version: 1.8.0-beta.1
4545
- id: k8s-1.6
4646
kubernetesVersion: '>=1.6.0'
4747
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
4848
name: dns-controller.addons.k8s.io
4949
selector:
5050
k8s-addon: dns-controller.addons.k8s.io
51-
version: 1.7.1
51+
version: 1.8.0-beta.1
5252
- id: v1.7.0
5353
kubernetesVersion: '>=1.7.0'
5454
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ spec:
4141
name: dns-controller.addons.k8s.io
4242
selector:
4343
k8s-addon: dns-controller.addons.k8s.io
44-
version: 1.7.1
44+
version: 1.8.0-beta.1
4545
- id: k8s-1.6
4646
kubernetesVersion: '>=1.6.0'
4747
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
4848
name: dns-controller.addons.k8s.io
4949
selector:
5050
k8s-addon: dns-controller.addons.k8s.io
51-
version: 1.7.1
51+
version: 1.8.0-beta.1
5252
- id: v1.7.0
5353
kubernetesVersion: '>=1.7.0'
5454
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ spec:
4141
name: dns-controller.addons.k8s.io
4242
selector:
4343
k8s-addon: dns-controller.addons.k8s.io
44-
version: 1.7.1
44+
version: 1.8.0-beta.1
4545
- id: k8s-1.6
4646
kubernetesVersion: '>=1.6.0'
4747
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
4848
name: dns-controller.addons.k8s.io
4949
selector:
5050
k8s-addon: dns-controller.addons.k8s.io
51-
version: 1.7.1
51+
version: 1.8.0-beta.1
5252
- id: v1.7.0
5353
kubernetesVersion: '>=1.7.0'
5454
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml

0 commit comments

Comments
 (0)