hypershift assisted: delete bmh before namespace

karmab · Mar 22, 2024 · 5eef2ed · 5eef2ed
1 parent c6098b9
commit 5eef2ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)