From 3e87cac4877ef66956b10952eee02ed596a94990 Mon Sep 17 00:00:00 2001 From: Denis Patrakeev Date: Thu, 6 Mar 2025 10:59:12 +0300 Subject: [PATCH] [DO-1602] Refactor node labels (!115) [DO-1602] Co-authored-by: denis.patrakeev Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/115 Reviewed-by: Rustam Tagaev Co-authored-by: Denis Patrakeev Co-committed-by: Denis Patrakeev --- .../automations-tools/argocd-apps-automations-tools.yaml | 2 +- .../namespaces/automations-tools/helm-aggregator/values.yaml | 2 +- .../namespaces/example/example.yaml | 3 +-- .../namespaces/tavro-cloud-dev/tavro-cloud-dev.yaml | 2 +- .../namespaces/tavro-cloud-test/tavro-cloud-test.yaml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/argocd-apps-automations-tools.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/argocd-apps-automations-tools.yaml index f266ae8..c82ab29 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/argocd-apps-automations-tools.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/argocd-apps-automations-tools.yaml @@ -7,7 +7,7 @@ metadata: name: automations-tools app.kubernetes.io/managed-by: argocd annotations: - scheduler.alpha.kubernetes.io/node-selector: "nodetype=worker" + scheduler.alpha.kubernetes.io/node-selector: node-role.kubernetes.io/worker= --- apiVersion: v1 kind: ResourceQuota diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/helm-aggregator/values.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/helm-aggregator/values.yaml index 8a23b24..7ecf75e 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/helm-aggregator/values.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/automations-tools/helm-aggregator/values.yaml @@ -37,7 +37,7 @@ resources: memory: 512Mi nodeSelector: - nodetype: worker + node-role.kubernetes.io/worker: "" config: | port: "8080" diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/example/example.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/example/example.yaml index d12a17f..46ebba0 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/example/example.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/example/example.yaml @@ -6,10 +6,9 @@ metadata: name: example labels: name: example - app.kubernetes.io/managed-by: manual annotations: - scheduler.alpha.kubernetes.io/node-selector: "nodetype=worker" + scheduler.alpha.kubernetes.io/node-selector: node-role.kubernetes.io/worker= --- # выделяем лимиты на текущий namespace apiVersion: v1 diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-dev/tavro-cloud-dev.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-dev/tavro-cloud-dev.yaml index d591b72..55f16b8 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-dev/tavro-cloud-dev.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-dev/tavro-cloud-dev.yaml @@ -7,7 +7,7 @@ metadata: name: tavro-cloud-dev app.kubernetes.io/managed-by: manual annotations: - scheduler.alpha.kubernetes.io/node-selector: "nodetype=worker" + scheduler.alpha.kubernetes.io/node-selector: node-role.kubernetes.io/worker= --- apiVersion: v1 kind: ResourceQuota diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-test/tavro-cloud-test.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-test/tavro-cloud-test.yaml index 3a2cc5c..8c5c0b9 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-test/tavro-cloud-test.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/tavro-cloud-test/tavro-cloud-test.yaml @@ -7,7 +7,7 @@ metadata: name: tavro-cloud-test app.kubernetes.io/managed-by: manual annotations: - scheduler.alpha.kubernetes.io/node-selector: "nodetype=worker" + scheduler.alpha.kubernetes.io/node-selector: node-role.kubernetes.io/worker= --- apiVersion: v1 kind: ResourceQuota