Skip to content
GitLab
Commit f3658f74 authored by Justin SB's avatar Justin SB
Browse files

Release 1.15.1

parent 2c2079fb
release-1.15 1.15.3 1.15.2 1.15.1 v1.15.3 v1.15.2 v1.15.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 62 deletions
+62 -62
Makefile
+ 1
- 1
View file @ f3658f74
......@@ -55,7 +55,7 @@ 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.15.0
DNS_CONTROLLER_TAG=1.15.1
# Keep in sync with logic in get_workspace_status
# TODO: just invoke tools/get_workspace_status.sh?
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+ 3
- 3
View file @ f3658f74
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.1
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.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.15.0
image: kope/dns-controller:1.15.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+ 3
- 3
View file @ f3658f74
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.1
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.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.15.0
image: kope/dns-controller:1.15.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
+ 3
- 3
View file @ f3658f74
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.1
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.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.15.0
image: kope/dns-controller:1.15.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+ 2
- 2
View file @ f3658f74
......@@ -375,7 +375,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.15.0"
version := "1.15.1"
{
location := key + "/pre-k8s-1.6.yaml"
......@@ -472,7 +472,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if kops.CloudProviderID(b.cluster.Spec.CloudProvider) == kops.CloudProviderAWS {
key := "storage-aws.addons.k8s.io"
version := "1.15.0"
version := "1.15.1"
{
id := "v1.15.0"
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ f3658f74
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.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.15.0
version: v1.15.1
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.15.0
image: kope/dns-controller:1.15.1
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+ 9
- 9
View file @ f3658f74
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: bd97c950ee44eb2d1dce42fd404c6db15bd5b1b1
manifestHash: 53004c335fce4824fdcc0d57f5138ebd22a23ca2
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: fb4412a7f0de17431b856b2291e72d29fa91bcd1
manifestHash: 3ce358002686decc40e6c4c1f022240a0ceaf61a
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: e1493110ca6127662cbf50a1506e0f3e45504691
manifestHash: 6f7992bdde16a32787136e6e28b163d8c747d249
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,7 +103,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.7
kubernetesVersion: '>=1.7.0 <1.12.0'
manifest: networking.cilium.io/k8s-1.7.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ f3658f74
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.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.15.0
version: v1.15.1
spec:
containers:
- command:
......@@ -38,7 +38,7 @@ spec:
value: http://proxy.example.com
- name: no_proxy
value: noproxy.example.com,127.0.0.1,localhost,api.minimal.example.com,minimal.example.com,100.64.0.1,100.64.0.0/10,169.254.169.254,172.20.0.0/16
image: kope/dns-controller:1.15.0
image: kope/dns-controller:1.15.1
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+ 9
- 9
View file @ f3658f74
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: bd97c950ee44eb2d1dce42fd404c6db15bd5b1b1
manifestHash: 53004c335fce4824fdcc0d57f5138ebd22a23ca2
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: e59fab0efd5fa883a5e39c6826e2eeac2f9d6ff2
manifestHash: a9cafabe7e235e14ba8babdfd2046c76b2ea481c
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 8532ce78a6d70257a07faa4535351ce3c70f0151
manifestHash: c6fe758b3499694fc0c71abc65cfec1d90974dbc
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,7 +103,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: networking.kope.io/pre-k8s-1.6.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ f3658f74
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.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.15.0
version: v1.15.1
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.15.0
image: kope/dns-controller:1.15.1
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+ 9
- 9
View file @ f3658f74
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: bd97c950ee44eb2d1dce42fd404c6db15bd5b1b1
manifestHash: 53004c335fce4824fdcc0d57f5138ebd22a23ca2
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: fb4412a7f0de17431b856b2291e72d29fa91bcd1
manifestHash: 3ce358002686decc40e6c4c1f022240a0ceaf61a
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: e1493110ca6127662cbf50a1506e0f3e45504691
manifestHash: 6f7992bdde16a32787136e6e28b163d8c747d249
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,4 +103,4 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ f3658f74
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.0
version: v1.15.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.15.0
version: v1.15.1
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.15.0
image: kope/dns-controller:1.15.1
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+ 9
- 9
View file @ f3658f74
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: bd97c950ee44eb2d1dce42fd404c6db15bd5b1b1
manifestHash: 53004c335fce4824fdcc0d57f5138ebd22a23ca2
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: fb4412a7f0de17431b856b2291e72d29fa91bcd1
manifestHash: 3ce358002686decc40e6c4c1f022240a0ceaf61a
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: e1493110ca6127662cbf50a1506e0f3e45504691
manifestHash: 6f7992bdde16a32787136e6e28b163d8c747d249
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,7 +103,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.0
version: 1.15.1
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: networking.weave/pre-k8s-1.6.yaml
......
version.go
+ 2
- 2
View file @ f3658f74
......@@ -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.15.0"
KOPS_CI_VERSION = "1.15.1"
KOPS_RELEASE_VERSION = "1.15.1"
KOPS_CI_VERSION = "1.15.2"
)
// GitVersion should be replaced by the makefile
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全