Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Azure/azure-service-operator into…
Browse files Browse the repository at this point in the history
… azdo-pipelines
  • Loading branch information
Jarrod Skulavik committed Apr 22, 2020
2 parents afa9e61 + f7cffbd commit e3dfbee
Show file tree
Hide file tree
Showing 73 changed files with 998 additions and 913 deletions.
3 changes: 3 additions & 0 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ resources:
- group: azure
version: v1alpha1
kind: MySQLFirewallRule
- group: azure
version: v1alpha1
kind: MySQLVNetRule
- group: azure
version: v1alpha1
kind: AzureVirtualMachine
2 changes: 2 additions & 0 deletions api/v1alpha1/apimgmt_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ type APIMgmtSpec struct {

// +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"
type APIMgmtAPI struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/apimservice_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ type ApimServiceSpec struct {
// +kubebuilder:subresource:status

// ApimService is the Schema for the apimservices API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type ApimService struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/appinsights_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ type AppInsightsSpec struct {
// +kubebuilder:subresource:status

// AppInsights is the Schema for the appinsights API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AppInsights struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuredatalakegen2filesystem_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ type AzureDataLakeGen2FileSystemSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// AzureDataLakeGen2FileSystem is the Schema for the azuredatalakegen2filesystems API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureDataLakeGen2FileSystem struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azurenetworkinterface_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type AzureNetworkInterfaceSpec struct {
// +kubebuilder:subresource:status

// AzureNetworkInterface is the Schema for the azurenetworkinterfaces API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureNetworkInterface struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azurepublicipaddress_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ type AzurePublicIPAddressSpec struct {
// +kubebuilder:subresource:status

// AzurePublicIPAddress is the Schema for the azurepublicipaddresses API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzurePublicIPAddress struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuresqlaction_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ type AzureSqlActionSpec struct {
// +kubebuilder:subresource:status

// AzureSqlAction is the Schema for the azuresqlactions API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureSqlAction struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuresqldatabase_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type AzureSqlDatabaseSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// AzureSqlDatabase is the Schema for the azuresqldatabases API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureSqlDatabase struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuresqlfailovergroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ type AzureSqlFailoverGroupSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// AzureSqlFailoverGroup is the Schema for the azuresqlfailovergroups API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureSqlFailoverGroup struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuresqlfirewallrule_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ type AzureSqlFirewallRuleSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// AzureSqlFirewallRule is the Schema for the azuresqlfirewallrules API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureSqlFirewallRule struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuresqlserver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ type AzureSqlServerSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// AzureSqlServer is the Schema for the azuresqlservers API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureSqlServer struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuresqluser_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ type AzureSQLUserSpec struct {
// +kubebuilder:subresource:status

// AzureSQLUser is the Schema for the sqlusers API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureSQLUser struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azuresqlvnetrule_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ type AzureSQLVNetRuleSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// AzureSQLVNetRule is the Schema for the azuresqlvnetrules API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureSQLVNetRule struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/azurevirtualmachine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ const (
// +kubebuilder:subresource:status

// AzureVirtualMachine is the Schema for the azurevirtualmachines API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type AzureVirtualMachine struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/blobcontainer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type BlobContainerSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// BlobContainer is the Schema for the blobcontainers API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type BlobContainer struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/consumergroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type ConsumerGroupSpec struct {
// +kubebuilder:subresource:status

// ConsumerGroup is the Schema for the consumergroups API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type ConsumerGroup struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
3 changes: 3 additions & 0 deletions api/v1alpha1/cosmosdb_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type CosmosDBSpec struct {
Properties CosmosDBProperties `json:"properties,omitempty"`
VirtualNetworkRules *[]CosmosDBVirtualNetworkRule `json:"virtualNetworkRules,omitempty"`
KeyVaultToStoreSecrets string `json:"keyVaultToStoreSecrets,omitempty"`
IPRules *[]string `json:"ipRules,omitempty"`
}

// CosmosDBKind enumerates the values for kind.
Expand Down Expand Up @@ -69,6 +70,8 @@ type CosmosDBLocation struct {
// +kubebuilder:subresource:status

// CosmosDB is the Schema for the cosmosdbs API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type CosmosDB struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/eventhub_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ type EventhubProperties struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// Eventhub is the Schema for the eventhubs API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type Eventhub struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/eventhubnamespace_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type EventhubNamespaceSpec struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// EventhubNamespace is the Schema for the eventhubnamespaces API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type EventhubNamespace struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/keyvault_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ type Permissions struct {
// +kubebuilder:subresource:status

// KeyVault is the Schema for the keyvaults API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type KeyVault struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/keyvaultkey_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ type KeyVaultKeySpec struct {
// +kubebuilder:subresource:status

// KeyVaultKey is the Schema for the keyvaultkeys API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type KeyVaultKey struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/mysqldatabase_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ type MySQLDatabaseSpec struct {
// +kubebuilder:subresource:status

// MySQLDatabase is the Schema for the mysqldatabases API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type MySQLDatabase struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/mysqlfirewallrule_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ type MySQLFirewallRuleSpec struct {
// +kubebuilder:subresource:status

// MySQLFirewallRule is the Schema for the mysqlfirewallrules API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type MySQLFirewallRule struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/mysqlserver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ type MySQLServerSpec struct {
// +kubebuilder:subresource:status

// MySQLServer is the Schema for the mysqlservers API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type MySQLServer struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
47 changes: 47 additions & 0 deletions api/v1alpha1/mysqlvnetrule_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// 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.

// MySQLVNetRuleSpec defines the desired state of MySQLVNetRule
type MySQLVNetRuleSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file
ResourceGroup string `json:"resourceGroup"`
Server string `json:"server"`
VNetResourceGroup string `json:"vNetResourceGroup"`
VNetName string `json:"vNetName"`
SubnetName string `json:"subnetName"`
IgnoreMissingServiceEndpoint bool `json:"ignoreMissingServiceEndpoint,omitempty"`
}

// +kubebuilder:object:root=true

// MySQLVNetRule is the Schema for the mysqlvnetrules API
type MySQLVNetRule struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec MySQLVNetRuleSpec `json:"spec,omitempty"`
Status ASOStatus `json:"status,omitempty"`
}

// +kubebuilder:object:root=true

// MySQLVNetRuleList contains a list of MySQLVNetRule
type MySQLVNetRuleList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []MySQLVNetRule `json:"items"`
}

func init() {
SchemeBuilder.Register(&MySQLVNetRule{}, &MySQLVNetRuleList{})
}
2 changes: 2 additions & 0 deletions api/v1alpha1/postgresqldatabase_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ type PostgreSQLDatabaseSpec struct {
// +kubebuilder:subresource:status

// PostgreSQLDatabase is the Schema for the postgresqldatabases API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type PostgreSQLDatabase struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/postgresqlfirewallrule_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ type PostgreSQLFirewallRuleSpec struct {
// +kubebuilder:subresource:status

// PostgreSQLFirewallRule is the Schema for the postgresqlfirewallrules API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type PostgreSQLFirewallRule struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/postgresqlserver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ const (
// +kubebuilder:subresource:status

// PostgreSQLServer is the Schema for the postgresqlservers API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type PostgreSQLServer struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/rediscache_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ const (
// +kubebuilder:subresource:status

// RedisCache is the Schema for the rediscaches API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type RedisCache struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/resourcegroup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type ResourceGroupSpec struct {
// ResourceGroup is the Schema for the resourcegroups API
// +kubebuilder:resource:shortName=rg,path=resourcegroups
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Provisioning",type="string",JSONPath=".status.provisioning"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type ResourceGroup struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha1/storageaccount_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type StorageAccountSkuName string
// Only one of the following kinds may be specified.
// If none of the following kinds is specified, the default one
// is StorageV2.
// +kubebuilder:validation:Enum=BlobStorage;BlockBlobStorage;FileStorage;StorageAccount;StorageV2
// +kubebuilder:validation:Enum=BlobStorage;BlockBlobStorage;FileStorage;Storage;StorageV2
type StorageAccountKind string

// StorageAccountAccessTier enumerates the values for access tier.
Expand All @@ -65,6 +65,8 @@ type StorageAccountAccessTier string
// +kubebuilder:subresource:status

// StorageAccount is the Schema for the storages API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type StorageAccount struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand All @@ -90,7 +92,6 @@ type StorageAccountAdditionalResources struct {
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status

// StorageAccountList contains a list of Storage
type StorageAccountList struct {
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/virtualnetwork_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ type VirtualNetworkSpec struct {
// +kubebuilder:subresource:status

// VirtualNetwork is the Schema for the virtualnetworks API
// +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
type VirtualNetwork struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
3 changes: 3 additions & 0 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ resources:
- bases/azure.microsoft.com_mysqlfirewallrules.yaml
- bases/azure.microsoft.com_azurepublicipaddresses.yaml
- bases/azure.microsoft.com_azurenetworkinterfaces.yaml
- bases/azure.microsoft.com_mysqlvnetrules.yaml
- bases/azure.microsoft.com_azurevirtualmachines.yaml
# +kubebuilder:scaffold:crdkustomizeresource

Expand Down Expand Up @@ -66,6 +67,7 @@ resources:
#- patches/webhook_in_storageaccounts.yaml
#- patches/webhook_in_azurepublicipaddresses.yaml
#- patches/webhook_in_azurenetworkinterfaces.yaml
#- patches/webhook_in_mysqlvnetrules.yaml
#- patches/webhook_in_azurevirtualmachines.yaml
# +kubebuilder:scaffold:crdkustomizewebhookpatch

Expand Down Expand Up @@ -98,6 +100,7 @@ resources:
#- patches/cainjection_in_storageaccounts.yaml
#- patches/cainjection_in_azurepublicipaddresses.yaml
#- patches/cainjection_in_azurenetworkinterfaces.yaml
#- patches/cainjection_in_mysqlvnetrules.yaml
#- patches/cainjection_in_azurevirtualmachines.yaml
# +kubebuilder:scaffold:crdkustomizecainjectionpatch

Expand Down
8 changes: 8 additions & 0 deletions config/crd/patches/cainjection_in_mysqlvnetrules.yaml
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: mysqlvnetrules.azure.microsoft.com
Loading

0 comments on commit e3dfbee

Please sign in to comment.