diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /vendor | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
| download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/aws/cloudformation/eks_cluster.yaml | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 | ||||
| -rw-r--r-- | vendor/project_templates/dotnetcore.tar.gz | bin | 4924 -> 4923 bytes | |||
| -rw-r--r-- | vendor/project_templates/express.tar.gz | bin | 17921 -> 17923 bytes | |||
| -rw-r--r-- | vendor/project_templates/learn_gitlab_ultimate_trial.tar.gz (renamed from vendor/project_templates/learn_gitlab_gold_trial.tar.gz) | bin | 115096 -> 115096 bytes |
6 files changed, 4 insertions, 3 deletions
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<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. NodeInstanceType: diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore diff --git a/vendor/project_templates/dotnetcore.tar.gz b/vendor/project_templates/dotnetcore.tar.gz Binary files differindex 402153aa88d..7e4406dbb23 100644 --- a/vendor/project_templates/dotnetcore.tar.gz +++ b/vendor/project_templates/dotnetcore.tar.gz diff --git a/vendor/project_templates/express.tar.gz b/vendor/project_templates/express.tar.gz Binary files differindex f9a52fde41b..bd746dbfb5b 100644 --- a/vendor/project_templates/express.tar.gz +++ b/vendor/project_templates/express.tar.gz diff --git a/vendor/project_templates/learn_gitlab_gold_trial.tar.gz b/vendor/project_templates/learn_gitlab_ultimate_trial.tar.gz Binary files differindex 2ec47956706..2ec47956706 100644 --- a/vendor/project_templates/learn_gitlab_gold_trial.tar.gz +++ b/vendor/project_templates/learn_gitlab_ultimate_trial.tar.gz |