Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kops
Commits
d523ba2a
Unverified
Commit
d523ba2a
authored
4 years ago
by
Kubernetes Prow Robot
Committed by
GitHub
4 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #11109 from hakman/release-1.21.0-alpha.2
Release 1.21.0 alpha.2
parents
46b6abf4
fa72535f
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
Makefile
+3
-3
Makefile
channels/alpha
+1
-1
channels/alpha
channels/stable
+7
-7
channels/stable
pkg/model/components/kubeapiserver/model.go
+1
-1
pkg/model/components/kubeapiserver/model.go
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
+1
-1
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml
+2
-2
...egration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml
tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
+6
-6
.../integration/create_cluster/ha_gce/expected-v1alpha2.yaml
tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml
+3
-3
...gration/create_cluster/private_gce/expected-v1alpha2.yaml
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+3
-3
...ddons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
+3
-3
...dons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
+3
-3
...loudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
+4
-4
...ootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
+4
-4
...dup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
+4
-4
.../bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
+4
-4
...bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
+7
-7
...builder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
+10
-10
...uilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+4
-4
...loudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
+1
-1
.../cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/anonymous-issuer-discovery.addons.k8s.io-k8s-1.16.yaml
+1
-1
...ks/anonymous-issuer-discovery.addons.k8s.io-k8s-1.16.yaml
with
72 additions
and
72 deletions
+72
-72
Makefile
+
3
-
3
View file @
d523ba2a
...
...
@@ -64,13 +64,13 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
# 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.21.0-alpha.
1
DNS_CONTROLLER_TAG
=
1.21.0-alpha.
2
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.21.0-alpha.
1
KOPS_CONTROLLER_TAG
=
1.21.0-alpha.
2
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.21.0-alpha.
1
KUBE_APISERVER_HEALTHCHECK_TAG
=
1.21.0-alpha.
2
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG
=
$(
shell
tools/get_workspace_status.sh |
grep
STABLE_KUBE_APISERVER_HEALTHCHECK_TAG |
awk
'{print $$2
}
'
)
...
...
This diff is collapsed.
Click to expand it.
channels/alpha
+
1
-
1
View file @
d523ba2a
...
...
@@ -74,7 +74,7 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
"
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0"
...
...
This diff is collapsed.
Click to expand it.
channels/stable
+
7
-
7
View file @
d523ba2a
...
...
@@ -74,7 +74,7 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
"
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0"
...
...
@@ -84,13 +84,13 @@ spec:
kubenet: {}
kubernetesVersions:
- range: ">=1.20.0"
recommendedVersion: 1.20.
4
recommendedVersion: 1.20.
5
requiredVersion: 1.20.0
- range: ">=1.19.0"
recommendedVersion: 1.19.
8
recommendedVersion: 1.19.
9
requiredVersion: 1.19.0
- range: ">=1.18.0"
recommendedVersion: 1.18.1
6
recommendedVersion: 1.18.1
7
requiredVersion: 1.18.0
- range: ">=1.17.0"
recommendedVersion: 1.17.17
...
...
@@ -120,15 +120,15 @@ spec:
- range: ">=1.20.0-alpha.1"
#recommendedVersion: "1.19.0-beta.3"
#requiredVersion: 1.20.0
kubernetesVersion: 1.20.
4
kubernetesVersion: 1.20.
5
- range: ">=1.19.0-beta.3"
#recommendedVersion: "1.19.0-beta.3"
#requiredVersion: 1.19.0
kubernetesVersion: 1.19.
8
kubernetesVersion: 1.19.
9
- range: ">=1.18.0-alpha.1"
recommendedVersion: "1.18.2"
#requiredVersion: 1.18.0
kubernetesVersion: 1.18.1
6
kubernetesVersion: 1.18.1
7
- range: ">=1.17.0-alpha.1"
recommendedVersion: "1.18.2"
#requiredVersion: 1.17.0
...
...
This diff is collapsed.
Click to expand it.
pkg/model/components/kubeapiserver/model.go
+
1
-
1
View file @
d523ba2a
...
...
@@ -95,7 +95,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.
2
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,
...
...
This diff is collapsed.
Click to expand it.
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
+
1
-
1
View file @
d523ba2a
...
...
@@ -12,7 +12,7 @@ Contents: |
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.
2
livenessProbe:
httpGet:
host: 127.0.0.1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml
+
2
-
2
View file @
d523ba2a
...
...
@@ -62,7 +62,7 @@ metadata:
kops.k8s.io/cluster
:
gce.example.com
name
:
master-us-test1-a
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-1
maxSize
:
1
minSize
:
1
...
...
@@ -85,7 +85,7 @@ metadata:
kops.k8s.io/cluster
:
gce.example.com
name
:
nodes-us-test1-a
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-2
maxSize
:
1
minSize
:
1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
+
6
-
6
View file @
d523ba2a
...
...
@@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster
:
ha-gce.example.com
name
:
master-us-test1-a
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-1
maxSize
:
1
minSize
:
1
...
...
@@ -93,7 +93,7 @@ metadata:
kops.k8s.io/cluster
:
ha-gce.example.com
name
:
master-us-test1-b
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-1
maxSize
:
1
minSize
:
1
...
...
@@ -116,7 +116,7 @@ metadata:
kops.k8s.io/cluster
:
ha-gce.example.com
name
:
master-us-test1-c
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-1
maxSize
:
1
minSize
:
1
...
...
@@ -139,7 +139,7 @@ metadata:
kops.k8s.io/cluster
:
ha-gce.example.com
name
:
nodes-us-test1-a
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-2
maxSize
:
1
minSize
:
1
...
...
@@ -162,7 +162,7 @@ metadata:
kops.k8s.io/cluster
:
ha-gce.example.com
name
:
nodes-us-test1-b
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-2
maxSize
:
1
minSize
:
1
...
...
@@ -185,7 +185,7 @@ metadata:
kops.k8s.io/cluster
:
ha-gce.example.com
name
:
nodes-us-test1-c
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-2
maxSize
:
1
minSize
:
1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml
+
3
-
3
View file @
d523ba2a
...
...
@@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster
:
private.example.com
name
:
bastions
spec
:
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
f1-micro
maxSize
:
1
minSize
:
1
...
...
@@ -98,7 +98,7 @@ spec:
additionalSecurityGroups
:
-
sg-exampleid3
-
sg-exampleid4
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-1
maxSize
:
1
minSize
:
1
...
...
@@ -124,7 +124,7 @@ spec:
additionalSecurityGroups
:
-
sg-exampleid
-
sg-exampleid2
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
119a
image
:
ubuntu-os-cloud/ubuntu-2004-focal-v20210
315
machineType
:
n1-standard-2
maxSize
:
1
minSize
:
1
...
...
This diff is collapsed.
Click to expand it.
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+
3
-
3
View file @
d523ba2a
...
...
@@ -6,7 +6,7 @@ metadata:
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:
replicas: 1
strategy:
...
...
@@ -19,7 +19,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
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.21.0-alpha.
1
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.
2
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
...
...
This diff is collapsed.
Click to expand it.
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
+
3
-
3
View file @
d523ba2a
...
...
@@ -19,7 +19,7 @@ metadata:
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:
selector:
matchLabels:
...
...
@@ -33,7 +33,7 @@ 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
{{ 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.21.0-alpha.
1
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.
2
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
+
3
-
3
View file @
d523ba2a
...
...
@@ -209,7 +209,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
{
key
:=
"kops-controller.addons.k8s.io"
version
:=
"1.21.0-alpha.
1
"
version
:=
"1.21.0-alpha.
2
"
{
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.21.0-alpha.
1
"
version
:=
"1.21.0-alpha.
2
"
{
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.21.0-alpha.
1
"
version
:=
"1.21.0-alpha.
2
"
{
location
:=
key
+
"/k8s-1.12.yaml"
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/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
:
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
-
manifest
:
core.addons.k8s.io/v1.4.0.yaml
manifestHash
:
75dd91a5b15ade4a61ebc1de8c35714376dfbed4
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
:
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
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/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
:
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
-
manifest
:
core.addons.k8s.io/v1.4.0.yaml
manifestHash
:
75dd91a5b15ade4a61ebc1de8c35714376dfbed4
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
:
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
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/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
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/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
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/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
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/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
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/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
:
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
-
manifest
:
core.addons.k8s.io/v1.4.0.yaml
manifestHash
:
75dd91a5b15ade4a61ebc1de8c35714376dfbed4
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
:
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
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
+
1
-
1
View file @
d523ba2a
...
...
@@ -19,7 +19,7 @@ spec:
name
:
anonymous-access.addons.k8s.io
selector
:
k8s-addon
:
anonymous-access.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
:
3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name
:
core.addons.k8s.io
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/anonymous-issuer-discovery.addons.k8s.io-k8s-1.16.yaml
+
1
-
1
View file @
d523ba2a
...
...
@@ -4,7 +4,7 @@ metadata:
creationTimestamp
:
null
labels
:
addon.kops.k8s.io/name
:
anonymous-issuer-discovery.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
:
anonymous-issuer-discovery.addons.k8s.io
name
:
anonymous:service-account-issuer-discovery
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment