From 00c8da9174df559fa0153fdf410b76830d8f85a3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 09:09:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- vendor/aws/cloudformation/eks_cluster.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vendor') diff --git a/vendor/aws/cloudformation/eks_cluster.yaml b/vendor/aws/cloudformation/eks_cluster.yaml index c3f9c73cd1f..5ad25dcd533 100644 --- a/vendor/aws/cloudformation/eks_cluster.yaml +++ b/vendor/aws/cloudformation/eks_cluster.yaml @@ -7,12 +7,13 @@ Parameters: KubernetesVersion: Description: The Kubernetes version to install Type: String - Default: 1.16 + Default: 1.19 AllowedValues: - - 1.14 - 1.15 - 1.16 - 1.17 + - 1.18 + - 1.19 KeyName: Description: The EC2 Key Pair to allow SSH access to the node instances @@ -20,7 +21,7 @@ Parameters: NodeImageIdSSMParam: Type: "AWS::SSM::Parameter::Value" - Default: /aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id + Default: /aws/service/eks/optimized-ami/1.15/amazon-linux-2/recommended/image_id Description: AWS Systems Manager Parameter Store parameter of the AMI ID for the worker node instances. NodeInstanceType: -- cgit v1.2.1