From 5274fd159fbc6caca43787788dd465ac9e006fe2 Mon Sep 17 00:00:00 2001 From: Dmitry Ponomaryov Date: Thu, 30 Jan 2025 20:14:25 +0500 Subject: [PATCH 1/4] replace deprecated patches --- deploy/kubernetes/overlays/examples/kustomization.yaml | 8 ++++---- .../kubernetes/overlays/examples_perf/kustomization.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/kubernetes/overlays/examples/kustomization.yaml b/deploy/kubernetes/overlays/examples/kustomization.yaml index 965fde6a3a..9b9c8fb548 100644 --- a/deploy/kubernetes/overlays/examples/kustomization.yaml +++ b/deploy/kubernetes/overlays/examples/kustomization.yaml @@ -1,7 +1,7 @@ bases: - ../../base patches: -- stackdriver-sidecar.yaml -- critical-priority.yaml -- cadvisor-args.yaml -- gpu-privilages.yaml +- path: ./stackdriver-sidecar.yaml +- path: ./critical-priority.yaml +- path: ./cadvisor-args.yaml +- path: ./gpu-privilages.yaml diff --git a/deploy/kubernetes/overlays/examples_perf/kustomization.yaml b/deploy/kubernetes/overlays/examples_perf/kustomization.yaml index 57fda32f64..2b8087413e 100644 --- a/deploy/kubernetes/overlays/examples_perf/kustomization.yaml +++ b/deploy/kubernetes/overlays/examples_perf/kustomization.yaml @@ -3,4 +3,4 @@ bases: resources: - configmap.yaml patches: -- cadvisor-perf.yaml +- path: ./cadvisor-perf.yaml From f6acc923f4626c8da6f6d0f42f1c0f976944e7e0 Mon Sep 17 00:00:00 2001 From: Dmitry Ponomaryov Date: Thu, 30 Jan 2025 20:15:32 +0500 Subject: [PATCH 2/4] delete non-existent patch --- deploy/kubernetes/overlays/examples/kustomization.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/kubernetes/overlays/examples/kustomization.yaml b/deploy/kubernetes/overlays/examples/kustomization.yaml index 9b9c8fb548..0da62cfe44 100644 --- a/deploy/kubernetes/overlays/examples/kustomization.yaml +++ b/deploy/kubernetes/overlays/examples/kustomization.yaml @@ -4,4 +4,3 @@ patches: - path: ./stackdriver-sidecar.yaml - path: ./critical-priority.yaml - path: ./cadvisor-args.yaml -- path: ./gpu-privilages.yaml From 77f02ace81d3bafc9a260a5597d033a91bbfe36d Mon Sep 17 00:00:00 2001 From: Dmitry Ponomaryov Date: Thu, 30 Jan 2025 20:16:31 +0500 Subject: [PATCH 3/4] replace deprecated bases on resources --- deploy/kubernetes/overlays/examples/kustomization.yaml | 2 +- deploy/kubernetes/overlays/examples_perf/kustomization.yaml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deploy/kubernetes/overlays/examples/kustomization.yaml b/deploy/kubernetes/overlays/examples/kustomization.yaml index 0da62cfe44..d15fb54a16 100644 --- a/deploy/kubernetes/overlays/examples/kustomization.yaml +++ b/deploy/kubernetes/overlays/examples/kustomization.yaml @@ -1,4 +1,4 @@ -bases: +resources: - ../../base patches: - path: ./stackdriver-sidecar.yaml diff --git a/deploy/kubernetes/overlays/examples_perf/kustomization.yaml b/deploy/kubernetes/overlays/examples_perf/kustomization.yaml index 2b8087413e..1d75cdc946 100644 --- a/deploy/kubernetes/overlays/examples_perf/kustomization.yaml +++ b/deploy/kubernetes/overlays/examples_perf/kustomization.yaml @@ -1,6 +1,5 @@ -bases: -- ../../base resources: -- configmap.yaml +- ../../base +- ./configmap.yaml patches: - path: ./cadvisor-perf.yaml From 5f1b881499f8be60c8e40bab3558577b8783d3c3 Mon Sep 17 00:00:00 2001 From: Dmitry Ponomaryov Date: Thu, 30 Jan 2025 20:16:57 +0500 Subject: [PATCH 4/4] replace deprecated commonLabels --- deploy/kubernetes/base/kustomization.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/kubernetes/base/kustomization.yaml b/deploy/kubernetes/base/kustomization.yaml index 01f4ae12a7..ade5f68671 100644 --- a/deploy/kubernetes/base/kustomization.yaml +++ b/deploy/kubernetes/base/kustomization.yaml @@ -1,8 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: cadvisor -commonLabels: - app: cadvisor +labels: +- includeSelectors: false + includeTemplates: true + pairs: + app.kubernetes.io/name: cadvisor resources: - daemonset.yaml - namespace.yaml