merge master

Azure · Oct 30, 2019 · bfab9cc · bfab9cc
2 parents 98b19db + acc3a61
commit bfab9cc
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 56 deletions.
diff --git a/api/v1alpha1/aso_types.go b/api/v1alpha1/aso_types.go
@@ -20,4 +20,4 @@ type ASOStatus struct {
 	Provisioned  bool   `json:"provisioned,omitempty"`
 	State        string `json:"state,omitempty"`
 	Message      string `json:"message,omitempty"`
-}
+}
diff --git a/api/v1alpha1/azuresqlaction_types.go b/api/v1alpha1/azuresqlaction_types.go
@@ -39,8 +39,8 @@ type AzureSqlAction struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   AzureSqlActionSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   AzureSqlActionSpec `json:"spec,omitempty"`
+	Status ASOStatus          `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/azuresqldatabase_types.go b/api/v1alpha1/azuresqldatabase_types.go
@@ -40,8 +40,8 @@ type AzureSqlDatabase struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   AzureSqlDatabaseSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   AzureSqlDatabaseSpec `json:"spec,omitempty"`
+	Status ASOStatus            `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/azuresqlfirewallrule_types.go b/api/v1alpha1/azuresqlfirewallrule_types.go
@@ -39,8 +39,8 @@ type AzureSqlFirewallRule struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   AzureSqlFirewallRuleSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   AzureSqlFirewallRuleSpec `json:"spec,omitempty"`
+	Status ASOStatus                `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/azuresqlserver_types.go b/api/v1alpha1/azuresqlserver_types.go
@@ -37,8 +37,8 @@ type AzureSqlServer struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   AzureSqlServerSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   AzureSqlServerSpec `json:"spec,omitempty"`
+	Status ASOStatus          `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -57,7 +57,3 @@ func init() {
 func (s *AzureSqlServer) IsSubmitted() bool {
 	return s.Status.Provisioned || s.Status.Provisioning
 }
-
-func (s *AzureSqlServer) IsProvisioned() bool {
-	return s.Status.Provisioned
-}
diff --git a/api/v1alpha1/consumergroup_types.go b/api/v1alpha1/consumergroup_types.go
@@ -40,8 +40,8 @@ type ConsumerGroup struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ConsumerGroupSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   ConsumerGroupSpec `json:"spec,omitempty"`
+	Status ASOStatus         `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/cosmosdb_types.go b/api/v1alpha1/cosmosdb_types.go
@@ -100,7 +100,7 @@ type CosmosDB struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Spec                CosmosDBSpec                `json:"spec,omitempty"`
-	Status              ASOStatus              `json:"status,omitempty"`
+	Status              ASOStatus                   `json:"status,omitempty"`
 	Output              CosmosDBOutput              `json:"output,omitempty"`
 	AdditionalResources CosmosDBAdditionalResources `json:"additionalResources,omitempty"`
 }

diff --git a/api/v1alpha1/eventhub_types.go b/api/v1alpha1/eventhub_types.go
@@ -104,8 +104,8 @@ type Eventhub struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   EventhubSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   EventhubSpec `json:"spec,omitempty"`
+	Status ASOStatus    `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/eventhubnamespace_types.go b/api/v1alpha1/eventhubnamespace_types.go
@@ -40,8 +40,8 @@ type EventhubNamespace struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   EventhubNamespaceSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   EventhubNamespaceSpec `json:"spec,omitempty"`
+	Status ASOStatus             `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/rediscache_types.go b/api/v1alpha1/rediscache_types.go
@@ -96,7 +96,7 @@ type RedisCache struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Spec                RedisCacheSpec                `json:"spec,omitempty"`
-	Status              ASOStatus              `json:"status,omitempty"`
+	Status              ASOStatus                     `json:"status,omitempty"`
 	Output              RedisCacheOutput              `json:"output,omitempty"`
 	AdditionalResources RedisCacheAdditionalResources `json:"additionalResources,omitempty"`
 }

diff --git a/api/v1alpha1/resourcegroup_types.go b/api/v1alpha1/resourcegroup_types.go
@@ -40,8 +40,8 @@ type ResourceGroup struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ResourceGroupSpec   `json:"spec,omitempty"`
-	Status ASOStatus `json:"status,omitempty"`
+	Spec   ResourceGroupSpec `json:"spec,omitempty"`
+	Status ASOStatus         `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/storage_types.go b/api/v1alpha1/storage_types.go
@@ -87,7 +87,7 @@ type Storage struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Spec                StorageSpec                `json:"spec,omitempty"`
-	Status              ASOStatus              `json:"status,omitempty"`
+	Status              ASOStatus                  `json:"status,omitempty"`
 	Output              StorageOutput              `json:"output,omitempty"`
 	AdditionalResources StorageAdditionalResources `json:"additionalResources,omitempty"`
 }

diff --git a/controllers/azuresqlserver_controller.go b/controllers/azuresqlserver_controller.go
@@ -115,32 +115,8 @@ func (r *AzureSqlServerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
 		}
 	}
 
-	// Re-create secret if server is provisioned but secret doesn't exist
-	if instance.IsProvisioned() {
-		name := instance.ObjectMeta.Name
-
-		secret := &v1.Secret{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      name,
-				Namespace: instance.Namespace,
-			},
-			Type: "Opaque",
-		}
-
-		if err := r.Get(context.Background(), types.NamespacedName{Name: name, Namespace: instance.Namespace}, secret); err != nil {
-			r.Log.Info("Error", "ReconcileSecret", "Server exists but secret does not, recreating now")
-
-			// Add admin credentials to "data" block in secret
-
-			// CreateOrUpdate secret
-		}
-
-	}
-
 	if !instance.IsSubmitted() {
 		r.Recorder.Event(&instance, v1.EventTypeNormal, "Submitting", "starting resource reconciliation")
-		// TODO: Add error handling for cases where username or password are invalid:
-		// https://docs.microsoft.com/en-us/rest/api/sql/servers/createorupdate#response
 		if err := r.reconcileExternal(&instance); err != nil {
 			catch := []string{
 				errhelp.ParentNotFoundErrorCode,

diff --git a/controllers/azuresqlserver_controller_finalizer.go b/controllers/azuresqlserver_controller_finalizer.go
@@ -20,9 +20,9 @@ import (
 	"context"
 	"fmt"
 
-	v1 "k8s.io/api/core/v1"
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
 	helpers "github.com/Azure/azure-service-operator/pkg/helpers"
+	v1 "k8s.io/api/core/v1"
 )
 
 const AzureSQLServerFinalizerName = "azuresqlserver.finalizers.azure.com"

diff --git a/controllers/consumergroup_controller.go b/controllers/consumergroup_controller.go
@@ -23,13 +23,13 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	v1 "k8s.io/api/core/v1"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
 	eventhubsresourcemanager "github.com/Azure/azure-service-operator/pkg/resourcemanager/eventhubs"

diff --git a/controllers/consumergroup_controller_finalizer.go b/controllers/consumergroup_controller_finalizer.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	v1 "k8s.io/api/core/v1"
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
+	v1 "k8s.io/api/core/v1"
 )
 
 const consumerGroupFinalizerName = "consumergroup.finalizers.com"

diff --git a/controllers/cosmosdb_controller.go b/controllers/cosmosdb_controller.go
@@ -39,8 +39,8 @@ import (
 	"github.com/Azure/azure-service-operator/pkg/errhelp"
 	"github.com/Azure/azure-service-operator/pkg/helpers"
 	"github.com/Azure/azure-service-operator/pkg/resourcemanager/cosmosdbs"
-	"k8s.io/client-go/tools/record"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/client-go/tools/record"
 )
 
 const cosmosDBFinalizerName = "cosmosdb.finalizers.azure.com"

diff --git a/controllers/eventhubnamespace_controller_finalizer.go b/controllers/eventhubnamespace_controller_finalizer.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	v1 "k8s.io/api/core/v1"
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
+	v1 "k8s.io/api/core/v1"
 )
 
 const eventhubNamespaceFinalizerName = "eventhubnamespace.finalizers.com"

diff --git a/controllers/keyvault_controller.go b/controllers/keyvault_controller.go
@@ -26,10 +26,10 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	v1 "k8s.io/api/core/v1"
 )
 
 const keyVaultFinalizerName = "keyvault.finalizers.azure.com"

diff --git a/controllers/rediscache_controller.go b/controllers/rediscache_controller.go
@@ -39,8 +39,8 @@ import (
 	"github.com/Azure/azure-service-operator/pkg/errhelp"
 	"github.com/Azure/azure-service-operator/pkg/helpers"
 	"github.com/Azure/azure-service-operator/pkg/resourcemanager/rediscaches"
-	"k8s.io/client-go/tools/record"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/client-go/tools/record"
 )
 
 const redisCacheFinalizerName = "rediscache.finalizers.azure.com"

diff --git a/controllers/storage_controller.go b/controllers/storage_controller.go
@@ -39,8 +39,8 @@ import (
 	"github.com/Azure/azure-service-operator/pkg/errhelp"
 	"github.com/Azure/azure-service-operator/pkg/helpers"
 	"github.com/Azure/azure-service-operator/pkg/resourcemanager/storages"
-	"k8s.io/client-go/tools/record"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/client-go/tools/record"
 )
 
 const storageFinalizerName = "storage.finalizers.azure.com"