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

Tag alpha4, dns-controller 1.5.1

This commit is contained in:
Justin Santa Barbara 2017-01-21 15:20:31 -05:00
parent a0a59f3ef1
commit a60d7982e0
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -29,7 +29,7 @@ GOVERSION=1.7.4
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.5.0 DNS_CONTROLLER_TAG=1.5.1
ifndef VERSION ifndef VERSION
# To keep both CI and end-users building from source happy, # To keep both CI and end-users building from source happy,
@ -43,7 +43,7 @@ ifndef VERSION
# We expect that if you are uploading nodeup/protokube, you will set # We expect that if you are uploading nodeup/protokube, you will set
# VERSION (along with S3_BUCKET), either directly or by setting CI=1 # VERSION (along with S3_BUCKET), either directly or by setting CI=1
ifndef CI ifndef CI
VERSION=1.5.0-alpha3 VERSION=1.5.0-alpha4
else else
VERSION := git-$(shell git describe --always) VERSION := git-$(shell git describe --always)
endif endif

4
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/addon.yaml
View File

@ -3,8 +3,8 @@ metadata:
name: dns-controller name: dns-controller
spec: spec:
addons: addons:
- version: 1.5.0 - version: 1.5.1
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
manifest: v1.5.0.yaml manifest: v1.5.1.yaml

6
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.0.yaml.template → upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.1.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.5.0 version: v1.5.1
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.5.0 version: v1.5.1
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.5.0 image: kope/dns-controller:1.5.1
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"

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

@ -115,7 +115,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
{ {
key := "dns-controller.addons.k8s.io" key := "dns-controller.addons.k8s.io"
version := "1.5.0" version := "1.5.1"
location := key + "/v" + version + ".yaml" location := key + "/v" + version + ".yaml"

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

@ -19,11 +19,11 @@ spec:
selector: selector:
k8s-addon: limit-range.addons.k8s.io k8s-addon: limit-range.addons.k8s.io
version: 1.5.0 version: 1.5.0
- manifest: dns-controller.addons.k8s.io/v1.5.0.yaml - manifest: dns-controller.addons.k8s.io/v1.5.1.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.5.0 version: 1.5.1
- manifest: storage-aws.addons.k8s.io/v1.5.0.yaml - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
name: storage-aws.addons.k8s.io name: storage-aws.addons.k8s.io
selector: selector:

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

@ -19,11 +19,11 @@ spec:
selector: selector:
k8s-addon: limit-range.addons.k8s.io k8s-addon: limit-range.addons.k8s.io
version: 1.5.0 version: 1.5.0
- manifest: dns-controller.addons.k8s.io/v1.5.0.yaml - manifest: dns-controller.addons.k8s.io/v1.5.1.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.5.0 version: 1.5.1
- manifest: storage-aws.addons.k8s.io/v1.5.0.yaml - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
name: storage-aws.addons.k8s.io name: storage-aws.addons.k8s.io
selector: selector: