Revert "Updating version to v1alpha1 from v1"

Makefile

@@ -14,6 +14,18 @@ CRD_OPTIONS ?= "crd:trivialVersions=true"
 
 all: manager
 
+# Generate test certs for development
+generate-test-certs:
+	echo "[req]" > config.txt
+	echo "distinguished_name = req_distinguished_name" >> config.txt
+	echo "[req_distinguished_name]" >> config.txt
+	echo "[SAN]" >> config.txt
+	echo "subjectAltName=DNS:azureoperator-webhook-service.azureoperator-system.svc.cluster.local" >> config.txt
+	openssl req -x509 -days 730 -out tls.crt -keyout tls.key -newkey rsa:4096 -subj "/CN=azureoperator-webhook-service.azureoperator-system" -config config.txt -nodes
+	rm -rf /tmp/k8s-webhook-server
+	mkdir -p /tmp/k8s-webhook-server/serving-certs
+	mv tls.* /tmp/k8s-webhook-server/serving-certs/
+
 # Run API unittests
 api-test: generate fmt vet manifests
 	TEST_USE_EXISTING_CLUSTER=false go test -v -coverprofile=coverage.txt -covermode count ./api/...  2>&1 | tee testlogs.txt

PROJECT

@@ -3,35 +3,35 @@ domain: microsoft.com
 repo: github.com/Azure/azure-service-operator
 resources:
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: Storage
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: CosmosDB
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: RedisCache
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: Eventhub
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: ResourceGroup
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: EventhubNamespace
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: SqlServer
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: SqlDatabase
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: SqlFirewallRule
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: KeyVault
 - group: azure
-  version: v1alpha1
+  version: v1
   kind: ConsumerGroup

api/v1alpha1/consumergroup_types.go → api/v1/consumergroup_types.go

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

api/v1alpha1/consumergroup_types_test.go → api/v1/consumergroup_types_test.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	. "github.com/onsi/ginkgo"

api/v1alpha1/cosmosdb_types.go → api/v1/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 v1alpha1
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/v1alpha1/eventhub_types.go → api/v1/eventhub_types.go

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

api/v1alpha1/eventhub_types_test.go → api/v1/eventhub_types_test.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	. "github.com/onsi/ginkgo"

api/v1alpha1/eventhub_webhook.go → api/v1/eventhub_webhook.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import (
 	eventhubsmanager "github.com/Azure/azure-service-operator/pkg/resourcemanager/eventhubs"

api/v1alpha1/eventhubnamespace_types.go → api/v1/eventhubnamespace_types.go

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

api/v1alpha1/eventhubnamespace_types_test.go → api/v1/eventhubnamespace_types_test.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	. "github.com/onsi/ginkgo"

api/v1alpha1/eventhubnamespace_webhook.go → api/v1/eventhubnamespace_webhook.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import (
 	resoucegroupsresourcemanager "github.com/Azure/azure-service-operator/pkg/resourcemanager/resourcegroups"

api/v1alpha1/groupversion_info.go → api/v1/groupversion_info.go

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the azure v1alpha1 API group
+// Package v1 contains API Schema definitions for the azure v1 API group
 // +kubebuilder:object:generate=true
 // +groupName=azure.microsoft.com
-package v1alpha1
+package v1
 
 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: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "azure.microsoft.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

api/v1alpha1/keyvault_types.go → api/v1/keyvault_types.go

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

api/v1alpha1/rediscache_types.go → api/v1/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 v1alpha1
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/v1alpha1/resourcegroup_types.go → api/v1/resourcegroup_types.go

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

api/v1alpha1/resourcegroup_types_test.go → api/v1/resourcegroup_types_test.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	. "github.com/onsi/ginkgo"

api/v1alpha1/sqldatabase_types.go → api/v1/sqldatabase_types.go

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

api/v1alpha1/sqldatabase_types_test.go → api/v1/sqldatabase_types_test.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	. "github.com/onsi/ginkgo"

api/v1alpha1/sqlfirewallrule_types.go → api/v1/sqlfirewallrule_types.go

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

api/v1alpha1/sqlserver_types.go → api/v1/sqlserver_types.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -26,8 +26,9 @@ import (
 type SqlServerSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	Location      string `json:"location"`
-	ResourceGroup string `json:"resourcegroup,omitempty"`
+	Location                string `json:"location"`
+	ResourceGroup           string `json:"resourcegroup,omitempty"`
+	AllowAzureServiceAccess bool   `json:"allowazureserviceaccess,omitempty"`
 }
 
 // SqlServerStatus defines the observed state of SqlServer

api/v1alpha1/sqlserver_types_test.go → api/v1/sqlserver_types_test.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	. "github.com/onsi/ginkgo"
@@ -59,8 +59,9 @@ var _ = Describe("SqlServer", func() {
 					Namespace: "default",
 				},
 				Spec: SqlServerSpec{
-					Location:      "westus",
-					ResourceGroup: "foo-resourcegroup",
+					Location:                "westus",
+					ResourceGroup:           "foo-resourcegroup",
+					AllowAzureServiceAccess: true,
 				}}
 
 			By("creating an API obj")

api/v1alpha1/storage_types.go → api/v1/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 v1alpha1
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

api/v1alpha1/suite_test.go → api/v1/suite_test.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	"path/filepath"

api/v1alpha1/zz_generated.deepcopy.go → api/v1/zz_generated.deepcopy.go

@@ -17,7 +17,7 @@ limitations under the License.
 
 // autogenerated by controller-gen object, do not modify manually
 
-package v1alpha1
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"

config/crd/bases/azure.microsoft.com_consumergroups.yaml

@@ -421,7 +421,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_cosmosdbs.yaml

@@ -454,7 +454,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_eventhubnamespaces.yaml

@@ -443,7 +443,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_eventhubs.yaml

@@ -519,7 +519,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_keyvaults.yaml

@@ -419,7 +419,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_rediscaches.yaml

@@ -459,7 +459,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_resourcegroups.yaml

@@ -421,7 +421,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_sqldatabases.yaml

@@ -430,7 +430,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/crd/bases/azure.microsoft.com_sqlfirewallrules.yaml

@@ -403,14 +403,16 @@ spec:
           properties:
             endipaddress:
               type: string
-            server:
+            location:
               description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
                 Important: Run "make" to regenerate code after modifying this file'
               type: string
+            resourcegroup:
+              type: string
             startipaddress:
               type: string
           required:
-          - server
+          - location
           type: object
         status:
           description: SqlFirewallRuleStatus defines the observed state of SqlFirewallRule
@@ -425,7 +427,7 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status: