mirror of https://github.com/kubernetes/kops.git
Release 1.20.0-alpha.1
This commit is contained in:
parent
b5dc22b800
commit
bb787d3075
6
Makefile
6
Makefile
|
@ -66,13 +66,13 @@ PROTOKUBE_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_PROTOKUBE_TAG
|
|||
# We lock the versions of our controllers also
|
||||
# We need to keep in sync with:
|
||||
# upup/models/cloudup/resources/addons/dns-controller/
|
||||
DNS_CONTROLLER_TAG=1.19.0-beta.2
|
||||
DNS_CONTROLLER_TAG=1.20.0-alpha.1
|
||||
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
|
||||
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
|
||||
KOPS_CONTROLLER_TAG=1.19.0-beta.2
|
||||
KOPS_CONTROLLER_TAG=1.20.0-alpha.1
|
||||
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
|
||||
# pkg/model/components/kubeapiserver/model.go
|
||||
KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-beta.2
|
||||
KUBE_APISERVER_HEALTHCHECK_TAG=1.20.0-alpha.1
|
||||
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
|
||||
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ echo "KOPS_CI_VERSION ${KOPS_CI_VERSION} -> ${NEW_CI_VERSION}"
|
|||
sed -i -e "s@DNS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@DNS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile
|
||||
sed -i -e "s@KOPS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@KOPS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile
|
||||
sed -i -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_APISERVER_HEALTHCHECK_TAG=${NEW_RELEASE_VERSION}@g" Makefile
|
||||
sed -i -e "s@\"${KOPS_RELEASE_VERSION}\"@\"${NEW_RELEASE_VERSION}\"@g" upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
|
||||
sed -i -e "s@\"${KOPS_RELEASE_VERSION}\"@\"${NEW_RELEASE_VERSION}\"@g" upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
|
||||
sed -i -e "s@${KOPS_RELEASE_VERSION}@${NEW_RELEASE_VERSION}@g" upup/pkg/fi/cloudup/urls_test.go
|
||||
|
||||
git grep -l k8s.gcr.io/kops/dns-controller | xargs -I {} sed -i -e "s@dns-controller:${KOPS_RELEASE_VERSION}@dns-controller:${NEW_RELEASE_VERSION}@g" {}
|
||||
|
|
|
@ -95,7 +95,7 @@ kind: Pod
|
|||
spec:
|
||||
containers:
|
||||
- name: healthcheck
|
||||
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-alpha.1
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
# The sidecar serves a healthcheck on the same port,
|
||||
|
|
|
@ -12,7 +12,7 @@ Contents: |
|
|||
- --client-key=/secrets/client.key
|
||||
command:
|
||||
- /kube-apiserver-healthcheck
|
||||
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-alpha.1
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
host: 127.0.0.1
|
||||
|
|
|
@ -28648,7 +28648,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
replicas: 1
|
||||
strategy:
|
||||
|
@ -28661,7 +28661,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
|
@ -28675,7 +28675,7 @@ spec:
|
|||
serviceAccount: dns-controller
|
||||
containers:
|
||||
- name: dns-controller
|
||||
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.1
|
||||
command:
|
||||
{{ range $arg := DnsControllerArgv }}
|
||||
- "{{ $arg }}"
|
||||
|
@ -28947,7 +28947,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
|
@ -28961,7 +28961,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
{{ if UseKopsControllerForNodeBootstrap }}
|
||||
annotations:
|
||||
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
|
||||
|
@ -28979,7 +28979,7 @@ spec:
|
|||
serviceAccount: kops-controller
|
||||
containers:
|
||||
- name: kops-controller
|
||||
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.1
|
||||
volumeMounts:
|
||||
{{ if .UseHostCertificates }}
|
||||
- mountPath: /etc/ssl/certs
|
||||
|
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
replicas: 1
|
||||
strategy:
|
||||
|
@ -19,7 +19,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
|
@ -33,7 +33,7 @@ spec:
|
|||
serviceAccount: dns-controller
|
||||
containers:
|
||||
- name: dns-controller
|
||||
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.1
|
||||
command:
|
||||
{{ range $arg := DnsControllerArgv }}
|
||||
- "{{ $arg }}"
|
||||
|
|
|
@ -19,7 +19,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
|
@ -33,7 +33,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
{{ if UseKopsControllerForNodeBootstrap }}
|
||||
annotations:
|
||||
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
|
||||
|
@ -51,7 +51,7 @@ spec:
|
|||
serviceAccount: kops-controller
|
||||
containers:
|
||||
- name: kops-controller
|
||||
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.1
|
||||
volumeMounts:
|
||||
{{ if .UseHostCertificates }}
|
||||
- mountPath: /etc/ssl/certs
|
||||
|
|
|
@ -209,7 +209,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
|
|||
|
||||
{
|
||||
key := "kops-controller.addons.k8s.io"
|
||||
version := "1.19.0-beta.2"
|
||||
version := "1.20.0-alpha.1"
|
||||
|
||||
{
|
||||
location := key + "/k8s-1.16.yaml"
|
||||
|
@ -228,7 +228,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
|
|||
|
||||
if featureflag.PublicJWKS.Enabled() {
|
||||
key := "anonymous-issuer-discovery.addons.k8s.io"
|
||||
version := "1.19.0-beta.2"
|
||||
version := "1.20.0-alpha.1"
|
||||
|
||||
{
|
||||
location := key + "/k8s-1.16.yaml"
|
||||
|
@ -402,7 +402,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
|
|||
if externalDNS == nil || !externalDNS.Disable {
|
||||
{
|
||||
key := "dns-controller.addons.k8s.io"
|
||||
version := "1.19.0-beta.2"
|
||||
version := "1.20.0-alpha.1"
|
||||
|
||||
{
|
||||
location := key + "/k8s-1.12.yaml"
|
||||
|
|
|
@ -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: 5b7765907ec5720081c13c0cab2d32b99053e7c8
|
||||
manifestHash: 050b4921aa772fb5f80917a62c46aabbd2bc54f8
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -47,11 +47,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
|
||||
manifestHash: d6197b249a0266e57f5b8b371119f52603ecf42c
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -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: 5b7765907ec5720081c13c0cab2d32b99053e7c8
|
||||
manifestHash: 050b4921aa772fb5f80917a62c46aabbd2bc54f8
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -47,11 +47,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
|
||||
manifestHash: d6197b249a0266e57f5b8b371119f52603ecf42c
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -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: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427
|
||||
manifestHash: d8431e6a464234fec19443279e2cd7f6cba72317
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -40,11 +40,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
|
||||
manifestHash: d6197b249a0266e57f5b8b371119f52603ecf42c
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -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: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427
|
||||
manifestHash: d8431e6a464234fec19443279e2cd7f6cba72317
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -40,11 +40,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
|
||||
manifestHash: d6197b249a0266e57f5b8b371119f52603ecf42c
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
name: dns-controller
|
||||
namespace: kube-system
|
||||
spec:
|
||||
|
@ -21,7 +21,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
|
@ -34,7 +34,7 @@ spec:
|
|||
env:
|
||||
- name: KUBERNETES_SERVICE_HOST
|
||||
value: 127.0.0.1
|
||||
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.1
|
||||
name: dns-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
@ -17,7 +17,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
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.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
- /kops-controller
|
||||
- --v=2
|
||||
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
|
||||
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.1
|
||||
name: kops-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
@ -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: 5b7765907ec5720081c13c0cab2d32b99053e7c8
|
||||
manifestHash: 050b4921aa772fb5f80917a62c46aabbd2bc54f8
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -47,11 +47,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
|
||||
manifestHash: d6197b249a0266e57f5b8b371119f52603ecf42c
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -19,7 +19,7 @@ spec:
|
|||
name: anonymous-access.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: anonymous-access.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
name: dns-controller
|
||||
namespace: kube-system
|
||||
spec:
|
||||
|
@ -21,7 +21,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
|
@ -38,7 +38,7 @@ spec:
|
|||
value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
|
||||
- name: AWS_WEB_IDENTITY_TOKEN_FILE
|
||||
value: /var/run/secrets/amazonaws.com/token
|
||||
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.1
|
||||
name: dns-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
@ -17,7 +17,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
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.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
- /kops-controller
|
||||
- --v=2
|
||||
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
|
||||
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.1
|
||||
name: kops-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
@ -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: 5b7765907ec5720081c13c0cab2d32b99053e7c8
|
||||
manifestHash: 050b4921aa772fb5f80917a62c46aabbd2bc54f8
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: k8s-1.16
|
||||
kubernetesVersion: '>=1.16.0-alpha.0'
|
||||
manifest: anonymous-issuer-discovery.addons.k8s.io/k8s-1.16.yaml
|
||||
|
@ -19,7 +19,7 @@ spec:
|
|||
name: anonymous-issuer-discovery.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: anonymous-issuer-discovery.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -55,11 +55,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 3d1dd61bf3c70c46e30db8014bd3a0ff6efe6301
|
||||
manifestHash: 852eb7bc3280e4213534f803d5bc697a32c09247
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
name: dns-controller
|
||||
namespace: kube-system
|
||||
spec:
|
||||
|
@ -21,7 +21,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
|
@ -34,7 +34,7 @@ spec:
|
|||
env:
|
||||
- name: KUBERNETES_SERVICE_HOST
|
||||
value: 127.0.0.1
|
||||
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.1
|
||||
name: dns-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
@ -17,7 +17,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
name: kops-controller
|
||||
namespace: kube-system
|
||||
spec:
|
||||
|
@ -31,14 +31,14 @@ spec:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.19.0-beta.2
|
||||
version: v1.20.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
- /kops-controller
|
||||
- --v=2
|
||||
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
|
||||
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2
|
||||
image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.1
|
||||
name: kops-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
@ -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: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427
|
||||
manifestHash: d8431e6a464234fec19443279e2cd7f6cba72317
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -40,11 +40,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
|
||||
manifestHash: d6197b249a0266e57f5b8b371119f52603ecf42c
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -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: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427
|
||||
manifestHash: d8431e6a464234fec19443279e2cd7f6cba72317
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
@ -40,11 +40,11 @@ spec:
|
|||
version: 1.5.0
|
||||
- id: k8s-1.12
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
|
||||
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
|
||||
manifestHash: d6197b249a0266e57f5b8b371119f52603ecf42c
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.19.0-beta.2
|
||||
version: 1.20.0-alpha.1
|
||||
- id: v1.15.0
|
||||
kubernetesVersion: '>=1.15.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
|
||||
|
|
|
@ -36,33 +36,33 @@ func Test_BuildMirroredAsset(t *testing.T) {
|
|||
{
|
||||
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-amd64",
|
||||
expected: []string{
|
||||
"https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/images/protokube-linux-amd64",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/images-protokube-linux-amd64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/images/protokube-linux-amd64",
|
||||
"https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.1/images/protokube-linux-amd64",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.1/images-protokube-linux-amd64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.1/images/protokube-linux-amd64",
|
||||
},
|
||||
},
|
||||
{
|
||||
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-arm64",
|
||||
expected: []string{
|
||||
"https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/images/protokube-linux-arm64",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/images-protokube-linux-arm64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/images/protokube-linux-arm64",
|
||||
"https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.1/images/protokube-linux-arm64",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.1/images-protokube-linux-arm64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.1/images/protokube-linux-arm64",
|
||||
},
|
||||
},
|
||||
{
|
||||
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/amd64/nodeup",
|
||||
expected: []string{
|
||||
"https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/linux/amd64/nodeup",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/nodeup-linux-amd64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/linux/amd64/nodeup",
|
||||
"https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.1/linux/amd64/nodeup",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.1/nodeup-linux-amd64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.1/linux/amd64/nodeup",
|
||||
},
|
||||
},
|
||||
{
|
||||
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup",
|
||||
expected: []string{
|
||||
"https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/linux/arm64/nodeup",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/nodeup-linux-arm64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/linux/arm64/nodeup",
|
||||
"https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.1/linux/arm64/nodeup",
|
||||
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.1/nodeup-linux-arm64",
|
||||
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.1/linux/arm64/nodeup",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -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.19.0-beta.2"
|
||||
KOPS_CI_VERSION = "1.20.0-alpha.1"
|
||||
KOPS_RELEASE_VERSION = "1.20.0-alpha.1"
|
||||
KOPS_CI_VERSION = "1.20.0-alpha.2"
|
||||
)
|
||||
|
||||
// GitVersion should be replaced by the makefile
|
||||
|
|
Loading…
Reference in New Issue