Skip to content
GitLab
Commit 08aa9ac7 authored by Justin Santa Barbara's avatar Justin Santa Barbara
Browse files

Release 1.12.0-alpha.3

parent 94fc9a83
Hide whitespace changes
Inline Side-by-side
Showing
with 25 additions and 25 deletions
+25 -25
Makefile
+ 1
- 1
View file @ 08aa9ac7
......@@ -58,7 +58,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.12.0-alpha.2
DNS_CONTROLLER_TAG=1.12.0-alpha.3
# 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 @ 08aa9ac7
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.12.0-alpha.2
version: v1.12.0-alpha.3
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.12.0-alpha.2
version: v1.12.0-alpha.3
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.12.0-alpha.2
image: kope/dns-controller:1.12.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+ 3
- 3
View file @ 08aa9ac7
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.12.0-alpha.2
version: v1.12.0-alpha.3
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.12.0-alpha.2
version: v1.12.0-alpha.3
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.12.0-alpha.2
image: kope/dns-controller:1.12.0-alpha.3
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 @ 08aa9ac7
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.12.0-alpha.2
version: v1.12.0-alpha.3
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.12.0-alpha.2
version: v1.12.0-alpha.3
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.12.0-alpha.2
image: kope/dns-controller:1.12.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+ 1
- 1
View file @ 08aa9ac7
......@@ -372,7 +372,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.12.0-alpha.2"
version := "1.12.0-alpha.3"
{
location := key + "/pre-k8s-1.6.yaml"
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+ 3
- 3
View file @ 08aa9ac7
......@@ -55,21 +55,21 @@ spec:
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.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.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+ 3
- 3
View file @ 08aa9ac7
......@@ -55,21 +55,21 @@ spec:
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.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.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+ 3
- 3
View file @ 08aa9ac7
......@@ -55,21 +55,21 @@ spec:
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.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.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+ 3
- 3
View file @ 08aa9ac7
......@@ -55,21 +55,21 @@ spec:
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.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.12.0-alpha.2
version: 1.12.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.12.0-alpha.2
version: 1.12.0-alpha.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......
version.go
+ 2
- 2
View file @ 08aa9ac7
......@@ -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.12.0-alpha.2"
KOPS_CI_VERSION = "1.12.0-alpha.3"
KOPS_RELEASE_VERSION = "1.12.0-alpha.3"
KOPS_CI_VERSION = "1.12.0-alpha.4"
)
// 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流程，让项目更安全