Merge branch 'master' into patch/devcont_quickstart

Azure · Oct 11, 2019 · 2268ae6 · 2268ae6
2 parents 4ec4600 + f7dbf3a
commit 2268ae6
Show file tree

Hide file tree

Showing 74 changed files with 1,709 additions and 290 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "go.formatTool": "goimports"
+    "go.formatTool": "goimports",
+    "go.inferGopath": false
 }
diff --git a/Makefile b/Makefile
@@ -184,8 +184,7 @@ ifeq (,$(shell which kubebuilder))
 	curl -sL https://go.kubebuilder.io/dl/2.0.0/$(shell go env GOOS)/$(shell go env GOARCH) | tar -xz -C /tmp/
 	# move to a long-term location and put it on your path
 	# (you'll need to set the KUBEBUILDER_ASSETS env var if you put it somewhere else)
-	# sudo mkdir -p /usr/local/kubebuilder/
-	sudo mv /tmp/kubebuilder_2.0.0_$(shell go env GOOS)_$(shell go env GOARCH) /usr/local/kubebuilder
+	mv /tmp/kubebuilder_2.0.0_$(shell go env GOOS)_$(shell go env GOARCH) /usr/local/kubebuilder
 	export PATH=$$PATH:/usr/local/kubebuilder/bin
 else
 	@echo "kubebuilder has been installed"

diff --git a/PROJECT b/PROJECT
@@ -3,13 +3,13 @@ domain: microsoft.com
 repo: github.com/Azure/azure-service-operator
 resources:
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: Storage
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: CosmosDB
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: RedisCache
 - group: azure
   version: v1
@@ -18,23 +18,23 @@ resources:
   version: v1
   kind: ResourceGroup
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: EventhubNamespace
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: SqlServer
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: SqlDatabase
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: SqlFirewallRule
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: KeyVault
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: ConsumerGroup
 - group: azure
-  version: v1
+  version: v1alpha1
   kind: SqlAction
diff --git a/api/v1/consumergroup_types.go → api/v1alpha1/consumergroup_types.go b/api/v1/consumergroup_types.go → api/v1alpha1/consumergroup_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	helpers "github.com/Azure/azure-service-operator/pkg/helpers"

diff --git a/api/v1/consumergroup_types_test.go → api/v1alpha1/consumergroup_types_test.go b/api/v1/consumergroup_types_test.go → api/v1alpha1/consumergroup_types_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1/cosmosdb_types.go → api/v1alpha1/cosmosdb_types.go b/api/v1/cosmosdb_types.go → api/v1alpha1/cosmosdb_types.go
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE
 */
 
-package v1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1/eventhub_types.go → api/v1alpha1/eventhub_types.go b/api/v1/eventhub_types.go → api/v1alpha1/eventhub_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	helpers "github.com/Azure/azure-service-operator/pkg/helpers"

diff --git a/api/v1/eventhub_types_test.go → api/v1alpha1/eventhub_types_test.go b/api/v1/eventhub_types_test.go → api/v1alpha1/eventhub_types_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1/eventhubnamespace_types.go → api/v1alpha1/eventhubnamespace_types.go b/api/v1/eventhubnamespace_types.go → api/v1alpha1/eventhubnamespace_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	helpers "github.com/Azure/azure-service-operator/pkg/helpers"

diff --git a/api/v1/eventhubnamespace_types_test.go → api/v1alpha1/eventhubnamespace_types_test.go b/api/v1/eventhubnamespace_types_test.go → api/v1alpha1/eventhubnamespace_types_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1/groupversion_info.go → api/v1alpha1/groupversion_info.go b/api/v1/groupversion_info.go → api/v1alpha1/groupversion_info.go
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1 contains API Schema definitions for the azure v1 API group
+// package v1alpha1 contains API Schema definitions for the azure v1alpha1 API group
 // +kubebuilder:object:generate=true
 // +groupName=azure.microsoft.com
-package v1
+package v1alpha1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -25,7 +25,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "azure.microsoft.com", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "azure.microsoft.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1/keyvault_types.go → api/v1alpha1/keyvault_types.go b/api/v1/keyvault_types.go → api/v1alpha1/keyvault_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1/rediscache_types.go → api/v1alpha1/rediscache_types.go b/api/v1/rediscache_types.go → api/v1alpha1/rediscache_types.go
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE
 */
 
-package v1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1/resourcegroup_types.go → api/v1alpha1/resourcegroup_types.go b/api/v1/resourcegroup_types.go → api/v1alpha1/resourcegroup_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	helpers "github.com/Azure/azure-service-operator/pkg/helpers"

diff --git a/api/v1/resourcegroup_types_test.go → api/v1alpha1/resourcegroup_types_test.go b/api/v1/resourcegroup_types_test.go → api/v1alpha1/resourcegroup_types_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1/sqlaction_types.go → api/v1alpha1/sqlaction_types.go b/api/v1/sqlaction_types.go → api/v1alpha1/sqlaction_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1/sqldatabase_types.go → api/v1alpha1/sqldatabase_types.go b/api/v1/sqldatabase_types.go → api/v1alpha1/sqldatabase_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	sql "github.com/Azure/azure-service-operator/pkg/resourcemanager/sqlclient"

diff --git a/api/v1/sqldatabase_types_test.go → api/v1alpha1/sqldatabase_types_test.go b/api/v1/sqldatabase_types_test.go → api/v1alpha1/sqldatabase_types_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1/sqlfirewallrule_types.go → api/v1alpha1/sqlfirewallrule_types.go b/api/v1/sqlfirewallrule_types.go → api/v1alpha1/sqlfirewallrule_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1/sqlserver_types.go → api/v1alpha1/sqlserver_types.go b/api/v1/sqlserver_types.go → api/v1alpha1/sqlserver_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1/sqlserver_types_test.go → api/v1alpha1/sqlserver_types_test.go b/api/v1/sqlserver_types_test.go → api/v1alpha1/sqlserver_types_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1/storage_types.go → api/v1alpha1/storage_types.go b/api/v1/storage_types.go → api/v1alpha1/storage_types.go
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE
 */
 
-package v1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1/suite_test.go → api/v1alpha1/suite_test.go b/api/v1/suite_test.go → api/v1alpha1/suite_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1
+package v1alpha1
 
 import (
 	"path/filepath"