Merge branch 'master' of https://github.com/Azure/azure-service-operator

into manageduser-db
Azure · Apr 23, 2020 · feb1c42 · feb1c42
2 parents 94c9eae + 6df78cf
commit feb1c42
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 16 deletions.
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -35,6 +35,7 @@ import (
 	mysqlDatabaseManager "github.com/Azure/azure-service-operator/pkg/resourcemanager/mysql/database"
 	mysqlFirewallManager "github.com/Azure/azure-service-operator/pkg/resourcemanager/mysql/firewallrule"
 	mysqlServerManager "github.com/Azure/azure-service-operator/pkg/resourcemanager/mysql/server"
+	mysqlvnetrule "github.com/Azure/azure-service-operator/pkg/resourcemanager/mysql/vnetrule"
 	resourcemanagernic "github.com/Azure/azure-service-operator/pkg/resourcemanager/nic"
 	resourcemanagerpip "github.com/Azure/azure-service-operator/pkg/resourcemanager/pip"
 	resourcemanagerpsqldatabase "github.com/Azure/azure-service-operator/pkg/resourcemanager/psql/database"
@@ -636,6 +637,22 @@ func setup() error {
 		return err
 	}
 
+	err = (&MySQLVNetRuleReconciler{
+		Reconciler: &AsyncReconciler{
+			Client:      k8sManager.GetClient(),
+			AzureClient: mysqlvnetrule.NewMySQLVNetRuleClient(),
+			Telemetry: telemetry.InitializeTelemetryDefault(
+				"MySQLVNetRule",
+				ctrl.Log.WithName("controllers").WithName("MySQLVNetRule"),
+			),
+			Recorder: k8sManager.GetEventRecorderFor("MySQLVNetRule-controller"),
+			Scheme:   k8sManager.GetScheme(),
+		},
+	}).SetupWithManager(k8sManager)
+	if err != nil {
+		return err
+	}
+
 	err = (&PostgreSQLServerReconciler{
 		Reconciler: &AsyncReconciler{
 			Client:      k8sManager.GetClient(),

diff --git a/devops/azure-pipelines.yaml b/devops/azure-pipelines.yaml
@@ -111,25 +111,25 @@ steps:
     kind create cluster
     export KUBECONFIG=$(kind get kubeconfig-path --name="kind")
     kubectl cluster-info
-    kubectl create namespace cert-manager
-    kubectl label namespace cert-manager cert-manager.io/disable-validation=true
-    kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.12.0/cert-manager.yaml
-    kubectl create namespace azureoperator-system 
-    kubectl --namespace azureoperator-system \
-      create secret generic azureoperatorsettings \
-      --from-literal=AZURE_CLIENT_ID=${AZURE_CLIENT_ID} \
-      --from-literal=AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET} \
-      --from-literal=AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} \
-      --from-literal=AZURE_TENANT_ID=${AZURE_TENANT_ID}
+    # kubectl create namespace cert-manager
+    # kubectl label namespace cert-manager cert-manager.io/disable-validation=true
+    # kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.12.0/cert-manager.yaml
+    # kubectl create namespace azureoperator-system 
+    # kubectl --namespace azureoperator-system \
+    #   create secret generic azureoperatorsettings \
+    #   --from-literal=AZURE_CLIENT_ID=${AZURE_CLIENT_ID} \
+    #   --from-literal=AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET} \
+    #   --from-literal=AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} \
+    #   --from-literal=AZURE_TENANT_ID=${AZURE_TENANT_ID}
     #create image and load it into cluster
-    IMG="docker.io/controllertest:1" make docker-build
-    kind load docker-image docker.io/controllertest:1 --loglevel "trace"
+    # IMG="docker.io/controllertest:1" make docker-build
+    # kind load docker-image docker.io/controllertest:1 --loglevel "trace"
     make install
     kubectl get namespaces
-    kubectl -n cert-manager rollout status deployment.v1.apps/cert-manager
-    kubectl get pods --namespace cert-manager
-    echo "all the pods should be running"
-    make deploy
+    # kubectl -n cert-manager rollout status deployment.v1.apps/cert-manager
+    # kubectl get pods --namespace cert-manager
+    # echo "all the pods should be running"
+    #make deploy
     make test-existing-controllers
   continueOnError: 'false'
   displayName: 'Set kind cluster and Run int tests'

diff --git a/main.go b/main.go
@@ -666,6 +666,7 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "NetworkInterface")
 		os.Exit(1)
 	}
+
 	if err = (&controllers.MySQLVNetRuleReconciler{
 		Reconciler: &controllers.AsyncReconciler{
 			Client:      mgr.GetClient(),