kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump versions to 1.8.0-beta.2

This commit is contained in:
Justin Santa Barbara 2017-11-28 12:26:28 -05:00
parent 305ffcc1af
commit b8b7287e4a
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -43,10 +43,10 @@ SOURCES:=$(shell find . -name "*.go")
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")) MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ # 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_RELEASE_VERSION = 1.8.0-beta.2
KOPS_CI_VERSION = 1.8.0-beta.2 KOPS_CI_VERSION = 1.8.0-beta.3
# kops local location # kops local location
KOPS = ${LOCAL}/kops KOPS = ${LOCAL}/kops

2
channels/alpha
View File

@ -40,7 +40,7 @@ spec:
requiredVersion: 1.4.2 requiredVersion: 1.4.2
kopsVersions: kopsVersions:
- range: ">=1.8.0-alpha.1" - range: ">=1.8.0-alpha.1"
recommendedVersion: 1.8.0-beta.1 recommendedVersion: 1.8.0-beta.2
#requiredVersion: 1.8.0 #requiredVersion: 1.8.0
kubernetesVersion: 1.8.4 kubernetesVersion: 1.8.4
- range: ">=1.7.0-alpha.1" - range: ">=1.7.0-alpha.1"

2
cmd/kops/BUILD.bazel
View File

@ -120,7 +120,7 @@ go_binary(
library = ":go_default_library", library = ":go_default_library",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
x_defs = { 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 "k8s.io/kops.GitVersion": "{BUILD_SCM_REVISION}", # keep
}, },
) )

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

@ -6,7 +6,7 @@ metadata:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.8.0-beta.1 version: v1.8.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@ -17,7 +17,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.8.0-beta.1 version: v1.8.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5 # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller serviceAccount: dns-controller
containers: containers:
- name: dns-controller - name: dns-controller
image: kope/dns-controller:1.8.0-beta.1 image: kope/dns-controller:1.8.0-beta.2
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"

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

@ -6,7 +6,7 @@ metadata:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.8.0-beta.1 version: v1.8.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@ -17,7 +17,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.8.0-beta.1 version: v1.8.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
@ -28,7 +28,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: dns-controller - name: dns-controller
image: kope/dns-controller:1.8.0-beta.1 image: kope/dns-controller:1.8.0-beta.2
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -191,7 +191,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if externalDNS == nil || !externalDNS.Disable { if externalDNS == nil || !externalDNS.Disable {
{ {
key := "dns-controller.addons.k8s.io" 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" location := key + "/pre-k8s-1.6.yaml"

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

@ -41,14 +41,14 @@ spec:
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.8.0-beta.1 version: 1.8.0-beta.2
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: '>=1.6.0' kubernetesVersion: '>=1.6.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.8.0-beta.1 version: 1.8.0-beta.2
- id: v1.7.0 - id: v1.7.0
kubernetesVersion: '>=1.7.0' kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml manifest: storage-aws.addons.k8s.io/v1.7.0.yaml

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -41,14 +41,14 @@ spec:
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.8.0-beta.1 version: 1.8.0-beta.2
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: '>=1.6.0' kubernetesVersion: '>=1.6.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.8.0-beta.1 version: 1.8.0-beta.2
- id: v1.7.0 - id: v1.7.0
kubernetesVersion: '>=1.7.0' kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml manifest: storage-aws.addons.k8s.io/v1.7.0.yaml

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -41,14 +41,14 @@ spec:
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.8.0-beta.1 version: 1.8.0-beta.2
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: '>=1.6.0' kubernetesVersion: '>=1.6.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.8.0-beta.1 version: 1.8.0-beta.2
- id: v1.7.0 - id: v1.7.0
kubernetesVersion: '>=1.7.0' kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml manifest: storage-aws.addons.k8s.io/v1.7.0.yaml