From 1fbf0e7d75e0f061f6ec4e154223a4d293d3f8c1 Mon Sep 17 00:00:00 2001 From: Pavel Tishkov Date: Mon, 20 May 2024 18:53:59 +0300 Subject: [PATCH] feat(module): rename core resources Signed-off-by: Pavel Tishkov --- images/pre-delete-hook/entrypoint.sh | 8 ++++---- templates/cdi/cdi.yaml | 2 +- templates/kubevirt/kubevirt.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/pre-delete-hook/entrypoint.sh b/images/pre-delete-hook/entrypoint.sh index b0a404abc1..edf6263223 100644 --- a/images/pre-delete-hook/entrypoint.sh +++ b/images/pre-delete-hook/entrypoint.sh @@ -3,12 +3,12 @@ set -eu -o pipefail KUBEVIRT_RESOURCE="dvpinternalkubevirts.internal.virtualization.deckhouse.io" echo "Delete Kubevirt configuration ..." -kubectl delete -n d8-virtualization ${KUBEVIRT_RESOURCE} kubevirt || true +kubectl delete -n d8-virtualization ${KUBEVIRT_RESOURCE} config || true echo "Wait for Kubevirt deletion ..." -kubectl wait --for=delete -n d8-virtualization ${KUBEVIRT_RESOURCE} kubevirt --timeout=180s || true +kubectl wait --for=delete -n d8-virtualization ${KUBEVIRT_RESOURCE} config --timeout=180s || true CDI_RESOURCE="dvpinternalcdis.internal.virtualization.deckhouse.io" echo "Delete CDI configuration ..." -kubectl delete ${CDI_RESOURCE} cdi || true +kubectl delete ${CDI_RESOURCE} config || true echo "Wait for CDI deletion ..." -kubectl wait --for=delete ${CDI_RESOURCE} cdi --timeout=180s || true +kubectl wait --for=delete ${CDI_RESOURCE} config --timeout=180s || true diff --git a/templates/cdi/cdi.yaml b/templates/cdi/cdi.yaml index 065505e9ef..ebb56659fe 100644 --- a/templates/cdi/cdi.yaml +++ b/templates/cdi/cdi.yaml @@ -9,7 +9,7 @@ apiVersion: internal.virtualization.deckhouse.io/v1beta1 kind: DVPInternalCDI metadata: - name: cdi + name: config namespace: d8-{{ .Chart.Name }} {{- include "helm_lib_module_labels" (list .) | nindent 2 }} spec: diff --git a/templates/kubevirt/kubevirt.yaml b/templates/kubevirt/kubevirt.yaml index e82359c1af..f15556e2f5 100644 --- a/templates/kubevirt/kubevirt.yaml +++ b/templates/kubevirt/kubevirt.yaml @@ -9,7 +9,7 @@ apiVersion: internal.virtualization.deckhouse.io/v1 kind: DVPInternalKubeVirt metadata: - name: kubevirt + name: config namespace: d8-{{ .Chart.Name }} {{- include "helm_lib_module_labels" (list .) | nindent 2 }} spec: