Merge pull request kubernetes#6306 from xmudrii/stable-migration-1

eks-prow-build: switch some components to the stable node group
Sarahdklopp · Jan 24, 2024 · 5198d99 · 5198d99
2 parents 2399fad + e2fcf1d
commit 5198d99
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 107 deletions.
diff --git a/infra/aws/terraform/prow-build-cluster/.terraform.lock.hcl b/infra/aws/terraform/prow-build-cluster/.terraform.lock.hcl
diff --git a/infra/aws/terraform/prow-build-cluster/modules/cluster-autoscaler/cluster-autoscaler.tf b/infra/aws/terraform/prow-build-cluster/modules/cluster-autoscaler/cluster-autoscaler.tf
@@ -404,6 +404,17 @@ resource "kubernetes_manifest" "deployment_kube_system_cluster_autoscaler" {
               ]
             },
           ]
+          "tolerations" = [
+            {
+              key      = "node-group"
+              operator = "Equal"
+              value    = "stable"
+              effect   = "NoSchedule"
+            }
+          ]
+          "nodeSelector" = {
+            "node-group" = "stable"
+          }
           "priorityClassName" = "system-cluster-critical"
           "securityContext" = {
             "fsGroup"      = 65534

diff --git a/infra/aws/terraform/prow-build-cluster/modules/metrics-server/metrics-server.tf b/infra/aws/terraform/prow-build-cluster/modules/metrics-server/metrics-server.tf
@@ -294,8 +294,17 @@ resource "kubernetes_manifest" "deployment_kube_system_metrics_server" {
               ]
             },
           ]
+          "tolerations" = [
+            {
+              key      = "node-group"
+              operator = "Equal"
+              value    = "stable"
+              effect   = "NoSchedule"
+            }
+          ]
           "nodeSelector" = {
             "kubernetes.io/os" = "linux"
+            "node-group"       = "stable"
           }
           "priorityClassName"  = "system-cluster-critical"
           "serviceAccountName" = "metrics-server"

diff --git a/infra/aws/terraform/prow-build-cluster/providers.tf b/infra/aws/terraform/prow-build-cluster/providers.tf
@@ -22,7 +22,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.19"
+      version = "~> 5.20"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/infra/aws/terraform/prow-build-cluster/resources/boskos/aws-janitor.yaml b/infra/aws/terraform/prow-build-cluster/resources/boskos/aws-janitor.yaml
@@ -44,3 +44,10 @@ spec:
             limits:
               cpu: 2000m
               memory: 4Gi
+      tolerations:
+        - key: node-group
+          operator: Equal
+          value: stable
+          effect: NoSchedule
+      nodeSelector:
+        node-group: stable
diff --git a/infra/aws/terraform/prow-build-cluster/resources/boskos/boskos.yaml b/infra/aws/terraform/prow-build-cluster/resources/boskos/boskos.yaml
@@ -49,6 +49,13 @@ spec:
             limits:
               cpu: 2000m
               memory: 4Gi
+      tolerations:
+        - key: node-group
+          operator: Equal
+          value: stable
+          effect: NoSchedule
+      nodeSelector:
+        node-group: stable
       volumes:
         - name: boskos-config
           configMap:

diff --git a/infra/aws/terraform/prow-build-cluster/resources/boskos/reaper.yaml b/infra/aws/terraform/prow-build-cluster/resources/boskos/reaper.yaml
@@ -42,3 +42,10 @@ spec:
             limits:
               cpu: 2000m
               memory: 4Gi
+      tolerations:
+        - key: node-group
+          operator: Equal
+          value: stable
+          effect: NoSchedule
+      nodeSelector:
+        node-group: stable