mirror of https://github.com/kubernetes/kops.git
Use supported kubernetes versions in tests
This commit is contained in:
parent
61511b5c43
commit
704f41dbf1
|
@ -18,7 +18,7 @@ spec:
|
||||||
- instanceGroup: master-us-test-1a
|
- instanceGroup: master-us-test-1a
|
||||||
name: master-us-test-1a
|
name: master-us-test-1a
|
||||||
name: events
|
name: events
|
||||||
kubernetesVersion: v1.4.6
|
kubernetesVersion: v1.13.6
|
||||||
masterInternalName: api.internal.minimal.example.com
|
masterInternalName: api.internal.minimal.example.com
|
||||||
masterPublicName: api.minimal.example.com
|
masterPublicName: api.minimal.example.com
|
||||||
networkCIDR: 172.20.0.0/16
|
networkCIDR: 172.20.0.0/16
|
||||||
|
|
|
@ -244,6 +244,7 @@ definition: |
|
||||||
LimitNOFILE=1048576
|
LimitNOFILE=1048576
|
||||||
LimitNPROC=1048576
|
LimitNPROC=1048576
|
||||||
LimitCORE=infinity
|
LimitCORE=infinity
|
||||||
|
TasksMax=infinity
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=2s
|
RestartSec=2s
|
||||||
StartLimitInterval=0
|
StartLimitInterval=0
|
||||||
|
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
- instanceGroup: master-us-test-1a
|
- instanceGroup: master-us-test-1a
|
||||||
name: master-us-test-1a
|
name: master-us-test-1a
|
||||||
name: events
|
name: events
|
||||||
kubernetesVersion: v1.6.0
|
kubernetesVersion: v1.16.0
|
||||||
masterInternalName: api.internal.logflags.example.com
|
masterInternalName: api.internal.logflags.example.com
|
||||||
masterPublicName: api.logflags.example.com
|
masterPublicName: api.logflags.example.com
|
||||||
networkCIDR: 172.20.0.0/16
|
networkCIDR: 172.20.0.0/16
|
||||||
|
|
|
@ -244,6 +244,7 @@ definition: |
|
||||||
LimitNOFILE=1048576
|
LimitNOFILE=1048576
|
||||||
LimitNPROC=1048576
|
LimitNPROC=1048576
|
||||||
LimitCORE=infinity
|
LimitCORE=infinity
|
||||||
|
TasksMax=infinity
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=2s
|
RestartSec=2s
|
||||||
StartLimitInterval=0
|
StartLimitInterval=0
|
||||||
|
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
- instanceGroup: master-us-test-1a
|
- instanceGroup: master-us-test-1a
|
||||||
name: master-us-test-1a
|
name: master-us-test-1a
|
||||||
name: events
|
name: events
|
||||||
kubernetesVersion: v1.4.6
|
kubernetesVersion: v1.14.6
|
||||||
masterInternalName: api.internal.minimal.example.com
|
masterInternalName: api.internal.minimal.example.com
|
||||||
masterPublicName: api.minimal.example.com
|
masterPublicName: api.minimal.example.com
|
||||||
networkCIDR: 172.20.0.0/16
|
networkCIDR: 172.20.0.0/16
|
||||||
|
|
|
@ -244,6 +244,7 @@ definition: |
|
||||||
LimitNOFILE=1048576
|
LimitNOFILE=1048576
|
||||||
LimitNPROC=1048576
|
LimitNPROC=1048576
|
||||||
LimitCORE=infinity
|
LimitCORE=infinity
|
||||||
|
TasksMax=infinity
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=2s
|
RestartSec=2s
|
||||||
StartLimitInterval=0
|
StartLimitInterval=0
|
||||||
|
|
|
@ -20,7 +20,7 @@ spec:
|
||||||
- instanceGroup: master-us-test-1a
|
- instanceGroup: master-us-test-1a
|
||||||
name: master-us-test-1a
|
name: master-us-test-1a
|
||||||
name: events
|
name: events
|
||||||
kubernetesVersion: v1.4.6
|
kubernetesVersion: v1.14.6
|
||||||
masterInternalName: api.internal.minimal.example.com
|
masterInternalName: api.internal.minimal.example.com
|
||||||
masterPublicName: api.minimal.example.com
|
masterPublicName: api.minimal.example.com
|
||||||
networkCIDR: 172.20.0.0/16
|
networkCIDR: 172.20.0.0/16
|
||||||
|
|
|
@ -79,7 +79,7 @@ func (f fakeKeyStore) MirrorTo(basedir vfs.Path) error {
|
||||||
func buildMinimalCluster(clusterName string, masterPublicName string) *kops.Cluster {
|
func buildMinimalCluster(clusterName string, masterPublicName string) *kops.Cluster {
|
||||||
c := &kops.Cluster{}
|
c := &kops.Cluster{}
|
||||||
c.ObjectMeta.Name = clusterName
|
c.ObjectMeta.Name = clusterName
|
||||||
c.Spec.KubernetesVersion = "1.4.6"
|
c.Spec.KubernetesVersion = "1.14.6"
|
||||||
c.Spec.Subnets = []kops.ClusterSubnetSpec{
|
c.Spec.Subnets = []kops.ClusterSubnetSpec{
|
||||||
{Name: "subnet-us-mock-1a", Zone: "us-mock-1a", CIDR: "172.20.1.0/24", Type: kops.SubnetTypePrivate},
|
{Name: "subnet-us-mock-1a", Zone: "us-mock-1a", CIDR: "172.20.1.0/24", Type: kops.SubnetTypePrivate},
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ import (
|
||||||
func buildMinimalCluster() *kops.Cluster {
|
func buildMinimalCluster() *kops.Cluster {
|
||||||
c := &kops.Cluster{}
|
c := &kops.Cluster{}
|
||||||
c.ObjectMeta.Name = "testcluster.test.com"
|
c.ObjectMeta.Name = "testcluster.test.com"
|
||||||
c.Spec.KubernetesVersion = "1.4.6"
|
c.Spec.KubernetesVersion = "1.14.6"
|
||||||
c.Spec.Subnets = []kops.ClusterSubnetSpec{
|
c.Spec.Subnets = []kops.ClusterSubnetSpec{
|
||||||
{Name: "subnet-us-mock-1a", Zone: "us-mock-1a", CIDR: "172.20.1.0/24", Type: kops.SubnetTypePrivate},
|
{Name: "subnet-us-mock-1a", Zone: "us-mock-1a", CIDR: "172.20.1.0/24", Type: kops.SubnetTypePrivate},
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,14 +15,14 @@ spec:
|
||||||
- etcdMembers:
|
- etcdMembers:
|
||||||
- instanceGroup: master-us-test-1a
|
- instanceGroup: master-us-test-1a
|
||||||
name: master-us-test-1a
|
name: master-us-test-1a
|
||||||
version: 3.1.11
|
version: 3.1.12
|
||||||
name: main
|
name: main
|
||||||
- etcdMembers:
|
- etcdMembers:
|
||||||
- instanceGroup: master-us-test-1a
|
- instanceGroup: master-us-test-1a
|
||||||
name: master-us-test-1a
|
name: master-us-test-1a
|
||||||
version: 3.1.11
|
version: 3.1.12
|
||||||
name: events
|
name: events
|
||||||
kubernetesVersion: 1.8.11
|
kubernetesVersion: 1.14.11
|
||||||
masterInternalName: api.internal.minimal.example.com
|
masterInternalName: api.internal.minimal.example.com
|
||||||
masterPublicName: api.minimal.example.com
|
masterPublicName: api.minimal.example.com
|
||||||
additionalSans:
|
additionalSans:
|
||||||
|
|
|
@ -21,7 +21,7 @@ spec:
|
||||||
- id: k8s-1.6
|
- id: k8s-1.6
|
||||||
kubernetesVersion: <1.12.0
|
kubernetesVersion: <1.12.0
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
|
||||||
manifestHash: c74ca65f461c764fc9682c6d9ec171b241bec335
|
manifestHash: 555f952a8b955ce7a5dd0bcd06a5be9e72bd2895
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
@ -29,7 +29,7 @@ spec:
|
||||||
- id: k8s-1.12
|
- id: k8s-1.12
|
||||||
kubernetesVersion: '>=1.12.0'
|
kubernetesVersion: '>=1.12.0'
|
||||||
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
|
||||||
manifestHash: 1af655a2947a56b55f67bff73a06cfe9e7b12c35
|
manifestHash: 15ade04df128488a534141bd5b8593d078f4953f
|
||||||
name: kube-dns.addons.k8s.io
|
name: kube-dns.addons.k8s.io
|
||||||
selector:
|
selector:
|
||||||
k8s-addon: kube-dns.addons.k8s.io
|
k8s-addon: kube-dns.addons.k8s.io
|
||||||
|
|
Loading…
Reference in New Issue