diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-12 21:07:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-12 21:07:13 +0300 |
| commit | ba5be4989e02566ad45191b6d97815e189a26dac (patch) | |
| tree | 96a4ace3c3d61ec4aea31cbf548718ef67cfd84b /scripts | |
| parent | 22a3da26ad21d67acaef7b2598429c8a003f1037 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/review_apps/base-config.yaml | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index b080e7f710c..f845dd04e8f 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -16,10 +16,6 @@ global: secret: shared-gitlab-initial-root-password nodeSelector: preemptible: "true" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-true certmanager: install: false @@ -37,10 +33,6 @@ gitlab: storageClass: ssd nodeSelector: preemptible: "false" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-false podAnnotations: <<: *safe-to-evict @@ -139,10 +131,6 @@ gitlab-runner: memory: 150Mi nodeSelector: preemptible: "true" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-true podAnnotations: <<: *safe-to-evict @@ -156,10 +144,6 @@ minio: memory: 280Mi nodeSelector: preemptible: "true" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-true podAnnotations: <<: *safe-to-evict @@ -182,10 +166,6 @@ nginx-ingress: timeoutSeconds: 5 nodeSelector: preemptible: "true" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-true defaultBackend: resources: requests: @@ -196,10 +176,6 @@ nginx-ingress: memory: 24Mi nodeSelector: preemptible: "true" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-true postgresql: metrics: @@ -214,10 +190,6 @@ postgresql: master: nodeSelector: preemptible: "false" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-false podAnnotations: <<: *safe-to-evict @@ -237,10 +209,6 @@ redis: master: nodeSelector: preemptible: "true" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-true podAnnotations: <<: *safe-to-evict @@ -257,7 +225,3 @@ registry: memory: 45Mi nodeSelector: preemptible: "true" - # TODO: Remove me as soon as the old nodepools are deleted - # - # See https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure/-/issues/40 - cloud.google.com/gke-nodepool: containerd-preemptible-true |