Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
88006599
Commit
88006599
authored
Feb 18, 2021
by
Winkie's
Committed by
Thong Kuah
Feb 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 1.14 kubernetes version for EKS
Set default version to 1.19
parent
2bfb648a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/javascripts/create_cluster/eks_cluster/constants.js
...ssets/javascripts/create_cluster/eks_cluster/constants.js
+3
-2
changelogs/unreleased/321283-update-kubernetes-version-supported.yml
...unreleased/321283-update-kubernetes-version-supported.yml
+5
-0
doc/user/project/clusters/index.md
doc/user/project/clusters/index.md
+0
-1
vendor/aws/cloudformation/eks_cluster.yaml
vendor/aws/cloudformation/eks_cluster.yaml
+4
-3
No files found.
app/assets/javascripts/create_cluster/eks_cluster/constants.js
View file @
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
},
];
];
changelogs/unreleased/321283-update-kubernetes-version-supported.yml
0 → 100644
View file @
88006599
---
title
:
Update k8s version for EKS cluster
merge_request
:
54389
author
:
Vincent Firmin @winkies
type
:
fixed
doc/user/project/clusters/index.md
View file @
88006599
...
@@ -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.
...
...
vendor/aws/cloudformation/eks_cluster.yaml
View file @
88006599
...
@@ -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.1
6
Default
:
1.1
9
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.1
4
/amazon-linux-2/recommended/image_id
Default
:
/aws/service/eks/optimized-ami/1.1
5
/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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment