From 5eef2ed92a6bff9afcf42e5a420e2194cf8d5d8e Mon Sep 17 00:00:00 2001 From: karmab Date: Fri, 22 Mar 2024 10:21:17 +0100 Subject: [PATCH] hypershift assisted: delete bmh before namespace --- kvirt/cluster/hypershift/assisted_infra.yml | 2 -- kvirt/config.py | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kvirt/cluster/hypershift/assisted_infra.yml b/kvirt/cluster/hypershift/assisted_infra.yml index fc1e27f41..07c76eb4d 100644 --- a/kvirt/cluster/hypershift/assisted_infra.yml +++ b/kvirt/cluster/hypershift/assisted_infra.yml @@ -40,8 +40,6 @@ kind: InfraEnv metadata: name: {{ cluster }} namespace: {{ namespace }}-{{ cluster }} - annotations: - infraenv.agent-install.openshift.io/enable-ironic-agent: "false" spec: pullSecretRef: name: {{ cluster }}-pull-secret diff --git a/kvirt/config.py b/kvirt/config.py index fca0b068f..30ec151eb 100644 --- a/kvirt/config.py +++ b/kvirt/config.py @@ -2865,6 +2865,10 @@ def delete_kube(self, cluster, overrides={}): z.delete_dns(f"apps.{cluster}", domain) if hypershift: kubeconfigmgmt = f"{clusterdir}/kubeconfig.mgmt" + if os.path.exists('{clusterdir}/bmcs.yml'): + call(f'KUBECONFIG={kubeconfigmgmt} oc delete -f {clusterdir}/bmcs.yml', shell=True) + if os.path.exists('{clusterdir}/assisted_infra.yml'): + call(f'KUBECONFIG={kubeconfigmgmt} oc delete -f {clusterdir}/assisted_infra.yml', shell=True) call(f'KUBECONFIG={kubeconfigmgmt} oc delete -f {clusterdir}/autoapprovercron.yml', shell=True) call(f'KUBECONFIG={kubeconfigmgmt} oc delete -f {clusterdir}/nodepool.yaml', shell=True) call(f'KUBECONFIG={kubeconfigmgmt} oc delete -f {clusterdir}/hostedcluster.yaml', shell=True)