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

Release 1.21.0-alpha.1

This commit is contained in:
Ciprian Hacman 2021-02-16 10:44:34 +02:00
parent d39e42b278
commit 35ea2f49b3
24 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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.20.0-alpha.2
DNS_CONTROLLER_TAG=1.21.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.20.0-alpha.2
KOPS_CONTROLLER_TAG=1.21.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.20.0-alpha.2
KUBE_APISERVER_HEALTHCHECK_TAG=1.21.0-alpha.1
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')

2
pkg/model/components/kubeapiserver/model.go
View File

@ -95,7 +95,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-alpha.2
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.1
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,

2
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
View File

@ -12,7 +12,7 @@ Contents: |
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-alpha.2
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.1
livenessProbe:
httpGet:
host: 127.0.0.1

12
upup/models/bindata.go
View File

@ -29237,7 +29237,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
spec:
replicas: 1
strategy:
@ -29250,7 +29250,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
@ -29264,7 +29264,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
@ -29536,7 +29536,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
spec:
selector:
matchLabels:
@ -29550,7 +29550,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
{{ if UseKopsControllerForNodeBootstrap }}
annotations:
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
@ -29568,7 +29568,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.2
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs

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

@ -209,7 +209,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
{
key := "kops-controller.addons.k8s.io"
version := "1.20.0-alpha.2"
version := "1.21.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.20.0-alpha.2"
version := "1.21.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.20.0-alpha.2"
version := "1.21.0-alpha.1"
{
location := key + "/k8s-1.12.yaml"

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/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: da1b535bde00a6d8c8867d7eb5466f49bb549523
manifestHash: 9ef65a8b68b39b5222609e3bd0f16e1beab7c561
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

8
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: da1b535bde00a6d8c8867d7eb5466f49bb549523
manifestHash: 9ef65a8b68b39b5222609e3bd0f16e1beab7c561
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd
manifestHash: 61e66ba2a661ddeb8cb7954b61e5ca1f3f6b4ce2
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd
manifestHash: 61e66ba2a661ddeb8cb7954b61e5ca1f3f6b4ce2
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- 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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
name: kops-controller
resources:
requests:

8
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: da1b535bde00a6d8c8867d7eb5466f49bb549523
manifestHash: 9ef65a8b68b39b5222609e3bd0f16e1beab7c561
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
View File

@ -19,7 +19,7 @@ spec:
name: anonymous-access.addons.k8s.io
selector:
k8s-addon: anonymous-access.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
name: dns-controller
resources:
requests:

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
name: kops-controller
resources:
requests:

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/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: da1b535bde00a6d8c8867d7eb5466f49bb549523
manifestHash: 9ef65a8b68b39b5222609e3bd0f16e1beab7c561
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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.20.0-alpha.2
version: 1.21.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: 38adb18d34859a112ab1122ea089fea558ec7893
manifestHash: e1943d4ce081dd8fd7f0f4ee43281ac346179833
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- 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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
version: v1.21.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.20.0-alpha.2
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
name: kops-controller
resources:
requests:

8
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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd
manifestHash: 61e66ba2a661ddeb8cb7954b61e5ca1f3f6b4ce2
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

8
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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd
manifestHash: 61e66ba2a661ddeb8cb7954b61e5ca1f3f6b4ce2
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

24
upup/pkg/fi/cloudup/urls_test.go
View File

@ -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.20.0-alpha.2/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/images-protokube-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/images/protokube-linux-amd64",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/images-protokube-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.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.20.0-alpha.2/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/images-protokube-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/images/protokube-linux-arm64",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/images-protokube-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.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.20.0-alpha.2/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/nodeup-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/linux/amd64/nodeup",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/nodeup-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.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.20.0-alpha.2/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/nodeup-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/linux/arm64/nodeup",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/nodeup-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.1/linux/arm64/nodeup",
},
},
}

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.20.0-alpha.2"
KOPS_CI_VERSION = "1.20.0-alpha.3"
KOPS_RELEASE_VERSION = "1.21.0-alpha.1"
KOPS_CI_VERSION = "1.21.0-alpha.2"
)
// GitVersion should be replaced by the makefile