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

Remove checks for k8s < 1.21

This commit is contained in:
Ole Markus With 2022-09-18 07:01:52 +02:00
parent e86cd44a48
commit 74afb7aed0
84 changed files with 211 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nodeup/pkg/model/miscutils.go
View File

@ -43,21 +43,7 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error {
}
var packages []string
if b.Distribution.IsDebianFamily() {
if b.IsKubernetesLT("1.20") {
packages = append(packages, "curl")
packages = append(packages, "wget")
packages = append(packages, "perl")
packages = append(packages, "apt-transport-https")
// TODO: Do we really need python-apt?
if (b.Distribution.IsUbuntu() && b.Distribution.Version() >= 20.10) || (!b.Distribution.IsUbuntu() && b.Distribution.Version() >= 11) {
// python-apt not available (though python3-apt is)
} else {
packages = append(packages, "python-apt")
}
}
} else if b.Distribution.IsRHELFamily() {
if b.Distribution.IsRHELFamily() {
// TODO: These packages have been auto-installed for a long time, and likely we don't need all of them any longer
packages = append(packages, "curl")
packages = append(packages, "wget")
@ -68,11 +54,6 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error {
return nil
}
if b.Distribution.IsUbuntu() && b.IsKubernetesLT("1.20") {
packages = append(packages, "netcat-traditional")
packages = append(packages, "git")
}
for _, p := range packages {
c.AddTask(&nodetasks.Package{Name: p})
}

2
nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.3
kubernetesVersion: v1.22.3
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml
View File

@ -23,7 +23,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.logflags.example.com
masterPublicName: api.logflags.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
legacy: false
kubernetesVersion: v1.20.6
kubernetesVersion: v1.22.6
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/golden/awsiam/cluster.yaml
View File

@ -32,7 +32,7 @@ spec:
iam: {}
kubelet:
anonymousAuth: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml
View File

@ -76,7 +76,7 @@ contents: |
- --log-file=/var/log/kube-apiserver.log
command:
- /usr/local/bin/kube-apiserver
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
livenessProbe:
httpGet:
host: 127.0.0.1

2
nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml
View File

@ -30,7 +30,7 @@ spec:
iam: {}
kubelet:
anonymousAuth: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml
View File

@ -54,7 +54,7 @@ contents: |
- --log-file=/var/log/kube-apiserver.log
command:
- /usr/local/bin/kube-apiserver
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
livenessProbe:
httpGet:
host: 127.0.0.1

2
nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml
View File

@ -21,7 +21,7 @@ spec:
iam: {}
kubelet:
anonymousAuth: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml
View File

@ -53,7 +53,7 @@ contents: |
- --log-file=/var/log/kube-apiserver.log
command:
- /usr/local/bin/kube-apiserver
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
livenessProbe:
httpGet:
host: 127.0.0.1

2
nodeup/pkg/model/tests/protokube/cluster.yaml
View File

@ -26,7 +26,7 @@ spec:
iam: {}
kubelet:
hostnameOverride: master.hostname.invalid
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml
View File

@ -26,7 +26,7 @@ spec:
iam: {}
kubelet:
hostnameOverride: master.hostname.invalid
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml vendored
View File

@ -26,7 +26,7 @@ spec:
iam: {}
kubelet:
hostnameOverride: master.hostname.invalid
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

3
pkg/apis/kops/validation/legacy.go
View File

@ -59,7 +59,6 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
optionTaken := false
if c.Spec.CloudProvider.AWS != nil {
optionTaken = true
}
if c.Spec.CloudProvider.Azure != nil {
if optionTaken {
@ -289,7 +288,7 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
// @ check that NodeLocalDNS addon is configured correctly
if c.Spec.KubeDNS.NodeLocalDNS != nil && fi.BoolValue(c.Spec.KubeDNS.NodeLocalDNS.Enabled) {
if c.Spec.KubeDNS.Provider != "CoreDNS" && (c.Spec.KubeDNS.Provider != "" || c.IsKubernetesLT("1.20")) {
if c.Spec.KubeDNS.Provider != "CoreDNS" && c.Spec.KubeDNS.Provider != "" {
allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("kubeDNS", "provider"), "KubeDNS provider must be set to CoreDNS if NodeLocalDNS addon is enabled"))
}

7
pkg/apis/kops/validation/validation.go
View File

@ -298,9 +298,6 @@ func validateClusterSpec(spec *kops.ClusterSpec, c *kops.Cluster, fieldPath *fie
if !featureflag.Karpenter.Enabled() {
allErrs = append(allErrs, field.Forbidden(fieldPath.Child("karpenter", "enabled"), "karpenter requires the Karpenter feature flag"))
}
if c.IsKubernetesLT("1.21") {
allErrs = append(allErrs, field.Forbidden(fieldPath.Child("karpenter", "enabled"), "karpenter requires Kubernetes 1.21 or greater"))
}
}
if spec.PodIdentityWebhook != nil && spec.PodIdentityWebhook.Enabled {
@ -737,9 +734,7 @@ func validateKubelet(k *kops.KubeletConfigSpec, c *kops.Cluster, kubeletPath *fi
}
if k.EnableCadvisorJsonEndpoints != nil {
if c.IsKubernetesGTE("1.21") {
allErrs = append(allErrs, field.Forbidden(kubeletPath.Child("enableCadvisorJsonEndpoints"), "enableCadvisorJsonEndpoints requires Kubernetes 1.18-1.20"))
}
allErrs = append(allErrs, field.Forbidden(kubeletPath.Child("enableCadvisorJsonEndpoints"), "enableCadvisorJsonEndpoints requires Kubernetes 1.18-1.20"))
}
if k.LogFormat != "" {

16
pkg/model/components/apiserver.go
View File

@ -181,14 +181,8 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
if clusterSpec.CloudConfig != nil && clusterSpec.CloudConfig.AWSEBSCSIDriver != nil && fi.BoolValue(clusterSpec.CloudConfig.AWSEBSCSIDriver.Enabled) {
if b.IsKubernetesLT("1.21.0") {
if _, found := c.FeatureGates["CSIMigrationAWSComplete"]; !found {
c.FeatureGates["CSIMigrationAWSComplete"] = "true"
}
} else {
if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found {
c.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found {
c.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
if _, found := c.FeatureGates["CSIMigrationAWS"]; !found {
@ -196,12 +190,6 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
}
}
if b.IsKubernetesLT("1.20") && clusterSpec.ServiceAccountIssuerDiscovery != nil && fi.BoolValue(&clusterSpec.ServiceAccountIssuerDiscovery.EnableAWSOIDCProvider) {
if _, found := c.FeatureGates["ServiceAccountIssuerDiscovery"]; !found {
c.FeatureGates["ServiceAccountIssuerDiscovery"] = "true"
}
}
return nil
}

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

@ -37,7 +37,7 @@ func (b *DefaultsOptionsBuilder) BuildOptions(o interface{}) error {
}
if options.ContainerRuntime == "" {
if b.Context.IsKubernetesLT("1.20") || options.Docker != nil {
if options.Docker != nil {
options.ContainerRuntime = "docker"
} else {
options.ContainerRuntime = "containerd"

6
pkg/model/components/docker.go
View File

@ -47,11 +47,7 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error {
// Set the Docker version for known Kubernetes versions
if fi.StringValue(clusterSpec.Docker.Version) == "" {
if b.IsKubernetesGTE("1.21") {
docker.Version = fi.String("20.10.17")
} else {
docker.Version = fi.String("19.03.15")
}
docker.Version = fi.String("20.10.17")
}
if len(clusterSpec.Docker.LogOpt) == 0 && clusterSpec.Docker.LogDriver == nil {

2
pkg/model/components/etcdmanager/tests/interval/cluster.yaml
View File

@ -33,7 +33,7 @@ spec:
provider: Manager
backups:
backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
pkg/model/components/etcdmanager/tests/minimal/cluster.yaml
View File

@ -28,7 +28,7 @@ spec:
provider: Manager
backups:
backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml
View File

@ -38,7 +38,7 @@ spec:
provider: Manager
backups:
backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
pkg/model/components/etcdmanager/tests/proxy/cluster.yaml
View File

@ -32,7 +32,7 @@ spec:
provider: Manager
backups:
backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

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

@ -9,7 +9,7 @@ spec:
channel: stable
cloudProvider: aws
configBase: memfs://clusters.example.com/minimal.example.com
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

10
pkg/model/components/kubecontrollermanager.go
View File

@ -186,14 +186,8 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
kcm.FeatureGates = make(map[string]string)
}
if b.IsKubernetesLT("1.21.0") {
if _, found := kcm.FeatureGates["CSIMigrationAWSComplete"]; !found {
kcm.FeatureGates["CSIMigrationAWSComplete"] = "true"
}
} else {
if _, found := kcm.FeatureGates["InTreePluginAWSUnregister"]; !found {
kcm.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
if _, found := kcm.FeatureGates["InTreePluginAWSUnregister"]; !found {
kcm.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
if _, found := kcm.FeatureGates["CSIMigrationAWS"]; !found {

12
pkg/model/components/kubelet.go
View File

@ -193,14 +193,8 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"] = "true"
}
if b.IsKubernetesLT("1.21.0") {
if _, found := clusterSpec.Kubelet.FeatureGates["CSIMigrationAWSComplete"]; !found {
clusterSpec.Kubelet.FeatureGates["CSIMigrationAWSComplete"] = "true"
}
} else {
if _, found := clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"]; !found {
clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
if _, found := clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"]; !found {
clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
}
@ -215,7 +209,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
// We do not enable graceful shutdown when using amazonaws due to leaking ENIs.
// Graceful shutdown is also not available by default on k8s < 1.21
if b.IsKubernetesGTE("1.21") && clusterSpec.Kubelet.ShutdownGracePeriod == nil && clusterSpec.Networking.AmazonVPC == nil {
if clusterSpec.Kubelet.ShutdownGracePeriod == nil && clusterSpec.Networking.AmazonVPC == nil {
clusterSpec.Kubelet.ShutdownGracePeriod = &metav1.Duration{Duration: time.Duration(30 * time.Second)}
clusterSpec.Kubelet.ShutdownGracePeriodCriticalPods = &metav1.Duration{Duration: time.Duration(10 * time.Second)}
} else if clusterSpec.Networking.AmazonVPC != nil {

10
pkg/model/components/kubescheduler.go
View File

@ -63,14 +63,8 @@ func (b *KubeSchedulerOptionsBuilder) BuildOptions(o interface{}) error {
config.FeatureGates = make(map[string]string)
}
if b.IsKubernetesLT("1.21.0") {
if _, found := config.FeatureGates["CSIMigrationAWSComplete"]; !found {
config.FeatureGates["CSIMigrationAWSComplete"] = "true"
}
} else {
if _, found := config.FeatureGates["InTreePluginAWSUnregister"]; !found {
config.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
if _, found := config.FeatureGates["InTreePluginAWSUnregister"]; !found {
config.FeatureGates["InTreePluginAWSUnregister"] = "true"
}
if _, found := config.FeatureGates["CSIMigrationAWS"]; !found {

2
tests/integration/conversion/aws/v1alpha2.yaml
View File

@ -41,7 +41,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/aws/v1alpha3.yaml
View File

@ -40,7 +40,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/azure/v1alpha2.yaml
View File

@ -38,7 +38,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/azure/v1alpha3.yaml
View File

@ -36,7 +36,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/canal/v1alpha2.yaml
View File

@ -32,7 +32,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/canal/v1alpha3.yaml
View File

@ -32,7 +32,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/cilium/v1alpha2.yaml
View File

@ -32,7 +32,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/cilium/v1alpha3.yaml
View File

@ -32,7 +32,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/do/v1alpha2.yaml
View File

@ -31,7 +31,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/do/v1alpha3.yaml
View File

@ -30,7 +30,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/gce/v1alpha2.yaml
View File

@ -31,7 +31,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/gce/v1alpha3.yaml
View File

@ -30,7 +30,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/minimal/legacy-v1alpha2.yaml
View File

@ -32,7 +32,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/minimal/v1alpha2.yaml
View File

@ -32,7 +32,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/minimal/v1alpha3.yaml
View File

@ -32,7 +32,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/openstack/v1alpha2.yaml
View File

@ -47,7 +47,7 @@ spec:
legacy: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

2
tests/integration/conversion/openstack/v1alpha3.yaml
View File

@ -45,7 +45,7 @@ spec:
iam: {}
kubernetesAPIAccess:
- 0.0.0.0/0
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

14
tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
View File

@ -162,7 +162,7 @@ kubeAPIServer:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -188,7 +188,7 @@ kubeControllerManager:
clusterCIDR: 100.96.0.0/11
clusterName: 123.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.20.0
image: registry.k8s.io/kube-controller-manager:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -196,10 +196,10 @@ kubeControllerManager:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.20.0
image: registry.k8s.io/kube-scheduler:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -217,6 +217,8 @@ kubelet:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterKubelet:
anonymousAuth: false
cgroupDriver: systemd
@ -232,6 +234,8 @@ masterKubelet:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -240,7 +244,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/123.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: aSESxiNkzlEteRXSMSUwAliHhnaD+t1LL/hwlA+tiO8=
NodeupConfigHash: irccjKkFGJLvUyf0gpEE516RAgTCdIIdKm5+djS8Zwk=
__EOF_KUBE_ENV

6
tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
View File

@ -136,7 +136,7 @@ docker:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubelet:
anonymousAuth: false
@ -152,6 +152,8 @@ kubelet:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -160,7 +162,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/123.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: PIKG704Lt9sBVVcL/8u7Lx9XR2dlyOvbkb6mhuQ4lNw=
NodeupConfigHash: ZM3qqfbnaMyrGlV3MCLq3YHy/Zd1EvS3mLaYZ+F3N8s=
__EOF_KUBE_ENV

14
tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content
View File

@ -89,7 +89,7 @@ spec:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -115,7 +115,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: 123.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.20.0
image: registry.k8s.io/kube-controller-manager:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -137,10 +137,10 @@ spec:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.20.0
image: registry.k8s.io/kube-scheduler:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -158,9 +158,11 @@ spec:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: 1.20.0
kubernetesVersion: 1.21.0
masterInternalName: api.internal.123.example.com
masterKubelet:
anonymousAuth: false
@ -177,6 +179,8 @@ spec:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterPublicName: api.123.example.com
networkCIDR: 172.20.0.0/16
networking:

12
tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -22,7 +22,7 @@ APIServerConfig:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -52,15 +52,15 @@ APIServerConfig:
-----END RSA PUBLIC KEY-----
Assets:
amd64:
- ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet
- a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl
- 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
- 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
- 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
- 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64:
- 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
- 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
- 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
- a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
- ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
- debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
@ -258,6 +258,8 @@ KubeletConfig:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
UpdatePolicy: automatic
channels:
- memfs://clusters.example.com/123.example.com/addons/bootstrap-channel.yaml

10
tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -1,12 +1,12 @@
Assets:
amd64:
- ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet
- a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl
- 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
- 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
- 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
- 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz
arm64:
- 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
- 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
- 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
- a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
- ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
- debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz
CAs:
@ -54,6 +54,8 @@ KubeletConfig:
node-role.kubernetes.io/node: ""
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
UpdatePolicy: automatic
channels:
- memfs://clusters.example.com/123.example.com/addons/bootstrap-channel.yaml

2
tests/integration/update_cluster/digit/in-v1alpha2.yaml
View File

@ -43,7 +43,7 @@ spec:
]
kubelet:
anonymousAuth: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.123.example.com
masterPublicName: api.123.example.com
networkCIDR: 172.20.0.0/16

14
tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -162,7 +162,7 @@ kubeAPIServer:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -188,7 +188,7 @@ kubeControllerManager:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.20.0
image: registry.k8s.io/kube-controller-manager:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -196,10 +196,10 @@ kubeControllerManager:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.20.0
image: registry.k8s.io/kube-scheduler:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -217,6 +217,8 @@ kubelet:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterKubelet:
anonymousAuth: false
cgroupDriver: systemd
@ -232,6 +234,8 @@ masterKubelet:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -240,7 +244,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: YssZenVBsD/XRxQzNWtiEtosCSwESFczYcFzkrP9PXc=
NodeupConfigHash: F56oipBerHI/IM58aPmR1lXYLb5nkwRq2LaknRGeeNQ=
__EOF_KUBE_ENV

6
tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -136,7 +136,7 @@ docker:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubelet:
anonymousAuth: false
@ -152,6 +152,8 @@ kubelet:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -160,7 +162,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: JBOtZTb7DOhz+wDXNxS8EBauSSH+DsvILeAc8sn2bLI=
NodeupConfigHash: vbE8fon7Gz+yUJcoRvevJp6c22GnUv6MsvhgR0aUJfs=
__EOF_KUBE_ENV

14
tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -96,7 +96,7 @@ spec:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -122,7 +122,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.20.0
image: registry.k8s.io/kube-controller-manager:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -144,10 +144,10 @@ spec:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.20.0
image: registry.k8s.io/kube-scheduler:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -165,9 +165,11 @@ spec:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: 1.20.0
kubernetesVersion: 1.21.0
masterInternalName: api.internal.minimal.example.com
masterKubelet:
anonymousAuth: false
@ -184,6 +186,8 @@ spec:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
networking:

12
tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -22,7 +22,7 @@ APIServerConfig:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -52,15 +52,15 @@ APIServerConfig:
-----END RSA PUBLIC KEY-----
Assets:
amd64:
- ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet
- a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl
- 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
- 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
- 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
- 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64:
- 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
- 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
- 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
- a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
- ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
- debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
@ -258,6 +258,8 @@ KubeletConfig:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
UpdatePolicy: automatic
channels:
- memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml

10
tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -1,12 +1,12 @@
Assets:
amd64:
- ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet
- a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl
- 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
- 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
- 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
- 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz
arm64:
- 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
- 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
- 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
- a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
- ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
- debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz
CAs:
@ -54,6 +54,8 @@ KubeletConfig:
node-role.kubernetes.io/node: ""
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
UpdatePolicy: automatic
channels:
- memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml

2
tests/integration/update_cluster/irsa/in-v1alpha2.yaml
View File

@ -50,7 +50,7 @@ spec:
]
kubelet:
anonymousAuth: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16

20
tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml
View File

@ -164,7 +164,7 @@
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -190,7 +190,7 @@
clusterCIDR: 100.96.0.0/11
clusterName: nthsqsresources.longclustername.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.20.0
image: registry.k8s.io/kube-controller-manager:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -198,10 +198,10 @@
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.20.0
image: registry.k8s.io/kube-scheduler:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -219,6 +219,8 @@
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterKubelet:
anonymousAuth: false
cgroupDriver: systemd
@ -234,6 +236,8 @@
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -242,7 +246,7 @@
ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: NdAmLKXAsP2RbDGxPLKM/Tcd9mcFcyoSf8qua+HQKK0=
NodeupConfigHash: LQD6qMgsWOVM+0tA3geiunASTnTax7BwZ7Z9KTsFcBI=
__EOF_KUBE_ENV
@ -387,7 +391,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubelet:
anonymousAuth: false
@ -403,6 +407,8 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -411,7 +417,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop
ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: lj7GUK6xNNZJHof3qUNRaie+W+e6N8TcjXlLmHX5bpE=
NodeupConfigHash: zvQ5qxOmSlo/WXfoktauDA6U573u5L25Jh0At+ERVnM=
__EOF_KUBE_ENV

14
tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data
View File

@ -162,7 +162,7 @@ kubeAPIServer:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -188,7 +188,7 @@ kubeControllerManager:
clusterCIDR: 100.96.0.0/11
clusterName: nthsqsresources.longclustername.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.20.0
image: registry.k8s.io/kube-controller-manager:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -196,10 +196,10 @@ kubeControllerManager:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.20.0
image: registry.k8s.io/kube-scheduler:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -217,6 +217,8 @@ kubelet:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterKubelet:
anonymousAuth: false
cgroupDriver: systemd
@ -232,6 +234,8 @@ masterKubelet:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -240,7 +244,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: NdAmLKXAsP2RbDGxPLKM/Tcd9mcFcyoSf8qua+HQKK0=
NodeupConfigHash: LQD6qMgsWOVM+0tA3geiunASTnTax7BwZ7Z9KTsFcBI=
__EOF_KUBE_ENV

6
tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data
View File

@ -136,7 +136,7 @@ docker:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubelet:
anonymousAuth: false
@ -152,6 +152,8 @@ kubelet:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
__EOF_CLUSTER_SPEC
@ -160,7 +162,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: lj7GUK6xNNZJHof3qUNRaie+W+e6N8TcjXlLmHX5bpE=
NodeupConfigHash: zvQ5qxOmSlo/WXfoktauDA6U573u5L25Jh0At+ERVnM=
__EOF_KUBE_ENV

14
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content
View File

@ -67,7 +67,7 @@ spec:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -93,7 +93,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: nthsqsresources.longclustername.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.20.0
image: registry.k8s.io/kube-controller-manager:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -115,10 +115,10 @@ spec:
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.20.0
image: registry.k8s.io/kube-proxy:v1.21.0
logLevel: 2
kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.20.0
image: registry.k8s.io/kube-scheduler:v1.21.0
leaderElection:
leaderElect: true
logLevel: 2
@ -136,9 +136,11 @@ spec:
networkPluginName: cni
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: 1.20.0
kubernetesVersion: 1.21.0
masterInternalName: api.internal.nthsqsresources.longclustername.example.com
masterKubelet:
anonymousAuth: false
@ -155,6 +157,8 @@ spec:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterPublicName: api.nthsqsresources.longclustername.example.com
networkCIDR: 172.20.0.0/16
networking:

12
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -22,7 +22,7 @@ APIServerConfig:
- https://127.0.0.1:4001
etcdServersOverrides:
- /events#https://127.0.0.1:4002
image: registry.k8s.io/kube-apiserver:v1.20.0
image: registry.k8s.io/kube-apiserver:v1.21.0
kubeletPreferredAddressTypes:
- InternalIP
- Hostname
@ -52,15 +52,15 @@ APIServerConfig:
-----END RSA PUBLIC KEY-----
Assets:
amd64:
- ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet
- a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl
- 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
- 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
- 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
- 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64:
- 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
- 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
- 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
- a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
- ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
- debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
@ -258,6 +258,8 @@ KubeletConfig:
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
UpdatePolicy: automatic
channels:
- memfs://clusters.example.com/nthsqsresources.longclustername.example.com/addons/bootstrap-channel.yaml

10
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -1,12 +1,12 @@
Assets:
amd64:
- ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet
- a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl
- 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet
- 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl
- 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
- 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz
arm64:
- 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
- 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
- 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet
- a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl
- ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
- debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz
CAs:
@ -54,6 +54,8 @@ KubeletConfig:
node-role.kubernetes.io/node: ""
podInfraContainerImage: registry.k8s.io/pause:3.6
podManifestPath: /etc/kubernetes/manifests
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
UpdatePolicy: automatic
channels:
- memfs://clusters.example.com/nthsqsresources.longclustername.example.com/addons/bootstrap-channel.yaml

2
tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml
View File

@ -21,7 +21,7 @@ spec:
iam: {}
kubelet:
anonymousAuth: false
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.nthsqsresources.longclustername.example.com
masterPublicName: api.nthsqsresources.longclustername.example.com
networkCIDR: 172.20.0.0/16

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

@ -385,10 +385,6 @@ func TestPopulateCluster_DockerVersion(t *testing.T) {
KubernetesVersion string
DockerVersion string
}{
{
KubernetesVersion: "1.17.0",
DockerVersion: "19.03.15",
},
{
KubernetesVersion: "1.21.0",
DockerVersion: "20.10.17",

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: master-us-test-1a
name: events
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
additionalSans:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml
View File

@ -21,7 +21,7 @@ spec:
name: master-us-test-1a
name: events
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
additionalSans:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml
View File

@ -44,7 +44,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.20.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml
View File

@ -26,7 +26,7 @@ spec:
cloudControllerManager:
cloudProvider: aws
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
additionalSans:

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

@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 2102ef7a14aaad0aa67e20831a65462e7ef22e92ef5b33adc265833948c3e573
manifestHash: 94e504654220a5b5dfe8db461e8566a471dfd8428cf8fdac4509d51d253285cd
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml
View File

@ -25,7 +25,7 @@ spec:
name: master-us-test-1a
name: events
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
additionalSans:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml
View File

@ -29,7 +29,7 @@ spec:
name: master-us-test-1a
name: events
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
additionalSans:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml
View File

@ -19,7 +19,7 @@ spec:
name: master-us-test-1a
name: events
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
kubeDNS:
provider: CoreDNS
tolerations:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml
View File

@ -23,7 +23,7 @@ spec:
version: 3.1.12
name: events
iam: {}
kubernetesVersion: 1.20.0
kubernetesVersion: 1.22.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
metricsServer:

9
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
View File

@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: 065ae832ddac8d0931e9992d6a76f43a33a36975a38003b34f4c5d86a7d42780
manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
@ -61,3 +61,10 @@ spec:
selector:
role.kubernetes.io/networking: "1"
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 7d5c47010ea2aa26cdc658167a360a26c60643e5c096acfa0efdcb26c2c736dc
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
version: 9.99.0

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml
View File

@ -25,7 +25,7 @@ spec:
version: 3.1.12
name: events
iam: {}
kubernetesVersion: 1.20.0
kubernetesVersion: 1.22.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
metricsServer:

9
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
View File

@ -55,7 +55,7 @@ spec:
version: 9.99.0
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: 065ae832ddac8d0931e9992d6a76f43a33a36975a38003b34f4c5d86a7d42780
manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
@ -68,3 +68,10 @@ spec:
selector:
role.kubernetes.io/networking: "1"
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 7d5c47010ea2aa26cdc658167a360a26c60643e5c096acfa0efdcb26c2c736dc
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
version: 9.99.0

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml
View File

@ -22,7 +22,7 @@ spec:
name: events
iam:
useServiceAccountExternalPermissions: true
kubernetesVersion: v1.20.6
kubernetesVersion: v1.22.6
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
additionalSans:

9
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
View File

@ -41,8 +41,15 @@ spec:
version: 9.99.0
- id: v1.15.0
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: 065ae832ddac8d0931e9992d6a76f43a33a36975a38003b34f4c5d86a7d42780
manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 9.99.0
- id: k8s-1.17
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
manifestHash: 0610d7f75a347d0f838e5fb4171832563bafb67e5529df236bae29fc9dccfdd5
name: aws-ebs-csi-driver.addons.k8s.io
selector:
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
version: 9.99.0

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml
View File

@ -21,7 +21,7 @@ spec:
name: master-us-test-1a
name: events
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
additionalSans:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml
View File

@ -19,7 +19,7 @@ spec:
name: master-us-test-1a
name: events
iam: {}
kubernetesVersion: v1.20.0
kubernetesVersion: v1.21.0
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16