diff --git a/Tiltfile b/Tiltfile index d64112cfafc..4549d186bf0 100644 --- a/Tiltfile +++ b/Tiltfile @@ -184,8 +184,6 @@ def observability(): k8s_resource(workload = "capz-controller-manager", labels = ["cluster-api"]) k8s_resource(workload = "capz-nmi", labels = ["cluster-api"]) - k8s_resource(workload = "azureserviceoperator-controller-manager", labels = ["cluster-api"]) - # Build CAPZ and add feature gates def capz(): @@ -255,6 +253,7 @@ def create_identity_secret(): os.putenv("AZURE_CLIENT_SECRET_B64", base64_encode(os.environ.get("AZURE_CLIENT_SECRET"))) local("cat templates/azure-cluster-identity/secret.yaml | " + envsubst_cmd + " | " + kubectl_cmd + " apply -f -", quiet = True, echo_off = True) + os.unsetenv("AZURE_CLIENT_SECRET_B64") def create_crs(): # create config maps diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 37fa2f9d770..dcabdd0cbf1 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,4 +1,2 @@ resources: - ../capz -components: -- ../aso \ No newline at end of file diff --git a/main.go b/main.go index a3669495613..765c0ecfc84 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,6 @@ import ( "context" "flag" "fmt" - asoresourcesv1 "github.com/Azure/azure-service-operator/v2/api/resources/v1api20200601" "net/http" _ "net/http/pprof" "os" @@ -70,7 +69,6 @@ func init() { _ = clusterv1.AddToScheme(scheme) _ = expv1.AddToScheme(scheme) _ = kubeadmv1.AddToScheme(scheme) - _ = asoresourcesv1.AddToScheme(scheme) // +kubebuilder:scaffold:scheme // Add aadpodidentity v1 to the scheme.