From 48a6815e061a2a351397107f4a27dbaf368f6f0e Mon Sep 17 00:00:00 2001
From: dustinmm80 <dcollins@gitlab.com>
Date: Wed, 16 Nov 2022 14:32:49 -0600
Subject: [PATCH 1/5] Update environment names for new EKS cluster

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5156890bff..94bbf15dc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -280,7 +280,7 @@ review_eks:
     DNS_PROVIDER: "aws"
   extends: .review_template
   environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+    name: aws120/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
     url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
     on_stop: stop_review_eks
     auto_stop_in: 4 days
@@ -338,7 +338,7 @@ stop_review_gke_dev:
 stop_review_eks:
   extends: .stop_review_template
   environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+    name: aws120/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
     action: stop
 
 # Keys that start with a dot (.) will not be processed by GitLab CI.
@@ -722,7 +722,7 @@ review_specs_eks:
     VARIABLES_FILE: "variables/review_eks"
     RSPEC_TAGS: type:feature
   environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+    name: aws120/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
     url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
     on_stop: stop_review_eks
   resource_group: "eks-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
@@ -947,7 +947,7 @@ qa_eks:
     VARIABLES_FILE: "variables/review_eks"
     TEST_SUITE: '--tag smoke --tag reliable --tag ~skip_live_env --tag ~orchestrated'
   environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+    name: aws120/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
     on_stop: stop_review_eks
 
 qa_gke_production:
@@ -986,7 +986,7 @@ qa_eks_manual_full_suite:
     VARIABLES_FILE: "variables/review_eks"
     TEST_SUITE: '--tag ~smoke --tag ~reliable --tag ~orchestrated --tag ~transient'
   environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+    name: aws120/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
     on_stop: stop_review_eks
   when: manual
 
-- 
GitLab


From e047021ded5d8b279d0d8e9c31601cf646a7bb58 Mon Sep 17 00:00:00 2001
From: dustinmm80 <dcollins@gitlab.com>
Date: Wed, 16 Nov 2022 15:27:12 -0600
Subject: [PATCH 2/5] whitespace

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9a8659a6e7..24d638ae3a 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Some of the key benefits of this chart and [corresponding containers](https://gi
 - No requirement for root privileges.
 - Utilization of object storage instead of NFS for storage.
 
+
 ## Detailed documentation
 
 See the [repository documentation](doc/index.md) for how to install GitLab and
-- 
GitLab


From 2f5524bd3fd32f68e86a0d1be05d0cf93fade936 Mon Sep 17 00:00:00 2001
From: Dmytro Makovey <dmakovey@gitlab.com>
Date: Wed, 16 Nov 2022 21:48:52 +0000
Subject: [PATCH 3/5] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94bbf15dc9..7dc15cf7b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,6 +209,7 @@ lint_package:
     - mkdir -p $(dirname "${VARIABLES_FILE}")
     - check_kube_domain
     - kubectl version
+    - echo $KUBECONFIG
     - ensure_namespace
     - create_secret
     - deploy
-- 
GitLab


From 3f519d1d615f5a1733ee6e3f2dab1be938cd8171 Mon Sep 17 00:00:00 2001
From: Dmytro Makovey <dmakovey@gitlab.com>
Date: Wed, 16 Nov 2022 21:56:19 +0000
Subject: [PATCH 4/5] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dc15cf7b8..3f7887df2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -208,8 +208,8 @@ lint_package:
   script:
     - mkdir -p $(dirname "${VARIABLES_FILE}")
     - check_kube_domain
-    - kubectl version
     - echo $KUBECONFIG
+    - kubectl version
     - ensure_namespace
     - create_secret
     - deploy
-- 
GitLab


From d9a7db6d6ed455d97f5162bdf54e4b96603fbfeb Mon Sep 17 00:00:00 2001
From: dustinmm80 <dcollins@gitlab.com>
Date: Thu, 17 Nov 2022 13:54:30 -0600
Subject: [PATCH 5/5] remove extra space

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 24d638ae3a..9a8659a6e7 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ Some of the key benefits of this chart and [corresponding containers](https://gi
 - No requirement for root privileges.
 - Utilization of object storage instead of NFS for storage.
 
-
 ## Detailed documentation
 
 See the [repository documentation](doc/index.md) for how to install GitLab and
-- 
GitLab