Skip to content

Commit

Permalink
Revert ASO install settings
Browse files Browse the repository at this point in the history
  • Loading branch information
adriananeci committed Jul 10, 2023
1 parent f6c6d65 commit 829429b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
3 changes: 1 addition & 2 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
resources:
- ../capz
components:
- ../aso
2 changes: 0 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 829429b

Please sign in to comment.