Skip to content

Commit

Permalink
Update EKS tests' kubernetes versions
Browse files Browse the repository at this point in the history
  • Loading branch information
rmweir committed Jul 29, 2020
1 parent 832cf47 commit 3fac5c2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions tests/integration/suite/test_kontainer_engine_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_min_nodes_cannot_be_greater_than_max(admin_mc, remove_resource):
"accessKey": "not a real access key",
"secretKey": "not a real secret key",
"region": "us-west-2",
"kubernetesVersion": "1.14",
"kubernetesVersion": "1.17",
"minimumNodes": 3,
"maximumNodes": 2
}
Expand All @@ -59,7 +59,7 @@ def test_min_nodes_cannot_be_zero(admin_mc, remove_resource):
"accessKey": "not a real access key",
"secretKey": "not a real secret key",
"region": "us-west-2",
"kubernetesVersion": "1.14",
"kubernetesVersion": "1.17",
"minimumNodes": 0,
"maximumNodes": 0
}
Expand All @@ -73,7 +73,7 @@ def test_node_volume_size_cannot_be_zero(admin_mc, remove_resource):
"accessKey": "not a real access key",
"secretKey": "not a real secret key",
"region": "us-west-2",
"kubernetesVersion": "1.14",
"kubernetesVersion": "1.17",
"minimumNodes": 1,
"maximumNodes": 3,
"nodeVolumeSize": 0
Expand All @@ -88,7 +88,7 @@ def test_private_cluster_requires_vpc_subnets(admin_mc, remove_resource):
"accessKey": "not a real access key",
"secretKey": "not a real secret key",
"region": "us-west-2",
"kubernetesVersion": "1.14",
"kubernetesVersion": "1.17",
"minimumNodes": 1,
"maximumNodes": 3,
"associateWorkerNodePublicIp": False
Expand Down
4 changes: 2 additions & 2 deletions tests/validation/tests/v3_api/test_eks_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
EKS_SECRET_KEY = os.environ.get('RANCHER_EKS_SECRET_KEY', "")
EKS_AMI = os.environ.get('RANCHER_EKS_AMI', "")
EKS_REGION = os.environ.get('RANCHER_EKS_REGION', "us-west-2")
EKS_K8S_VERSION = os.environ.get('RANCHER_EKS_K8S_VERSION', "1.14")
EKS_K8S_VERSION = os.environ.get('RANCHER_EKS_K8S_VERSION', "1.17")

# Hardcoded to follow UI-style:
# https://github.com/rancher/ui/blob/master/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
EKS_K8S_VERSIONS = os.environ.get('RANCHER_EKS_K8S_VERSIONS',
"1.15,1.14,1.13").split(",")
"1.17,1.16,1.15").split(",")

ekscredential = pytest.mark.skipif(not (EKS_ACCESS_KEY and EKS_SECRET_KEY),
reason='EKS Credentials not provided, '
Expand Down

0 comments on commit 3fac5c2

Please sign in to comment.