Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-26 03:10:31 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-26 03:10:31 +0300
commita1d73247427b451ff85ccaa6b93dccf10e04283a (patch)
tree8a88d1a90fe26d24ef6ba78a267fd4c8727bd85f /vendor
parent97cdd36a0b70b11e2592f3f63f7aca83342c8dfa (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r--vendor/aws/cloudformation/eks_cluster.yaml7
1 files changed, 4 insertions, 3 deletions
diff --git a/vendor/aws/cloudformation/eks_cluster.yaml b/vendor/aws/cloudformation/eks_cluster.yaml
index c32f54d66dc..c3f9c73cd1f 100644
--- a/vendor/aws/cloudformation/eks_cluster.yaml
+++ b/vendor/aws/cloudformation/eks_cluster.yaml
@@ -7,11 +7,12 @@ Parameters:
KubernetesVersion:
Description: The Kubernetes version to install
Type: String
- Default: 1.14
+ Default: 1.16
AllowedValues:
- - 1.12
- - 1.13
- 1.14
+ - 1.15
+ - 1.16
+ - 1.17
KeyName:
Description: The EC2 Key Pair to allow SSH access to the node instances