Merge branch 'master' into issue#781

Azure · Apr 24, 2020 · 66afef6 · 66afef6
2 parents cb72684 + 7420fd1
commit 66afef6
Show file tree

Hide file tree

Showing 41 changed files with 538 additions and 1,012 deletions.
diff --git a/PROJECT b/PROJECT
@@ -41,9 +41,6 @@ resources:
 - group: azure
   version: v1alpha1
   kind: BlobContainer
-- group: azure
-  version: v1alpha1
-  kind: AzureDataLakeGen2FileSystem
 - group: azure
   version: v1alpha1
   kind: PostgreSQLServer

diff --git a/api/v1alpha1/azuredatalakegen2filesystem_types.go b/api/v1alpha1/azuredatalakegen2filesystem_types.go
diff --git a/api/v1alpha1/cosmosdb_types.go b/api/v1alpha1/cosmosdb_types.go
@@ -45,9 +45,17 @@ type CosmosDBProperties struct {
 	// DatabaseAccountOfferType - The offer type for the Cosmos DB database account.
 	DatabaseAccountOfferType CosmosDBDatabaseAccountOfferType `json:"databaseAccountOfferType,omitempty"`
 	// IsVirtualNetworkFilterEnabled - Flag to indicate whether to enable/disable Virtual Network ACL rules.
-	IsVirtualNetworkFilterEnabled bool   `json:"isVirtualNetworkFilterEnabled,omitempty"`
-	EnableMultipleWriteLocations  bool   `json:"enableMultipleWriteLocations,omitempty"`
-	MongoDBVersion                string `json:"mongoDBVersion,omitempty"`
+	IsVirtualNetworkFilterEnabled bool          `json:"isVirtualNetworkFilterEnabled,omitempty"`
+	EnableMultipleWriteLocations  bool          `json:"enableMultipleWriteLocations,omitempty"`
+	MongoDBVersion                string        `json:"mongoDBVersion,omitempty"`
+	Capabilities                  *[]Capability `json:"capabilities,omitempty"`
+}
+
+// Capability cosmos DB capability object
+type Capability struct {
+	//Name *CosmosCapability `json:"name,omitempty"`
+	// +kubebuilder:validation:Enum=EnableCassandra;EnableTable;EnableGremlin;EnableMongo;
+	Name *string `json:"name,omitempty"`
 }
 
 // +kubebuilder:validation:Enum=Standard

diff --git a/api/v1alpha1/virtualnetwork_types.go b/api/v1alpha1/virtualnetwork_types.go
@@ -14,8 +14,9 @@ import (
 type VNetSubnets struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	SubnetName          string `json:"subnetName"`
-	SubnetAddressPrefix string `json:"subnetAddressPrefix"`
+	SubnetName          string   `json:"subnetName"`
+	SubnetAddressPrefix string   `json:"subnetAddressPrefix"`
+	ServiceEndpoints    []string `json:"serviceEndpoints,omitempty"`
 }
 
 // VirtualNetworkSpec defines the desired state of VirtualNetwork

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -17,7 +17,6 @@ resources:
 - bases/azure.microsoft.com_azuresqlactions.yaml
 - bases/azure.microsoft.com_azuresqlfailovergroups.yaml
 - bases/azure.microsoft.com_blobcontainers.yaml
-- bases/azure.microsoft.com_azuredatalakegen2filesystems.yaml
 - bases/azure.microsoft.com_appinsights.yaml
 - bases/azure.microsoft.com_postgresqlservers.yaml
 - bases/azure.microsoft.com_postgresqldatabases.yaml
@@ -51,7 +50,6 @@ resources:
 #- patches/webhook_in_azuresqlactions.yaml
 #- patches/webhook_in_azuresqlfailovergroups.yaml
 #- patches/webhook_in_blobcontainers.yaml
-#- patches/webhook_in_azuredatalakegen2filesystems.yaml
 #- patches/webhook_in_appinsights.yaml
 #- patches/webhook_in_postgresqlservers.yaml
 #- patches/webhook_in_postgresqldatabases.yaml
@@ -84,7 +82,6 @@ resources:
 #- patches/cainjection_in_azuresqlactions.yaml
 #- patches/cainjection_in_azuresqlfailovergroups.yaml
 #- patches/cainjection_in_blobcontainers.yaml
-#- patches/cainjection_in_azuredatalakegen2filesystems.yaml
 #- patches/cainjection_in_appinsights.yaml
 #- patches/cainjection_in_postgresqlservers.yaml
 #- patches/cainjection_in_postgresqldatabases.yaml

diff --git a/config/crd/patches/cainjection_in_azuredatalakegen2filesystems.yaml b/config/crd/patches/cainjection_in_azuredatalakegen2filesystems.yaml
diff --git a/config/crd/patches/webhook_in_azuredatalakegen2filesystems.yaml b/config/crd/patches/webhook_in_azuredatalakegen2filesystems.yaml
diff --git a/config/samples/azure_v1alpha1_azuredatalakegen2filesystem.yaml b/config/samples/azure_v1alpha1_azuredatalakegen2filesystem.yaml
diff --git a/config/samples/azure_v1alpha1_azuredatalakegen2storage.yaml b/config/samples/azure_v1alpha1_azuredatalakegen2storage.yaml
diff --git a/config/samples/azure_v1alpha1_cosmosdb.yaml b/config/samples/azure_v1alpha1_cosmosdb.yaml
@@ -10,6 +10,13 @@ spec:
     databaseAccountOfferType: Standard
     enableMultipleWriteLocations: false
 
+    # Optionally set the capabilities name to the following options: (the default is SQL)
+    # "EnableCassandra", "EnableTable", "EnableGremlin", "EnableMongo"
+    # NOTE: If using "EnableMongo" kind must be set to MongoDB for this to take effect
+    #capabilities: 
+    # - name: "EnableCassandra"
+
+
     # optionally set the mongoDBVersion to "3.2" or "3.6", if omitted the default is "3.2"
     # NOTE: kind must be set to MongoDB for this to take effect
     # mongoDBVersion: "3.6"

diff --git a/config/samples/azure_v1alpha1_virtualnetwork.yaml b/config/samples/azure_v1alpha1_virtualnetwork.yaml
@@ -11,3 +11,7 @@ spec:
       subnetAddressPrefix: "10.1.0.0/16"
     - subnetName: test2
       subnetAddressPrefix: "10.2.0.0/16"
+      # Optional: enable service endpoints
+      # serviceEndpoints:
+      #   - Microsoft.Storage
+      #   - Microsoft.Sql
diff --git a/controllers/azuredatalakegen2filesystem_controller.go b/controllers/azuredatalakegen2filesystem_controller.go