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

Release 1.17.0-beta.2

parent cc44ed01
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 65 deletions
+71 -65
Makefile
+ 11
- 5
View file @ e0d2809d
......@@ -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.17.0-beta.1
DNS_CONTROLLER_TAG=1.17.0-beta.2
# Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=1.17.0-beta.1
KOPS_CONTROLLER_TAG=1.17.0-beta.2
# Keep in sync with logic in get_workspace_status
# TODO: just invoke tools/get_workspace_status.sh?
......@@ -468,9 +468,15 @@ dns-controller-push: dns-controller-image
.PHONY: utils-dist
utils-dist:
docker build -t utils-builder images/utils-builder
mkdir -p ${DIST}/linux/amd64/
docker run -v `pwd`/.build/dist/linux/amd64/:/dist utils-builder /extract.sh
# Broken with deprecation of jessie; use bazel version instead
# (bazel version just copies an older version)
#docker build -t utils-builder images/utils-builder
#mkdir -p ${DIST}/linux/amd64/
#docker run -v `pwd`/.build/dist/linux/amd64/:/dist utils-builder /extract.sh
bazel build //images/utils-builder:utils
cp bazel-bin/images/utils-builder/utils.tar.gz ${DIST}/linux/amd64/utils.tar.gz
tools/sha1 ${DIST}/linux/amd64/utils.tar.gz ${DIST}/linux/amd64/utils.tar.gz.sha1
tools/sha256 ${DIST}/linux/amd64/utils.tar.gz ${DIST}/linux/amd64/utils.tar.gz.sha256
.PHONY: bazel-utils-dist
bazel-utils-dist:
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+ 3
- 3
View file @ e0d2809d
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
......@@ -32,7 +32,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.17.0-beta.1
image: kope/dns-controller:1.17.0-beta.2
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+ 3
- 3
View file @ e0d2809d
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.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.17.0-beta.1
image: kope/dns-controller:1.17.0-beta.2
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 @ e0d2809d
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.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.17.0-beta.1
image: kope/dns-controller:1.17.0-beta.2
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
+ 3
- 3
View file @ e0d2809d
......@@ -19,7 +19,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
spec:
selector:
matchLabels:
......@@ -33,7 +33,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
spec:
priorityClassName: system-node-critical
tolerations:
......@@ -46,7 +46,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: kope/kops-controller:1.17.0-beta.1
image: kope/kops-controller:1.17.0-beta.2
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
......
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+ 2
- 2
View file @ e0d2809d
......@@ -117,7 +117,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
{
key := "kops-controller.addons.k8s.io"
version := "1.17.0-beta.1"
version := "1.17.0-beta.2"
{
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.17.0-beta.1"
version := "1.17.0-beta.2"
{
location := key + "/pre-k8s-1.6.yaml"
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
+ 8
- 8
View file @ e0d2809d
......@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- 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: 0a5cba2c22ea414268fef16365d6401875e434e8
manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ e0d2809d
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
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.17.0-beta.1
version: v1.17.0-beta.2
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.17.0-beta.1
image: kope/dns-controller:1.17.0-beta.2
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
+ 3
- 3
View file @ e0d2809d
......@@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
name: kops-controller
namespace: kube-system
spec:
......@@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
spec:
containers:
- command:
- /usr/bin/kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config.yaml
image: kope/kops-controller:1.17.0-beta.1
image: kope/kops-controller:1.17.0-beta.2
name: kops-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+ 8
- 8
View file @ e0d2809d
......@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- 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: 0a5cba2c22ea414268fef16365d6401875e434e8
manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ e0d2809d
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
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.17.0-beta.1
version: v1.17.0-beta.2
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.17.0-beta.1
image: kope/dns-controller:1.17.0-beta.2
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
+ 3
- 3
View file @ e0d2809d
......@@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
name: kops-controller
namespace: kube-system
spec:
......@@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.17.0-beta.1
version: v1.17.0-beta.2
spec:
containers:
- command:
- /usr/bin/kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config.yaml
image: kope/kops-controller:1.17.0-beta.1
image: kope/kops-controller:1.17.0-beta.2
name: kops-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+ 8
- 8
View file @ e0d2809d
......@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- 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: 0a5cba2c22ea414268fef16365d6401875e434e8
manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+ 8
- 8
View file @ e0d2809d
......@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- 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: 0a5cba2c22ea414268fef16365d6401875e434e8
manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.17.0-beta.1
version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......
version.go
+ 2
- 2
View file @ e0d2809d
......@@ -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.17.0-beta.1"
KOPS_CI_VERSION = "1.17.0-beta.2"
KOPS_RELEASE_VERSION = "1.17.0-beta.2"
KOPS_CI_VERSION = "1.17.0-beta.3"
)
// 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流程，让项目更安全