summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-27 06:09:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-27 06:09:18 +0000
commit32dfcc61dbc0d8cd19ad4c6662b3f28ac138915d (patch)
treec4d100e61e92c46159b4ef9d96720769535e94ce /vendor
parentd9c4e920ed70224d4e3a47b2a1c866a4f6f37ce4 (diff)
downloadgitlab-ce-32dfcc61dbc0d8cd19ad4c6662b3f28ac138915d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r--vendor/aws/cloudformation/eks_cluster.yaml12
1 files changed, 6 insertions, 6 deletions
diff --git a/vendor/aws/cloudformation/eks_cluster.yaml b/vendor/aws/cloudformation/eks_cluster.yaml
index 5ad25dcd533..798eaeae799 100644
--- a/vendor/aws/cloudformation/eks_cluster.yaml
+++ b/vendor/aws/cloudformation/eks_cluster.yaml
@@ -7,13 +7,13 @@ Parameters:
KubernetesVersion:
Description: The Kubernetes version to install
Type: String
- Default: 1.19
+ Default: "1.20"
AllowedValues:
- - 1.15
- - 1.16
- - 1.17
- - 1.18
- - 1.19
+ - "1.16"
+ - "1.17"
+ - "1.18"
+ - "1.19"
+ - "1.20"
KeyName:
Description: The EC2 Key Pair to allow SSH access to the node instances