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

 into sp-docs-update

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*       @frodopwns @WilliamMortlMicrosoft @jananivMS @davefellows @theunrepentantgeek @porges @matthchr
+*       @frodopwns @WilliamMortlMicrosoft @jananivMS @davefellows @theunrepentantgeek @porges @matthchr @babbageclunk

Makefile

@@ -97,6 +97,11 @@ test-cleanup-azure-resources:
 		az group delete --name $$rgname --no-wait --yes; \
 	done
 
+	for rgname in `az group list --query "[*].[name]" -o table | grep 'rg-prime$$' `; do \
+		echo "$$rgname will be deleted"; \
+		az group delete --name $$rgname --no-wait --yes; \
+	done
+
 # Build the docker image
 docker-build:
 	docker build . -t ${IMG} ${ARGS}

api/v1alpha1/azurepublicipaddress_types.go

@@ -14,6 +14,7 @@ import (
 type AzurePublicIPAddressSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
 	Location string `json:"location"`
 	// +kubebuilder:validation:Pattern=^[-\w\._\(\)]+$
 	// +kubebuilder:validation:MinLength:1
@@ -23,6 +24,8 @@ type AzurePublicIPAddressSpec struct {
 	IdleTimeoutInMinutes     int    `json:"idleTimeoutInMinutes"`
 	PublicIPAddressVersion   string `json:"publicIPAddressVersion"`
 	SkuName                  string `json:"skuName"`
+	// +optional
+	IPTags map[string]string `json:"ipTags,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1alpha1/azurepublicipaddress_types_test.go

@@ -53,6 +53,7 @@ var _ = Describe("AzurePublicIPAddress", func() {
 					IdleTimeoutInMinutes:     3,
 					PublicIPAddressVersion:   "IPv4",
 					SkuName:                  "Basic",
+					IPTags:                   map[string]string{"TestIpTag": "/Test/VipPool"},
 				}}
 
 			By("creating an API obj")

api/v1alpha1/azuresqldatabase_types.go

@@ -49,7 +49,7 @@ type AzureSqlDatabaseList struct {
 	Items           []AzureSqlDatabase `json:"items"`
 }
 
-// DBEdition - wraps: https://godoc.org/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql#DatabaseEdition
+// DBEdition - wraps: https://godoc.org/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v3.0/sql#DatabaseEdition
 type DBEdition byte
 
 const (

api/v1alpha1/azuresqlfailovergroup_types.go

@@ -50,7 +50,7 @@ type AzureSqlFailoverGroupList struct {
 	Items           []AzureSqlFailoverGroup `json:"items"`
 }
 
-// ReadWriteEndpointFailoverPolicy - wraps https://godoc.org/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2015-05-01-preview/sql#ReadWriteEndpointFailoverPolicy
+// ReadWriteEndpointFailoverPolicy - wraps https://godoc.org/github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v3.0/sql#ReadWriteEndpointFailoverPolicy
 type ReadWriteEndpointFailoverPolicy string
 
 const (

api/v1beta1/azuresqldatabase_types.go

@@ -5,13 +5,41 @@ package v1beta1
 
 import (
 	helpers "github.com/Azure/azure-service-operator/pkg/helpers"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 type DBEdition byte
 
+const (
+	SqlDatabaseEditionBasic          = DBEdition(0)
+	SqlDatabaseEditionDataWarehouse  = DBEdition(3)
+	SqlDatabaseEditionFree           = DBEdition(4)
+	SqlDatabaseEditionGeneralPurpose = DBEdition(5)
+	SqlDatabaseEditionHyperscale     = DBEdition(6)
+	SqlDatabaseEditionPremium        = DBEdition(7)
+	SqlDatabaseEditionStandard       = DBEdition(9)
+	SqlDatabaseEditionStretch        = DBEdition(10)
+)
+
+type SqlDatabaseSku struct {
+	// Name - The name of the SKU, typically, a letter + Number code, e.g. P3.
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinLength:1
+	Name string `json:"name"`
+	// optional
+	// Tier - The tier or edition of the particular SKU, e.g. Basic, Premium.
+	Tier string `json:"tier,omitempty"`
+	// Size - Size of the particular SKU
+	Size string `json:"size,omitempty"`
+	// Family - If the service has different generations of hardware, for the same SKU, then that can be captured here.
+	Family string `json:"family,omitempty"`
+	// Capacity - Capacity of the particular SKU.
+	Capacity *int32 `json:"capacity,omitempty"`
+}
+
 // AzureSqlDatabaseSpec defines the desired state of AzureSqlDatabase
 type AzureSqlDatabaseSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
@@ -20,15 +48,18 @@ type AzureSqlDatabaseSpec struct {
 	// +kubebuilder:validation:Pattern=^[-\w\._\(\)]+$
 	// +kubebuilder:validation:MinLength:1
 	// +kubebuilder:validation:Required
-	ResourceGroup string    `json:"resourceGroup"`
-	Server        string    `json:"server"`
-	Edition       DBEdition `json:"edition"`
-	// optional
-	DbName           string `json:"dbName,omitempty"`
-	WeeklyRetention  string `json:"weeklyRetention,omitempty"`
-	MonthlyRetention string `json:"monthlyRetention,omitempty"`
-	YearlyRetention  string `json:"yearlyRetention,omitempty"`
-	WeekOfYear       int32  `json:"weekOfYear,omitempty"`
+	ResourceGroup string `json:"resourceGroup"`
+	Server        string `json:"server"`
+
+	// +kubebuilder:validation:Optional
+	Edition          DBEdition          `json:"edition"`       // TODO: Remove this in v1beta2
+	Sku              *SqlDatabaseSku    `json:"sku,omitempty"` // TODO: make this required in v1beta2
+	MaxSize          *resource.Quantity `json:"maxSize,omitempty"`
+	DbName           string             `json:"dbName,omitempty"`
+	WeeklyRetention  string             `json:"weeklyRetention,omitempty"`
+	MonthlyRetention string             `json:"monthlyRetention,omitempty"`
+	YearlyRetention  string             `json:"yearlyRetention,omitempty"`
+	WeekOfYear       int32              `json:"weekOfYear,omitempty"`
 }
 
 // +kubebuilder:object:root=true

charts/azure-service-operator/crds/apiextensions.k8s.io_v1beta1_customresourcedefinition_apimgmtapis.azure.microsoft.com.yaml

@@ -28,14 +28,10 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -51,84 +47,64 @@ spec:
             properties:
               properties:
                 apiRevision:
-                  description: APIRevision - Describes the Revision of the Api. If
-                    no value is provided, default revision 1 is created
+                  description: APIRevision - Describes the Revision of the Api. If no value is provided, default revision 1 is created
                   type: string
                 apiRevisionDescription:
                   description: APIRevisionDescription - Description of the Api Revision.
                   type: string
                 apiVersion:
-                  description: APIVersion - Indicates the Version identifier of the
-                    API if the API is versioned
+                  description: APIVersion - Indicates the Version identifier of the API if the API is versioned
                   type: string
                 apiVersionDescription:
                   description: APIVersionDescription - Description of the Api Version.
                   type: string
                 apiVersionSetId:
-                  description: APIVersionSetID - A resource identifier for the related
-                    ApiVersionSet.
+                  description: APIVersionSetID - A resource identifier for the related ApiVersionSet.
                   type: string
                 apiVersionSets:
-                  description: APIVersionSet - APIVersionSetContractDetails an API
-                    Version Set contains the common configuration for a set of API
-                    versions.
+                  description: APIVersionSet - APIVersionSetContractDetails an API Version Set contains the common configuration for a set of API versions.
                   properties:
                     description:
                       description: Description - Description of API Version Set.
                       type: string
                     id:
-                      description: ID - Identifier for existing API Version Set. Omit
-                        this value to create a new Version Set.
+                      description: ID - Identifier for existing API Version Set. Omit this value to create a new Version Set.
                       type: string
                     name:
                       description: Name - The display Name of the API Version Set.
                       type: string
                   type: object
                 description:
-                  description: Description - Description of the API. May include HTML
-                    formatting tags.
+                  description: Description - Description of the API. May include HTML formatting tags.
                   type: string
                 displayName:
-                  description: DisplayName - API name. Must be 1 to 300 characters
-                    long.
+                  description: DisplayName - API name. Must be 1 to 300 characters long.
                   type: string
                 format:
-                  description: " Format - Format of the Content in which the API is
-                    getting imported. Possible values include: \t'WadlXML', 'WadlLinkJSON',
-                    'SwaggerJSON', 'SwaggerLinkJSON', 'Wsdl', 'WsdlLink', 'Openapi',
-                    'Openapijson', 'OpenapiLink'"
+                  description: " Format - Format of the Content in which the API is getting imported. Possible values include: \t'WadlXML', 'WadlLinkJSON', 'SwaggerJSON', 'SwaggerLinkJSON', 'Wsdl', 'WsdlLink', 'Openapi', 'Openapijson', 'OpenapiLink'"
                   type: string
                 isCurrent:
-                  description: IsCurrent - Indicates if API revision is current api
-                    revision.
+                  description: IsCurrent - Indicates if API revision is current api revision.
                   type: boolean
                 isOnline:
-                  description: IsOnline - READ-ONLY; Indicates if API revision is
-                    accessible via the gateway.
+                  description: IsOnline - READ-ONLY; Indicates if API revision is accessible via the gateway.
                   type: boolean
                 path:
-                  description: " Path - Relative URL uniquely identifying this API
-                    and all of its resource paths within the API Management service
-                    instance. \tIt is appended to the API endpoint base URL specified
-                    during the service instance creation to form a public URL for
-                    this API."
+                  description: " Path - Relative URL uniquely identifying this API and all of its resource paths within the API Management service instance. \tIt is appended to the API endpoint base URL specified during the service instance creation to form a public URL for this API."
                   type: string
                 protocols:
-                  description: Protocols - Describes on which protocols the operations
-                    in this API can be invoked.
+                  description: Protocols - Describes on which protocols the operations in this API can be invoked.
                   items:
                     type: string
                   type: array
                 serviceUrl:
-                  description: ServiceURL - Absolute URL of the backend service implementing
-                    this API. Cannot be more than 2000 characters long.
+                  description: ServiceURL - Absolute URL of the backend service implementing this API. Cannot be more than 2000 characters long.
                   type: string
                 sourceApiId:
                   description: SourceAPIID - API identifier of the source API.
                   type: string
                 subscriptionRequired:
-                  description: SubscriptionRequired - Specifies whether an API or
-                    Product subscription is required for accessing the API.
+                  description: SubscriptionRequired - Specifies whether an API or Product subscription is required for accessing the API.
                   type: boolean
               type: object
             resourceGroup:
@@ -142,8 +118,7 @@ spec:
           - resourceGroup
           type: object
         status:
-          description: ASOStatus (AzureServiceOperatorsStatus) defines the observed
-            state of resource actions
+          description: ASOStatus (AzureServiceOperatorsStatus) defines the observed state of resource actions
           properties:
             completed:
               format: date-time

charts/azure-service-operator/crds/apiextensions.k8s.io_v1beta1_customresourcedefinition_apimservices.azure.microsoft.com.yaml

@@ -29,14 +29,10 @@ spec:
       description: ApimService is the Schema for the apimservices API
       properties:
         apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -56,8 +52,7 @@ spec:
             resourceGroup:
               type: string
             tier:
-              description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-                Important: Run "make" to regenerate code after modifying this file'
+              description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "make" to regenerate code after modifying this file'
               type: string
             vnetName:
               type: string
@@ -75,8 +70,7 @@ spec:
           - vnetResourceGroup
           type: object
         status:
-          description: ASOStatus (AzureServiceOperatorsStatus) defines the observed
-            state of resource actions
+          description: ASOStatus (AzureServiceOperatorsStatus) defines the observed state of resource actions
           properties:
             completed:
               format: date-time