Remove commented code and cleanup

azure-pipelines.yml

@@ -78,8 +78,6 @@ steps:
         os=$(go env GOOS)
         arch=$(go env GOARCH)
         curl -sL https://go.kubebuilder.io/dl/2.3.1/${os}/${arch} | tar -xz -C $(go env GOPATH)/bin
-        #mv $(go env GOPATH)/bin/kubebuilder_2.3.1_${os}_${arch} /usr/local/kubebuilder
-        #export PATH=$PATH:/usr/local/kubebuilder/bin
         export PATH=$PATH:$(go env path)/bin
         echo '##vso[task.prependpath]$(go env path)/bin'
         # download kustomize
@@ -106,7 +104,6 @@ steps:
       make install
       export TEST_APIM_RG=$(TEST_APIM_RG)
       export TEST_APIM_NAME=$(TEST_APIM_NAME)
-      export BUILD_TAGS=resourcegroup
       make test-integration-controllers
     displayName: Run tests on a Kind Cluster
     continueOnError: 'false'
@@ -185,7 +182,7 @@ steps:
         echo "##vso[task.setvariable variable=chosenclustername]$clustername"
         echo 'az aks get-credentials -g $(AKS_CLUSTER_RG) -n $clustername'
         az aks get-credentials -g $(AKS_CLUSTER_RG) -n $clustername
-        # Set tags to not available for the selected cluster so it doesn't get used
+        # Set tags to not available for the selected cluster so it doesn't get used in another run
         az resource tag --tags 'freeforpipeline=false' -g $(AKS_CLUSTER_RG) -n $clustername --resource-type Microsoft.ContainerService/managedClusters
       workingDirectory: '$(System.DefaultWorkingDirectory)'
       failOnStandardError: true
@@ -217,7 +214,9 @@ steps:
         kubectl delete namespace $(OPERATOR_NAMESPACE)
         imagename="$(PIPELINE_CONTAINER_REGISTRY_NAME)/$(IMAGE_NAME):$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)"
         echo $imagename
+        # Apply CRDs as Helm 3 does not install CRDs for Helm upgrade
         kubectl apply -f ./charts/azure-service-operator/crds/
+        # Deploy using Helm
         helm upgrade --install aso charts/azure-service-operator-0.1.0.tgz -n $(OPERATOR_NAMESPACE) --create-namespace \
             --set azureSubscriptionID=$(AZURE_SUBSCRIPTION_ID) \
             --set azureTenantID=$(AZURE_TENANT_ID) \
@@ -228,6 +227,7 @@ steps:
             --set aad-pod-identity.azureIdentity.resourceID="/subscriptions/$(AZURE_SUBSCRIPTION_ID)/resourcegroups/resourcegroup-azure-operators/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$(ASO-DEVOPS-MI)" \
             --set aad-pod-identity.azureIdentity.clientID=$(POD-IDENTITY-CLIENTID) \
             --set image.repository=$imagename 
+        # Verify namespace and pods
         kubectl get namespace
         kubectl get pods -n $(OPERATOR_NAMESPACE)
         kubectl describe pods -n $(OPERATOR_NAMESPACE)
@@ -242,7 +242,9 @@ steps:
       inlineScript: |
         echo "Chosen AKS Cluster name"
         echo $(chosenclustername)
+        # Delete CRDs to clean up cluster
         kubectl delete -f ./charts/azure-service-operator/crds/
+        # Remove Helm deployment
         helm list -n $(OPERATOR_NAMESPACE)
         helm delete aso -n $(OPERATOR_NAMESPACE)
         # Set tags to available for the selected cluster to put it back into the free pool