-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into azure-pipelines
- Loading branch information
Showing
25 changed files
with
733 additions
and
172 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,127 +1,133 @@ | ||
| version: "2" | ||
| domain: microsoft.com | ||
| repo: github.com/Azure/azure-service-operator | ||
| resources: | ||
| - group: azure | ||
| kind: StorageAccount | ||
| version: v1alpha1 | ||
| kind: StorageAccount | ||
| - group: azure | ||
| kind: CosmosDB | ||
| version: v1alpha1 | ||
| kind: CosmosDB | ||
| - group: azure | ||
| kind: RedisCache | ||
| version: v1alpha1 | ||
| kind: RedisCache | ||
| - group: azure | ||
| kind: Eventhub | ||
| version: v1alpha1 | ||
| kind: Eventhub | ||
| - group: azure | ||
| kind: ResourceGroup | ||
| version: v1alpha1 | ||
| kind: ResourceGroup | ||
| - group: azure | ||
| kind: EventhubNamespace | ||
| version: v1alpha1 | ||
| kind: EventhubNamespace | ||
| - group: azure | ||
| kind: AzureSqlServer | ||
| version: v1alpha1 | ||
| kind: AzureSqlServer | ||
| - group: azure | ||
| kind: AzureSqlDatabase | ||
| version: v1alpha1 | ||
| kind: AzureSqlDatabase | ||
| - group: azure | ||
| kind: AzureSqlFirewallRule | ||
| version: v1alpha1 | ||
| kind: AzureSqlFirewallRule | ||
| - group: azure | ||
| kind: KeyVault | ||
| version: v1alpha1 | ||
| kind: KeyVault | ||
| - group: azure | ||
| kind: ConsumerGroup | ||
| version: v1alpha1 | ||
| kind: ConsumerGroup | ||
| - group: azure | ||
| kind: AzureSqlAction | ||
| version: v1alpha1 | ||
| kind: AzureSqlAction | ||
| - group: azure | ||
| kind: BlobContainer | ||
| version: v1alpha1 | ||
| kind: BlobContainer | ||
| - group: azure | ||
| kind: PostgreSQLServer | ||
| version: v1alpha1 | ||
| kind: PostgreSQLServer | ||
| - group: azure | ||
| kind: PostgreSQLDatabase | ||
| version: v1alpha1 | ||
| kind: PostgreSQLDatabase | ||
| - group: azure | ||
| kind: PostgreSQLVNetRule | ||
| version: v1alpha1 | ||
| kind: PostgreSQLVNetRule | ||
| - group: azure | ||
| kind: PostgreSQLFirewallRule | ||
| version: v1alpha1 | ||
| kind: PostgreSQLFirewallRule | ||
| - group: azure | ||
| kind: APIMgmtAPI | ||
| version: v1alpha1 | ||
| kind: APIMgmtAPI | ||
| - group: azure | ||
| kind: ApimService | ||
| version: v1alpha1 | ||
| kind: ApimService | ||
| - group: azure | ||
| kind: VirtualNetwork | ||
| version: v1alpha1 | ||
| kind: VirtualNetwork | ||
| - group: azure | ||
| kind: AzurePublicIPAddress | ||
| version: v1alpha1 | ||
| kind: AzurePublicIPAddress | ||
| - group: azure | ||
| kind: AzureNetworkInterface | ||
| version: v1alpha1 | ||
| kind: AzureNetworkInterface | ||
| - group: azure | ||
| kind: AppInsights | ||
| version: v1alpha1 | ||
| kind: AppInsights | ||
| - group: azure | ||
| kind: KeyVaultKey | ||
| version: v1alpha1 | ||
| kind: KeyVaultKey | ||
| - group: azure | ||
| kind: AzureSQLVNetRule | ||
| version: v1alpha1 | ||
| kind: AzureSQLVNetRule | ||
| - group: azure | ||
| kind: MySQLServer | ||
| version: v1alpha1 | ||
| kind: MySQLServer | ||
| - group: azure | ||
| kind: MySQLDatabase | ||
| version: v1alpha1 | ||
| kind: MySQLDatabase | ||
| - group: azure | ||
| kind: MySQLFirewallRule | ||
| version: v1alpha1 | ||
| kind: MySQLFirewallRule | ||
| - group: azure | ||
| kind: MySQLVNetRule | ||
| version: v1alpha1 | ||
| kind: MySQLVNetRule | ||
| - group: azure | ||
| kind: AzureVirtualMachine | ||
| version: v1alpha1 | ||
| kind: AzureVirtualMachine | ||
| - group: azure | ||
| kind: AzureSQLManagedUser | ||
| version: v1alpha1 | ||
| kind: AzureSQLManagedUser | ||
| - group: azure | ||
| kind: AzureLoadBalancer | ||
| version: v1alpha1 | ||
| kind: AzureLoadBalancer | ||
| - group: azure | ||
| kind: AzureVMScaleSet | ||
| version: v1alpha1 | ||
| kind: AzureVMScaleSet | ||
| - group: azure | ||
| kind: AzureSqlServer | ||
| version: v1beta1 | ||
| kind: AzureSqlServer | ||
| - group: azure | ||
| kind: AzureSqlDatabase | ||
| version: v1beta1 | ||
| kind: AzureSqlDatabase | ||
| - group: azure | ||
| kind: AzureSqlFirewallRule | ||
| version: v1beta1 | ||
| kind: AzureSqlFirewallRule | ||
| - group: azure | ||
| kind: AzureSqlFailoverGroup | ||
| version: v1beta1 | ||
| kind: AzureSqlFailoverGroup | ||
| - group: azure | ||
| kind: BlobContainer | ||
| version: v1alpha2 | ||
| kind: BlobContainer | ||
| - group: azure | ||
| kind: MySQLServer | ||
| version: v1alpha2 | ||
| kind: MySQLServer | ||
| - group: azure | ||
| kind: RedisCacheFirewallRule | ||
| version: v1alpha1 | ||
| - group: azure | ||
| kind: RedisCacheAction | ||
| version: v1alpha1 | ||
| - group: azure | ||
| kind: AzureVirtualMachineExtension | ||
| version: v1alpha1 | ||
| version: "2" | ||
| - group: azure | ||
| kind: AzureVirtualMachineExtension | ||
| version: v1alpha1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT License. | ||
|
|
||
| package v1alpha1 | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| // +kubebuilder:validation:Enum=rollallkeys;rollprimarykey;rollsecondarykey | ||
| type RedisCacheActionName string | ||
|
|
||
| const ( | ||
| RedisCacheActionNameRollAllKeys RedisCacheActionName = "rollallkeys" | ||
| RedisCacheActionNameRollPrimaryKey RedisCacheActionName = "rollprimarykey" | ||
| RedisCacheActionNameRollSecondaryKey RedisCacheActionName = "rollsecondarykey" | ||
| ) | ||
|
|
||
| // RedisCacheActionSpec defines the desired state of RedisCacheAction | ||
| type RedisCacheActionSpec struct { | ||
| ResourceGroup string `json:"resourceGroup"` | ||
| CacheName string `json:"cacheName"` | ||
| ActionName RedisCacheActionName `json:"actionName"` | ||
| SecretName string `json:"secretName,omitempty"` | ||
| KeyVaultToStoreSecrets string `json:"keyVaultToStoreSecrets,omitempty"` | ||
| } | ||
|
|
||
| // +kubebuilder:object:root=true | ||
| // +kubebuilder:subresource:status | ||
|
|
||
| // RedisCacheAction is the Schema for the rediscacheactions API | ||
| // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned" | ||
| // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message" | ||
| type RedisCacheAction struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
|
||
| Spec RedisCacheActionSpec `json:"spec,omitempty"` | ||
| Status ASOStatus `json:"status,omitempty"` | ||
| } | ||
|
|
||
| // +kubebuilder:object:root=true | ||
|
|
||
| // RedisCacheActionList contains a list of RedisCacheAction | ||
| type RedisCacheActionList struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ListMeta `json:"metadata,omitempty"` | ||
| Items []RedisCacheAction `json:"items"` | ||
| } | ||
|
|
||
| func init() { | ||
| SchemeBuilder.Register(&RedisCacheAction{}, &RedisCacheActionList{}) | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # The following patch adds a directive for certmanager to inject CA into the CRD | ||
| # CRD conversion requires k8s 1.13 or later. | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| certmanager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) | ||
| name: rediscacheactions.azure.microsoft.com |
Oops, something went wrong.