Revert "Adds shortname to all the CRDs (#1050)"

This reverts commit d46596d.
Azure · May 18, 2020 · 29e1e14 · 29e1e14
1 parent f0d9ada
commit 29e1e14
Show file tree

Hide file tree

Showing 38 changed files with 0 additions and 38 deletions.
diff --git a/api/v1alpha1/apimgmt_types.go b/api/v1alpha1/apimgmt_types.go
@@ -18,7 +18,6 @@ type APIMgmtSpec struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:shortName=apim,path=apimgmt
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type APIMgmtAPI struct {

diff --git a/api/v1alpha1/apimservice_types.go b/api/v1alpha1/apimservice_types.go
@@ -31,7 +31,6 @@ type ApimServiceSpec struct {
 // +kubebuilder:subresource:status
 
 // ApimService is the Schema for the apimservices API
-// +kubebuilder:resource:shortName=apims,path=apimservice
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type ApimService struct {

diff --git a/api/v1alpha1/appinsights_types.go b/api/v1alpha1/appinsights_types.go
@@ -22,7 +22,6 @@ type AppInsightsSpec struct {
 // +kubebuilder:subresource:status
 
 // AppInsights is the Schema for the appinsights API
-// +kubebuilder:resource:shortName=ai,path=appinsights
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AppInsights struct {

diff --git a/api/v1alpha1/azureloadbalancer_types.go b/api/v1alpha1/azureloadbalancer_types.go
@@ -28,7 +28,6 @@ type AzureLoadBalancerSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureLoadBalancer is the Schema for the azureloadbalancers API
-// +kubebuilder:resource:shortName=lb,path=loadbalancer
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureLoadBalancer struct {

diff --git a/api/v1alpha1/azurenetworkinterface_types.go b/api/v1alpha1/azurenetworkinterface_types.go
@@ -25,7 +25,6 @@ type AzureNetworkInterfaceSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureNetworkInterface is the Schema for the azurenetworkinterfaces API
-// +kubebuilder:resource:shortName=ni,path=azurenetworkinterfaces
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureNetworkInterface struct {

diff --git a/api/v1alpha1/azurepublicipaddress_types.go b/api/v1alpha1/azurepublicipaddress_types.go
@@ -26,7 +26,6 @@ type AzurePublicIPAddressSpec struct {
 // +kubebuilder:subresource:status
 
 // AzurePublicIPAddress is the Schema for the azurepublicipaddresses API
-// +kubebuilder:resource:shortName=pipa,path=azurepublicipaddress
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzurePublicIPAddress struct {

diff --git a/api/v1alpha1/azuresqlaction_types.go b/api/v1alpha1/azuresqlaction_types.go
@@ -28,7 +28,6 @@ type AzureSqlActionSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureSqlAction is the Schema for the azuresqlactions API
-// +kubebuilder:resource:shortName=asqla,path=azuresqlaction
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlAction struct {

diff --git a/api/v1alpha1/azuresqldatabase_types.go b/api/v1alpha1/azuresqldatabase_types.go
@@ -26,7 +26,6 @@ type AzureSqlDatabaseSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureSqlDatabase is the Schema for the azuresqldatabases API
-// +kubebuilder:resource:shortName=asqldb,path=azuresqldatabase
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlDatabase struct {

diff --git a/api/v1alpha1/azuresqlfailovergroup_types.go b/api/v1alpha1/azuresqlfailovergroup_types.go
@@ -27,7 +27,6 @@ type AzureSqlFailoverGroupSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureSqlFailoverGroup is the Schema for the azuresqlfailovergroups API
-// +kubebuilder:resource:shortName=asqlfg,path=azuresqlfailovergroup
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlFailoverGroup struct {

diff --git a/api/v1alpha1/azuresqlfirewallrule_types.go b/api/v1alpha1/azuresqlfirewallrule_types.go
@@ -25,7 +25,6 @@ type AzureSqlFirewallRuleSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureSqlFirewallRule is the Schema for the azuresqlfirewallrules API
-// +kubebuilder:resource:shortName=asqlfwr,path=azuresqlfirewallrule
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlFirewallRule struct {

diff --git a/api/v1alpha1/azuresqlserver_types.go b/api/v1alpha1/azuresqlserver_types.go
@@ -24,7 +24,6 @@ type AzureSqlServerSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureSqlServer is the Schema for the azuresqlservers API
-// +kubebuilder:resource:shortName=asqls,path=azuresqlserver
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlServer struct {

diff --git a/api/v1alpha1/azuresqluser_types.go b/api/v1alpha1/azuresqluser_types.go
@@ -31,7 +31,6 @@ type AzureSQLUserSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureSQLUser is the Schema for the sqlusers API
-// +kubebuilder:resource:shortName=asqlu,path=azuresqluser
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSQLUser struct {

diff --git a/api/v1alpha1/azuresqlvnetrule_types.go b/api/v1alpha1/azuresqlvnetrule_types.go
@@ -23,7 +23,6 @@ type AzureSQLVNetRuleSpec struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // AzureSQLVNetRule is the Schema for the azuresqlvnetrules API
-// +kubebuilder:resource:shortName=asqlvn,path=azuresqlvnetrule
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSQLVNetRule struct {

diff --git a/api/v1alpha1/azurevirtualmachine_types.go b/api/v1alpha1/azurevirtualmachine_types.go
@@ -37,7 +37,6 @@ const (
 // +kubebuilder:subresource:status
 
 // AzureVirtualMachine is the Schema for the azurevirtualmachines API
-// +kubebuilder:resource:shortName=vm,path=azurevirtualmachine
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureVirtualMachine struct {

diff --git a/api/v1alpha1/azurevmscaleset_types.go b/api/v1alpha1/azurevmscaleset_types.go
@@ -33,7 +33,6 @@ type AzureVMScaleSetSpec struct {
 // +kubebuilder:subresource:status
 
 // AzureVMScaleSet is the Schema for the azurevmscalesets API
-// +kubebuilder:resource:shortName=vmss,path=azurevmscaleset
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureVMScaleSet struct {

diff --git a/api/v1alpha1/blobcontainer_types.go b/api/v1alpha1/blobcontainer_types.go
@@ -26,7 +26,6 @@ type BlobContainerSpec struct {
 // +kubebuilder:subresource:status
 
 // BlobContainer is the Schema for the blobcontainers API
-// +kubebuilder:resource:shortName=bc,path=blobcontainer
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type BlobContainer struct {

diff --git a/api/v1alpha1/consumergroup_types.go b/api/v1alpha1/consumergroup_types.go
@@ -25,7 +25,6 @@ type ConsumerGroupSpec struct {
 // +kubebuilder:subresource:status
 
 // ConsumerGroup is the Schema for the consumergroups API
-// +kubebuilder:resource:shortName=cg,path=consumergroup
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type ConsumerGroup struct {

diff --git a/api/v1alpha1/cosmosdb_types.go b/api/v1alpha1/cosmosdb_types.go
@@ -78,7 +78,6 @@ type CosmosDBLocation struct {
 // +kubebuilder:subresource:status
 
 // CosmosDB is the Schema for the cosmosdbs API
-// +kubebuilder:resource:shortName=cdb,path=cosmosdb
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type CosmosDB struct {

diff --git a/api/v1alpha1/eventhub_types.go b/api/v1alpha1/eventhub_types.go
@@ -91,7 +91,6 @@ type EventhubProperties struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // Eventhub is the Schema for the eventhubs API
-// +kubebuilder:resource:shortName=eh,path=eventhub
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type Eventhub struct {

diff --git a/api/v1alpha1/eventhubnamespace_types.go b/api/v1alpha1/eventhubnamespace_types.go
@@ -25,7 +25,6 @@ type EventhubNamespaceSpec struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // EventhubNamespace is the Schema for the eventhubnamespaces API
-// +kubebuilder:resource:shortName=ehns,path=eventhubnamespaces
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type EventhubNamespace struct {

diff --git a/api/v1alpha1/keyvault_types.go b/api/v1alpha1/keyvault_types.go
@@ -57,7 +57,6 @@ type Permissions struct {
 // +kubebuilder:subresource:status
 
 // KeyVault is the Schema for the keyvaults API
-// +kubebuilder:resource:shortName=kv,path=keyvault
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type KeyVault struct {

diff --git a/api/v1alpha1/keyvaultkey_types.go b/api/v1alpha1/keyvaultkey_types.go
@@ -27,7 +27,6 @@ type KeyVaultKeySpec struct {
 // +kubebuilder:subresource:status
 
 // KeyVaultKey is the Schema for the keyvaultkeys API
-// +kubebuilder:resource:shortName=kvk,path=keyvaultkey
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type KeyVaultKey struct {

diff --git a/api/v1alpha1/mysqldatabase_types.go b/api/v1alpha1/mysqldatabase_types.go
@@ -20,7 +20,6 @@ type MySQLDatabaseSpec struct {
 // +kubebuilder:subresource:status
 
 // MySQLDatabase is the Schema for the mysqldatabases API
-// +kubebuilder:resource:shortName=mysqldb,path=mysqldatabase
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type MySQLDatabase struct {

diff --git a/api/v1alpha1/mysqlfirewallrule_types.go b/api/v1alpha1/mysqlfirewallrule_types.go
@@ -22,7 +22,6 @@ type MySQLFirewallRuleSpec struct {
 // +kubebuilder:subresource:status
 
 // MySQLFirewallRule is the Schema for the mysqlfirewallrules API
-// +kubebuilder:resource:shortName=mysqlfwr,path=mysqlfirewallrule
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type MySQLFirewallRule struct {

diff --git a/api/v1alpha1/mysqlserver_types.go b/api/v1alpha1/mysqlserver_types.go
@@ -26,7 +26,6 @@ type MySQLServerSpec struct {
 // +kubebuilder:subresource:status
 
 // MySQLServer is the Schema for the mysqlservers API
-// +kubebuilder:resource:shortName=mysqls,path=mysqlserver
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type MySQLServer struct {

diff --git a/api/v1alpha1/mysqlvnetrule_types.go b/api/v1alpha1/mysqlvnetrule_types.go
@@ -25,7 +25,6 @@ type MySQLVNetRuleSpec struct {
 // +kubebuilder:object:root=true
 
 // MySQLVNetRule is the Schema for the mysqlvnetrules API
-// +kubebuilder:resource:shortName=mysqlvn,path=mysqlvnetrule
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type MySQLVNetRule struct {

diff --git a/api/v1alpha1/postgresqldatabase_types.go b/api/v1alpha1/postgresqldatabase_types.go
@@ -22,7 +22,6 @@ type PostgreSQLDatabaseSpec struct {
 // +kubebuilder:subresource:status
 
 // PostgreSQLDatabase is the Schema for the postgresqldatabases API
-// +kubebuilder:resource:shortName=psqldb,path=postgresqldatabase
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type PostgreSQLDatabase struct {

diff --git a/api/v1alpha1/postgresqlfirewallrule_types.go b/api/v1alpha1/postgresqlfirewallrule_types.go
@@ -24,7 +24,6 @@ type PostgreSQLFirewallRuleSpec struct {
 // +kubebuilder:subresource:status
 
 // PostgreSQLFirewallRule is the Schema for the postgresqlfirewallrules API
-// +kubebuilder:resource:shortName=psqlfwr,path=postgresqlfirewallrule
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type PostgreSQLFirewallRule struct {

diff --git a/api/v1alpha1/postgresqlserver_types.go b/api/v1alpha1/postgresqlserver_types.go
@@ -77,7 +77,6 @@ const (
 // +kubebuilder:subresource:status
 
 // PostgreSQLServer is the Schema for the postgresqlservers API
-// +kubebuilder:resource:shortName=psqls,path=postgresqlserver
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type PostgreSQLServer struct {

diff --git a/api/v1alpha1/postgresqlvnetrule_types.go b/api/v1alpha1/postgresqlvnetrule_types.go
@@ -25,7 +25,6 @@ type PostgreSQLVNetRuleSpec struct {
 // +kubebuilder:object:root=true
 
 // PostgreSQLVNetRule is the Schema for the PostgreSQLVNetRules API
-// +kubebuilder:resource:shortName=psqlvn,path=postgresqlvnetrule
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type PostgreSQLVNetRule struct {

diff --git a/api/v1alpha1/rediscache_types.go b/api/v1alpha1/rediscache_types.go
@@ -63,7 +63,6 @@ const (
 // +kubebuilder:subresource:status
 
 // RedisCache is the Schema for the rediscaches API
-// +kubebuilder:resource:shortName=rc,path=rediscache
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type RedisCache struct {

diff --git a/api/v1alpha1/storageaccount_types.go b/api/v1alpha1/storageaccount_types.go
@@ -65,7 +65,6 @@ type StorageAccountAccessTier string
 // +kubebuilder:subresource:status
 
 // StorageAccount is the Schema for the storages API
-// +kubebuilder:resource:shortName=sa,path=storage
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type StorageAccount struct {

diff --git a/api/v1alpha1/virtualnetwork_types.go b/api/v1alpha1/virtualnetwork_types.go
@@ -33,7 +33,6 @@ type VirtualNetworkSpec struct {
 // +kubebuilder:subresource:status
 
 // VirtualNetwork is the Schema for the virtualnetworks API
-// +kubebuilder:resource:shortName=vn,path=virtualnetworks
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type VirtualNetwork struct {

diff --git a/api/v1alpha2/blobcontainer_types.go b/api/v1alpha2/blobcontainer_types.go
@@ -27,7 +27,6 @@ type BlobContainerSpec struct {
 // +kubebuilder:storageversion
 
 // BlobContainer is the Schema for the blobcontainers API
-// +kubebuilder:resource:shortName=bc,path=blobcontainer
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type BlobContainer struct {

diff --git a/api/v1beta1/azuresqldatabase_types.go b/api/v1beta1/azuresqldatabase_types.go
@@ -29,7 +29,6 @@ type AzureSqlDatabaseSpec struct {
 // +kubebuilder:storageversion
 
 // AzureSqlDatabase is the Schema for the azuresqldatabases API
-// +kubebuilder:resource:shortName=asqldb,path=azuresqldatabase
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlDatabase struct {

diff --git a/api/v1beta1/azuresqlfailovergroup_types.go b/api/v1beta1/azuresqlfailovergroup_types.go
@@ -29,7 +29,6 @@ type AzureSqlFailoverGroupSpec struct {
 // +kubebuilder:storageversion
 
 // AzureSqlFailoverGroup is the Schema for the azuresqlfailovergroups API
-// +kubebuilder:resource:shortName=asqlfg,path=azuresqlfailovergroup
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlFailoverGroup struct {

diff --git a/api/v1beta1/azuresqlfirewallrule_types.go b/api/v1beta1/azuresqlfirewallrule_types.go
@@ -26,7 +26,6 @@ type AzureSqlFirewallRuleSpec struct {
 // +kubebuilder:storageversion
 
 // AzureSqlFirewallRule is the Schema for the azuresqlfirewallrules API
-// +kubebuilder:resource:shortName=asqlfwr,path=azuresqlfirewallrule
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlFirewallRule struct {

diff --git a/api/v1beta1/azuresqlserver_types.go b/api/v1beta1/azuresqlserver_types.go
@@ -25,7 +25,6 @@ type AzureSqlServerSpec struct {
 // +kubebuilder:storageversion
 
 // AzureSqlServer is the Schema for the azuresqlservers API
-// +kubebuilder:resource:shortName=asqls,path=azuresqlserver
 // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned"
 // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message"
 type AzureSqlServer struct {