UPSTREAM: <carry>: Delete ASO deployment

Signed-off-by: Nolan Brubaker <[email protected]>

Author: nrb

openshift/Makefile

@@ -22,4 +22,4 @@ ocp-manifests: $(RELEASE_DIR) $(KUSTOMIZE) check-env ## Builds openshift specifi
 	$(KUSTOMIZE) build > infrastructure-components.yaml
 	# Generate provider manifests.
 	# TODO: load the provider-version dynamically at rebase time when this is invoked by the Rebase Bot during one of its lifecycle hooks.
-	cd tools && $(MANIFESTS_GEN) --provider-name "azure" --provider-type "InfrastructureProvider" --provider-version "${PROVIDER_VERSION}" --base-path "../../" --manifests-path "../manifests"
+	cd tools && $(MANIFESTS_GEN) --provider-name "azure" --provider-type "InfrastructureProvider" --provider-version "${PROVIDER_VERSION}" --base-path "../../" --manifests-path "../manifests" --kustomize-dir="openshift"

openshift/kustomization.yaml

@@ -3,3 +3,7 @@ kind: Kustomization
 
 resources:
 - ../config/default
+
+# This field is deprecated in Kustomize v5; however, we rely on an earlier version and cannot use `patches` yet.
+patchesStrategicMerge:
+- ./patches/disable-aso.yaml

openshift/patches/disable-aso.yaml

@@ -0,0 +1,6 @@
+$patch: delete
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: azureserviceoperator-controller-manager
+  namespace: azureserviceoperator-system # This patch is processed before manifests-gen updates the namespace