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

Merge pull request #4750 from justinsb/release_192 

Release 1.9.0-alpha.2
This commit is contained in:
k8s-ci-robot 2018-03-21 23:03:04 -07:00 committed by GitHub
parent 84b75cc7ec d49ac2268a
commit 278d52d244
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 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

@ -51,12 +51,12 @@ 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.9.0-alpha.1
DNS_CONTROLLER_TAG=1.9.0-alpha.2
# Keep in sync with logic in get_workspace_status
# Update variables in tools/get_workplace_status.sh for the bazel build
KOPS_RELEASE_VERSION = 1.9.0-alpha.1
KOPS_CI_VERSION = 1.9.0-alpha.2
KOPS_RELEASE_VERSION = 1.9.0-alpha.2
KOPS_CI_VERSION = 1.9.0-alpha.3
# kops local location
KOPS = ${LOCAL}/kops

4
tools/get_workspace_status.sh
View File

@ -47,8 +47,8 @@ GITSHA=$(git describe --always)
# These variables need to match the values in our Makefile
# When we cut a new release we need to increment these accordingly
KOPS_RELEASE_VERSION=1.9.0-alpha.1
KOPS_CI_VERSION=1.9.0-alpha.2
KOPS_RELEASE_VERSION=1.9.0-alpha.2
KOPS_CI_VERSION=1.9.0-alpha.3
if [[ -z "${VERSION}" ]]; then
if [[ -z "${CI}" ]]; then

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

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

@ -184,7 +184,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.9.0-alpha.1"
version := "1.9.0-alpha.2"
{
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
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.9.0-alpha.1
version: 1.9.0-alpha.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.9.0-alpha.1
version: 1.9.0-alpha.2
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
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
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.9.0-alpha.1
version: 1.9.0-alpha.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.9.0-alpha.1
version: 1.9.0-alpha.2
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
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
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.9.0-alpha.1
version: 1.9.0-alpha.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.9.0-alpha.1
version: 1.9.0-alpha.2
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml