Merge branch 'master' into haider/Vmbugs

PROJECT

@@ -1,129 +1,128 @@
-version: "2"
 domain: microsoft.com
 repo: github.com/Azure/azure-service-operator
 resources:
 - group: azure
-  version: v1alpha1
   kind: StorageAccount
-- group: azure
   version: v1alpha1
-  kind: CosmosDB
 - group: azure
+  kind: CosmosDB
   version: v1alpha1
-  kind: RedisCache
 - group: azure
+  kind: RedisCache
   version: v1alpha1
-  kind: Eventhub
 - group: azure
+  kind: Eventhub
   version: v1alpha1
-  kind: ResourceGroup
 - group: azure
+  kind: ResourceGroup
   version: v1alpha1
-  kind: EventhubNamespace
 - group: azure
+  kind: EventhubNamespace
   version: v1alpha1
-  kind: AzureSqlServer
 - group: azure
+  kind: AzureSqlServer
   version: v1alpha1
-  kind: AzureSqlDatabase
 - group: azure
+  kind: AzureSqlDatabase
   version: v1alpha1
-  kind: AzureSqlFirewallRule
 - group: azure
+  kind: AzureSqlFirewallRule
   version: v1alpha1
-  kind: KeyVault
 - group: azure
+  kind: KeyVault
   version: v1alpha1
-  kind: ConsumerGroup
 - group: azure
+  kind: ConsumerGroup
   version: v1alpha1
-  kind: AzureSqlAction
 - group: azure
+  kind: AzureSqlAction
   version: v1alpha1
-  kind: BlobContainer
 - group: azure
+  kind: BlobContainer
   version: v1alpha1
-  kind: PostgreSQLServer
 - group: azure
+  kind: PostgreSQLServer
   version: v1alpha1
-  kind: PostgreSQLDatabase
 - group: azure
+  kind: PostgreSQLDatabase
   version: v1alpha1
-  kind: PostgreSQLVNetRule
 - group: azure
+  kind: PostgreSQLVNetRule
   version: v1alpha1
+- group: azure
   kind: PostgreSQLFirewallRule
+  version: v1alpha1
 - group: azure
   kind: PostgreSQLUser
   version: v1alpha1
 - group: azure
   version: v1alpha1
 - group: azure
-  version: v1alpha1
   kind: ApimService
-- group: azure
   version: v1alpha1
-  kind: VirtualNetwork
 - group: azure
+  kind: VirtualNetwork
   version: v1alpha1
-  kind: AzurePublicIPAddress
 - group: azure
+  kind: AzurePublicIPAddress
   version: v1alpha1
-  kind: AzureNetworkInterface
 - group: azure
+  kind: AzureNetworkInterface
   version: v1alpha1
-  kind: AppInsights
 - group: azure
+  kind: AppInsights
   version: v1alpha1
-  kind: KeyVaultKey
 - group: azure
+  kind: KeyVaultKey
   version: v1alpha1
-  kind: AzureSQLVNetRule
 - group: azure
+  kind: AzureSQLVNetRule
   version: v1alpha1
-  kind: MySQLServer
 - group: azure
+  kind: MySQLServer
   version: v1alpha1
-  kind: MySQLDatabase
 - group: azure
+  kind: MySQLDatabase
   version: v1alpha1
-  kind: MySQLFirewallRule
 - group: azure
+  kind: MySQLFirewallRule
   version: v1alpha1
+- group: azure
   kind: MySQLVNetRule
+  version: v1alpha1
 - group: azure
   kind: MySQLUser
   version: v1alpha1
 - group: azure
   kind: AzureVirtualMachine
   version: v1alpha1
 - group: azure
-  version: v1alpha1
   kind: AzureSQLManagedUser
-- group: azure
   version: v1alpha1
-  kind: AzureLoadBalancer
 - group: azure
+  kind: AzureLoadBalancer
   version: v1alpha1
+- group: azure
   kind: AzureVMScaleSet
+  version: v1alpha1
 - group: azure
-  version: v1beta1
   kind: AzureSqlServer
-- group: azure
   version: v1beta1
-  kind: AzureSqlDatabase
 - group: azure
+  kind: AzureSqlDatabase
   version: v1beta1
-  kind: AzureSqlFirewallRule
 - group: azure
+  kind: AzureSqlFirewallRule
   version: v1beta1
+- group: azure
   kind: AzureSqlFailoverGroup
+  version: v1beta1
 - group: azure
-  version: v1alpha2
   kind: BlobContainer
-- group: azure
   version: v1alpha2
+- group: azure
   kind: MySQLServer
+  version: v1alpha2
 - group: azure
   kind: RedisCacheFirewallRule
   version: v1alpha1
@@ -133,4 +132,7 @@ resources:
 - group: azure
   kind: AzureVirtualMachineExtension
   version: v1alpha1
-
+- group: azure
+  kind: AppInsightsApiKey
+  version: v1alpha1
+version: "2"

api/v1alpha1/appinsightsapikey_types.go

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// AppInsightsApiKeySpec defines the desired state of AppInsightsApiKey
+type AppInsightsApiKeySpec struct {
+	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+
+	ResourceGroup         string `json:"resourceGroup"`
+	AppInsights           string `json:"appInsights"`
+	ReadTelemetry         bool   `json:"readTelemetry,omitempty"`
+	WriteAnnotations      bool   `json:"writeAnnotations,omitempty"`
+	AuthSDKControlChannel bool   `json:"authSDKControlChannel,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+
+// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
+// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
+// AppInsightsApiKey is the Schema for the appinsightsapikeys API
+type AppInsightsApiKey struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AppInsightsApiKeySpec `json:"spec,omitempty"`
+	Status ASOStatus             `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// AppInsightsApiKeyList contains a list of AppInsightsApiKey
+type AppInsightsApiKeyList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []AppInsightsApiKey `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&AppInsightsApiKey{}, &AppInsightsApiKeyList{})
+}

api/v1alpha1/keyvault_types.go

@@ -9,7 +9,7 @@ import (
 
 // KeyVaultSpec defines the desired state of KeyVault
 type KeyVaultSpec struct {
-	Location         string               `json:"location"`
+	Location string `json:"location"`
 	// +kubebuilder:validation:Pattern=^[-\w\._\(\)]+$
 	// +kubebuilder:validation:MinLength:1
 	// +kubebuilder:validation:Required
@@ -36,6 +36,9 @@ type AccessPolicyEntry struct {
 	TenantID string `json:"tenantID,omitempty"`
 	// ClientID - The client ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The client ID must be unique for the list of access policies.
 	ClientID string `json:"clientID,omitempty"`
+	// ObjectID is the value to use if the access policy is for a user other than the user creating the Key Vault when the creating user does not have access to the Application API which is used to translate ClientID to Object ID
+	// To get around this, use az-cli or the Azure portal to source the ObjectID from your Service Principal
+	ObjectID string `json:"objectID,omitempty"`
 	// ApplicationID -  Application ID of the client making request on behalf of a principal
 	ApplicationID string `json:"applicationID,omitempty"`
 	// Permissions - Permissions the identity has for keys, secrets, and certificates.