From 4f8a792939e081ca21e70b1b67c5565c4182789a Mon Sep 17 00:00:00 2001 From: jananivMS Date: Mon, 18 May 2020 09:31:32 -0600 Subject: [PATCH 1/2] adding to all version types --- api/v1alpha2/blobcontainer_types.go | 2 +- api/v1alpha2/mysqlserver_types.go | 1 + api/v1alpha2/postgresqlserver_types.go | 1 + api/v1beta1/azuresqldatabase_types.go | 2 +- api/v1beta1/azuresqlfailovergroup_types.go | 2 +- api/v1beta1/azuresqlfirewallrule_types.go | 2 +- api/v1beta1/azuresqlserver_types.go | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/api/v1alpha2/blobcontainer_types.go b/api/v1alpha2/blobcontainer_types.go index 65a09e05cc1..1e5a103797c 100644 --- a/api/v1alpha2/blobcontainer_types.go +++ b/api/v1alpha2/blobcontainer_types.go @@ -27,7 +27,7 @@ type BlobContainerSpec struct { // +kubebuilder:storageversion // BlobContainer is the Schema for the blobcontainers API -// +kubebuilder:resource:shortName=bc,path=blobcontainer +// +kubebuilder:resource:shortName=bc,path=blobcontainers // +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/v1alpha2/mysqlserver_types.go b/api/v1alpha2/mysqlserver_types.go index 56dc56949a7..bd1f6c4bed6 100644 --- a/api/v1alpha2/mysqlserver_types.go +++ b/api/v1alpha2/mysqlserver_types.go @@ -29,6 +29,7 @@ type MySQLServerSpec struct { // +kubebuilder:storageversion // MySQLServer is the Schema for the mysqlservers API +// +kubebuilder:resource:shortName=mysqls,path=mysqlservers // +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/v1alpha2/postgresqlserver_types.go b/api/v1alpha2/postgresqlserver_types.go index e9b0fab6e2a..510a679648a 100644 --- a/api/v1alpha2/postgresqlserver_types.go +++ b/api/v1alpha2/postgresqlserver_types.go @@ -28,6 +28,7 @@ type PostgreSQLServerSpec struct { // +kubebuilder:storageversion // PostgreSQLServer is the Schema for the postgresqlservers API +// +kubebuilder:resource:shortName=psqls,path=postgresqlservers // +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/v1beta1/azuresqldatabase_types.go b/api/v1beta1/azuresqldatabase_types.go index f376e11b318..6a29986fe0b 100644 --- a/api/v1beta1/azuresqldatabase_types.go +++ b/api/v1beta1/azuresqldatabase_types.go @@ -29,7 +29,7 @@ type AzureSqlDatabaseSpec struct { // +kubebuilder:storageversion // AzureSqlDatabase is the Schema for the azuresqldatabases API -// +kubebuilder:resource:shortName=asqldb,path=azuresqldatabase +// +kubebuilder:resource:shortName=asqldb,path=azuresqldatabases // +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 index 1ee26ff028d..6e06d3e9b1a 100644 --- a/api/v1beta1/azuresqlfailovergroup_types.go +++ b/api/v1beta1/azuresqlfailovergroup_types.go @@ -29,7 +29,7 @@ type AzureSqlFailoverGroupSpec struct { // +kubebuilder:storageversion // AzureSqlFailoverGroup is the Schema for the azuresqlfailovergroups API -// +kubebuilder:resource:shortName=asqlfg,path=azuresqlfailovergroup +// +kubebuilder:resource:shortName=asqlfg,path=azuresqlfailovergroups // +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 index d51c4a1fe85..332a1f62e92 100644 --- a/api/v1beta1/azuresqlfirewallrule_types.go +++ b/api/v1beta1/azuresqlfirewallrule_types.go @@ -26,7 +26,7 @@ type AzureSqlFirewallRuleSpec struct { // +kubebuilder:storageversion // AzureSqlFirewallRule is the Schema for the azuresqlfirewallrules API -// +kubebuilder:resource:shortName=asqlfwr,path=azuresqlfirewallrule +// +kubebuilder:resource:shortName=asqlfwr,path=azuresqlfirewallrules // +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 index 7896858e81d..9d42c0f9edb 100644 --- a/api/v1beta1/azuresqlserver_types.go +++ b/api/v1beta1/azuresqlserver_types.go @@ -25,7 +25,7 @@ type AzureSqlServerSpec struct { // +kubebuilder:storageversion // AzureSqlServer is the Schema for the azuresqlservers API -// +kubebuilder:resource:shortName=asqls,path=azuresqlserver +// +kubebuilder:resource:shortName=asqls,path=azuresqlservers // +kubebuilder:printcolumn:name="Provisioned",type="string",JSONPath=".status.provisioned" // +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message" type AzureSqlServer struct { From 056085adf519ee29674973fb7e8c4c13fe397892 Mon Sep 17 00:00:00 2001 From: jananivMS Date: Mon, 18 May 2020 09:32:19 -0600 Subject: [PATCH 2/2] upddated helm charts --- charts/azure-service-operator-0.1.0.tgz | Bin 26174 -> 26174 bytes charts/index.yaml | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/azure-service-operator-0.1.0.tgz b/charts/azure-service-operator-0.1.0.tgz index 732778d8ac7b36fc204acaa0ff4332979796f151..b7321b780ca0cbc53a73684beb4fbf2cc481149e 100644 GIT binary patch delta 27 lcmV+$0ObF^%mKd40g&$n`