Commit 374e16e2 authored by Thong Kuah's avatar Thong Kuah

Merge branch '321283-update-kubernetes-version-supported' into 'master'

Remove 1.14 Kubernetes version for creating an Integrated EKS Cluster

See merge request gitlab-org/gitlab!54389
parents 9152d118 88006599
export const DEFAULT_REGION = 'us-east-2'; export const DEFAULT_REGION = 'us-east-2';
export const KUBERNETES_VERSIONS = [ export const KUBERNETES_VERSIONS = [
{ name: '1.14', value: '1.14' },
{ name: '1.15', value: '1.15' }, { name: '1.15', value: '1.15' },
{ name: '1.16', value: '1.16', default: true }, { name: '1.16', value: '1.16' },
{ name: '1.17', value: '1.17' }, { name: '1.17', value: '1.17' },
{ name: '1.18', value: '1.18' },
{ name: '1.19', value: '1.19', default: true },
]; ];
---
title: Update k8s version for EKS cluster
merge_request: 54389
author: Vincent Firmin @winkies
type: fixed
...@@ -58,7 +58,6 @@ Kubernetes version to any supported version at any time: ...@@ -58,7 +58,6 @@ Kubernetes version to any supported version at any time:
- 1.17 (support ends on September 22, 2021) - 1.17 (support ends on September 22, 2021)
- 1.16 (support ends on July 22, 2021) - 1.16 (support ends on July 22, 2021)
- 1.15 (support ends on May 22, 2021) - 1.15 (support ends on May 22, 2021)
- 1.14 (deprecated, support ends on December 22, 2020)
Some GitLab features may support versions outside the range provided here. Some GitLab features may support versions outside the range provided here.
......
...@@ -7,12 +7,13 @@ Parameters: ...@@ -7,12 +7,13 @@ Parameters:
KubernetesVersion: KubernetesVersion:
Description: The Kubernetes version to install Description: The Kubernetes version to install
Type: String Type: String
Default: 1.16 Default: 1.19
AllowedValues: AllowedValues:
- 1.14
- 1.15 - 1.15
- 1.16 - 1.16
- 1.17 - 1.17
- 1.18
- 1.19
KeyName: KeyName:
Description: The EC2 Key Pair to allow SSH access to the node instances Description: The EC2 Key Pair to allow SSH access to the node instances
...@@ -20,7 +21,7 @@ Parameters: ...@@ -20,7 +21,7 @@ Parameters:
NodeImageIdSSMParam: NodeImageIdSSMParam:
Type: "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>" Type: "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>"
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. Description: AWS Systems Manager Parameter Store parameter of the AMI ID for the worker node instances.
NodeInstanceType: NodeInstanceType:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment