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

Merge pull request #7985 from justinsb/release_1_17_0_alpha_1 

Release 1.17.0-alpha.1
This commit is contained in:
Kubernetes Prow Robot 2019-11-25 19:53:09 -08:00 committed by GitHub
parent 4bc26e1f5d 5561de1432
commit 501baf7e56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -56,9 +56,9 @@ unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_ST
unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY VSPHERE_USERNAME VSPHERE_PASSWORD
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.16.0-alpha.1
DNS_CONTROLLER_TAG=1.17.0-alpha.1
# Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=1.15.0-alpha.1
KOPS_CONTROLLER_TAG=1.17.0-alpha.1
# Keep in sync with logic in get_workspace_status
# TODO: just invoke tools/get_workspace_status.sh?

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

@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
spec:
replicas: 1
selector:
@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
@ -31,7 +31,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.16.0-alpha.1
image: kope/dns-controller:1.17.0-alpha.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

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

@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
spec:
replicas: 1
selector:
@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
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.16.0-alpha.1
image: kope/dns-controller:1.17.0-alpha.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $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:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
spec:
replicas: 1
selector:
@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.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.16.0-alpha.1
image: kope/dns-controller:1.17.0-alpha.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

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

@ -117,7 +117,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
{
key := "kops-controller.addons.k8s.io"
version := "1.16.0-alpha.1"
version := "1.17.0-alpha.1"
{
location := key + "/k8s-1.16.yaml"
@ -396,7 +396,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.16.0-alpha.1"
version := "1.17.0-alpha.1"
{
location := key + "/pre-k8s-1.6.yaml"

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
name: dns-controller
namespace: kube-system
spec:
@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
spec:
containers:
- command:
@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.16.0-alpha.1
image: kope/dns-controller:1.17.0-alpha.1
name: dns-controller
resources:
requests:

14
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -11,7 +11,7 @@ spec:
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -67,27 +67,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: 39d21dcd13873ecb7aa18e40ec656cd6d0719438
manifestHash: e19c5456a31381c08dd166ce1faf85ce7acc15e3
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 7a763df472e5c4ad8c2044b6867aa548778ee745
manifestHash: 2d6fa6910077fecdf1c98da4303631588cfc9c01
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 8a8f531d13c821e8a2f8d134835cd715dffa59ff
manifestHash: 4ba4be235e96068511965bf296375b45e152369a
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
name: dns-controller
namespace: kube-system
spec:
@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.16.0-alpha.1
version: v1.17.0-alpha.1
spec:
containers:
- command:
@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.16.0-alpha.1
image: kope/dns-controller:1.17.0-alpha.1
name: dns-controller
resources:
requests:

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

@ -11,7 +11,7 @@ spec:
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -67,27 +67,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: 39d21dcd13873ecb7aa18e40ec656cd6d0719438
manifestHash: e19c5456a31381c08dd166ce1faf85ce7acc15e3
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 7a763df472e5c4ad8c2044b6867aa548778ee745
manifestHash: 2d6fa6910077fecdf1c98da4303631588cfc9c01
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 8a8f531d13c821e8a2f8d134835cd715dffa59ff
manifestHash: 4ba4be235e96068511965bf296375b45e152369a
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -11,7 +11,7 @@ spec:
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -67,27 +67,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: 39d21dcd13873ecb7aa18e40ec656cd6d0719438
manifestHash: e19c5456a31381c08dd166ce1faf85ce7acc15e3
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 7a763df472e5c4ad8c2044b6867aa548778ee745
manifestHash: 2d6fa6910077fecdf1c98da4303631588cfc9c01
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 8a8f531d13c821e8a2f8d134835cd715dffa59ff
manifestHash: 4ba4be235e96068511965bf296375b45e152369a
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.16.0-alpha.1
version: 1.17.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

4
version.go
View File

@ -23,8 +23,8 @@ var Version = KOPS_RELEASE_VERSION
// These constants are parsed by build tooling - be careful about changing the formats
const (
KOPS_RELEASE_VERSION = "1.16.0-alpha.1"
KOPS_CI_VERSION = "1.16.0-alpha.2"
KOPS_RELEASE_VERSION = "1.17.0-alpha.1"
KOPS_CI_VERSION = "1.17.0.alpha.2"
)
// GitVersion should be replaced by the makefile