Skip to content
GitLab
Unverified Commit d523ba2a authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files

Merge pull request #11109 from hakman/release-1.21.0-alpha.2 

Release 1.21.0 alpha.2
parents 46b6abf4 fa72535f
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 62 deletions
+62 -62
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 7
- 7
View file @ d523ba2a
......@@ -4,11 +4,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
name: dns-controller
namespace: kube-system
spec:
......@@ -25,7 +25,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
spec:
containers:
- command:
......@@ -42,7 +42,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.21.0-alpha.1
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.2
name: dns-controller
resources:
requests:
......@@ -82,7 +82,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: dns-controller
......@@ -96,7 +96,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller
......@@ -130,7 +130,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml
+ 10
- 10
View file @ d523ba2a
......@@ -7,7 +7,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -21,11 +21,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
name: kops-controller
namespace: kube-system
spec:
......@@ -37,14 +37,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.2
name: kops-controller
resources:
requests:
......@@ -88,7 +88,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -102,7 +102,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -125,7 +125,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -146,7 +146,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -193,7 +193,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml
+ 6
- 6
View file @ d523ba2a
......@@ -7,19 +7,19 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 691f125245b950499fe410acd047ef7c5a574b92
manifestHash: 83600ec2669579a1637700aac102f2dfbef4f01c
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: anonymous-issuer-discovery.addons.k8s.io/k8s-1.16.yaml
manifestHash: 582cce6311b3b077b55fc6c97fa42524f12198c6
manifestHash: a6abe688c7fd4938c6aca807e60e7b0c4779d707
name: anonymous-issuer-discovery.addons.k8s.io
selector:
k8s-addon: anonymous-issuer-discovery.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
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: a88fe8ce7621db07076088a7a22cba2a482f22cd
manifestHash: 12377bc07a206be6225c4d9f1fa25e3b35e8214f
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.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
+ 7
- 7
View file @ d523ba2a
......@@ -4,11 +4,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
name: dns-controller
namespace: kube-system
spec:
......@@ -25,7 +25,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
spec:
containers:
- command:
......@@ -38,7 +38,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.2
name: dns-controller
resources:
requests:
......@@ -63,7 +63,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: dns-controller
......@@ -77,7 +77,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller
......@@ -111,7 +111,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
+ 10
- 10
View file @ d523ba2a
......@@ -7,7 +7,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -21,11 +21,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
name: kops-controller
namespace: kube-system
spec:
......@@ -39,14 +39,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.2
name: kops-controller
resources:
requests:
......@@ -90,7 +90,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -104,7 +104,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -127,7 +127,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -148,7 +148,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......@@ -195,7 +195,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.0-alpha.1
addon.kops.k8s.io/version: 1.21.0-alpha.2
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+ 4
- 4
View file @ d523ba2a
......@@ -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: e261c04391831cb337f0c42df430cf93b5ccab91
manifestHash: 89d7ad9af69cb88377b3e6a4bfc49a25d51079d4
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
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: e61e0c2c4d0d83cb95ee10d836ae8b77e334743b
manifestHash: 46c857881d8cdc761b9ce3d8d35c5204017b9fd4
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.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
+ 4
- 4
View file @ d523ba2a
......@@ -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: e261c04391831cb337f0c42df430cf93b5ccab91
manifestHash: 89d7ad9af69cb88377b3e6a4bfc49a25d51079d4
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
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: e61e0c2c4d0d83cb95ee10d836ae8b77e334743b
manifestHash: 46c857881d8cdc761b9ce3d8d35c5204017b9fd4
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......
upup/pkg/fi/cloudup/urls_test.go
+ 12
- 12
View file @ d523ba2a
......@@ -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.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",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.2/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.2/images-protokube-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.2/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.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",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.2/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.2/images-protokube-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.2/images/protokube-linux-arm64",
},
},
{
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/amd64/nodeup",
expected: []string{
"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",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.2/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.2/nodeup-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.2/linux/amd64/nodeup",
},
},
{
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup",
expected: []string{
"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",
"https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.2/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.2/nodeup-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.2/linux/arm64/nodeup",
},
},
}
......
version.go
+ 2
- 2
View file @ d523ba2a
......@@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
// These constants are parsed by build tooling - be careful about changing the formats
const (
KOPS_RELEASE_VERSION = "1.21.0-alpha.1"
KOPS_CI_VERSION = "1.21.0-alpha.2"
KOPS_RELEASE_VERSION = "1.21.0-alpha.2"
KOPS_CI_VERSION = "1.21.0-alpha.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流程，让项目更安全