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

Release 1.18.0-alpha.3

This commit is contained in:
Justin SB 2020-05-06 07:48:52 -04:00
parent afdf3bbdba
commit 27aab12b28
15 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -53,9 +53,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.18.0-alpha.2
DNS_CONTROLLER_TAG=1.18.0-alpha.3
# Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=1.18.0-alpha.2
KOPS_CONTROLLER_TAG=1.18.0-alpha.3
# Keep in sync with logic in get_workspace_status
# TODO: just invoke tools/get_workspace_status.sh?
@ -437,9 +437,15 @@ dns-controller-push:
.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:

18
upup/models/bindata.go
View File

@ -1902,7 +1902,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
replicas: 1
selector:
@ -1913,7 +1913,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
@ -1927,7 +1927,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.18.0-alpha.2
image: kope/dns-controller:1.18.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
@ -2036,7 +2036,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
replicas: 1
selector:
@ -2047,7 +2047,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.18.0-alpha.2
version: v1.18.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
@ -2063,7 +2063,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.18.0-alpha.2
image: kope/dns-controller:1.18.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
@ -2441,7 +2441,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
selector:
matchLabels:
@ -2455,7 +2455,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
priorityClassName: system-node-critical
tolerations:
@ -2468,7 +2468,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: kope/kops-controller:1.18.0-alpha.2
image: kope/kops-controller:1.18.0-alpha.3
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs

6
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.18.0-alpha.2
version: v1.18.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.18.0-alpha.2
version: v1.18.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.18.0-alpha.2
image: kope/dns-controller:1.18.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

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.18.0-alpha.2
version: v1.18.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.18.0-alpha.2
version: v1.18.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.18.0-alpha.2
image: kope/dns-controller:1.18.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

6
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
View File

@ -19,7 +19,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
selector:
matchLabels:
@ -33,7 +33,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
priorityClassName: system-node-critical
tolerations:
@ -46,7 +46,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: kope/kops-controller:1.18.0-alpha.2
image: kope/kops-controller:1.18.0-alpha.3
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs

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

@ -121,7 +121,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
{
key := "kops-controller.addons.k8s.io"
version := "1.18.0-alpha.2"
version := "1.18.0-alpha.3"
{
location := key + "/k8s-1.16.yaml"
@ -384,7 +384,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.18.0-alpha.2"
version := "1.18.0-alpha.3"
{
location := key + "/k8s-1.6.yaml"

12
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb
manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd
manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: fb4ca0b799e7abed37996848a889513f586a1539
manifestHash: 05888879a235e345795776c9678acf2f15e92c56
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
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.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
containers:
- command:
@ -32,7 +32,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: kope/dns-controller:1.18.0-alpha.2
image: kope/dns-controller:1.18.0-alpha.3
name: dns-controller
resources:
requests:

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
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.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
containers:
- command:
- /usr/bin/kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config.yaml
image: kope/kops-controller:1.18.0-alpha.2
image: kope/kops-controller:1.18.0-alpha.3
name: kops-controller
resources:
requests:

12
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb
manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd
manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: fb4ca0b799e7abed37996848a889513f586a1539
manifestHash: 05888879a235e345795776c9678acf2f15e92c56
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
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.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
containers:
- command:
@ -32,7 +32,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: kope/dns-controller:1.18.0-alpha.2
image: kope/dns-controller:1.18.0-alpha.3
name: dns-controller
resources:
requests:

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.18.0-alpha.2
version: v1.18.0-alpha.3
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.18.0-alpha.2
version: v1.18.0-alpha.3
spec:
containers:
- command:
- /usr/bin/kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config.yaml
image: kope/kops-controller:1.18.0-alpha.2
image: kope/kops-controller:1.18.0-alpha.3
name: kops-controller
resources:
requests:

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

@ -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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb
manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd
manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: fb4ca0b799e7abed37996848a889513f586a1539
manifestHash: 05888879a235e345795776c9678acf2f15e92c56
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

12
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb
manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd
manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: fb4ca0b799e7abed37996848a889513f586a1539
manifestHash: 05888879a235e345795776c9678acf2f15e92c56
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.18.0-alpha.2
version: 1.18.0-alpha.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

4
version.go
View File

@ -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.18.0-alpha.2"
KOPS_CI_VERSION = "1.18.0-alpha.3"
KOPS_RELEASE_VERSION = "1.18.0-alpha.3"
KOPS_CI_VERSION = "1.18.0-alpha.4"
)
// GitVersion should be replaced by the makefile