V1alpha3 conversion

README.md

@@ -56,12 +56,12 @@ Samples are located in the [samples directory](./samples), including:
 
 ## Resources
 
-### ServiceBinding (service.binding/v1alpha2)
+### ServiceBinding (servicebinding.io/v1alpha3)
 
 The `ServiceBinding` resource shape and behavior is defined by the spec.
 
 ```
-apiVersion: service.binding/v1alpha2
+apiVersion: servicebinding.io/v1alpha3
 kind: ServiceBinding
 metadata:
   name: account-db

cmd/manager/main.go

@@ -30,7 +30,7 @@ import (
 
 	labsv1alpha1 "github.com/vmware-labs/service-bindings/pkg/apis/labs/v1alpha1"
 	labsinternalv1alpha1 "github.com/vmware-labs/service-bindings/pkg/apis/labsinternal/v1alpha1"
-	servicebindingv1alpha2 "github.com/vmware-labs/service-bindings/pkg/apis/servicebinding/v1alpha2"
+	servicebindingv1alpha3 "github.com/vmware-labs/service-bindings/pkg/apis/servicebinding/v1alpha3"
 	"github.com/vmware-labs/service-bindings/pkg/reconciler/provisionedservice"
 	"github.com/vmware-labs/service-bindings/pkg/reconciler/servicebinding"
 	"github.com/vmware-labs/service-bindings/pkg/reconciler/servicebindingprojection"
@@ -62,8 +62,8 @@ var (
 )
 var ourTypes = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
 	labsv1alpha1.SchemeGroupVersion.WithKind("ProvisionedService"):                 &labsv1alpha1.ProvisionedService{},
-	servicebindingv1alpha2.SchemeGroupVersion.WithKind("ServiceBinding"):           &servicebindingv1alpha2.ServiceBinding{},
-	servicebindingv1alpha2.SchemeGroupVersion.WithKind("ServiceBindingProjection"): &labsinternalv1alpha1.ServiceBindingProjection{},
+	servicebindingv1alpha3.SchemeGroupVersion.WithKind("ServiceBinding"):           &servicebindingv1alpha3.ServiceBinding{},
+	servicebindingv1alpha3.SchemeGroupVersion.WithKind("ServiceBindingProjection"): &labsinternalv1alpha1.ServiceBindingProjection{},
 }
 
 func NewDefaultingAdmissionController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {

config/200-clusterrole.yaml

@@ -9,6 +9,9 @@ metadata:
     bindings.labs.vmware.com/release: devel
 aggregationRule:
   clusterRoleSelectors:
+  - matchLabels:
+      servicebinding.io/controller: "true"
+  # legacy support
   - matchLabels:
       service.binding/controller: "true"
 rules: [] # Rules are automatically filled in by the controller manager.
@@ -19,7 +22,7 @@ metadata:
   name: service-binding-core
   labels:
     bindings.labs.vmware.com/release: devel
-    service.binding/controller: "true"
+    servicebinding.io/controller: "true"
 rules:
   - apiGroups: [""]
     resources: ["configmaps", "services", "secrets", "events", "namespaces"]
@@ -43,9 +46,9 @@ metadata:
   name: service-binding-crd
   labels:
     bindings.labs.vmware.com/release: devel
-    service.binding/controller: "true"
+    servicebinding.io/controller: "true"
 rules:
-  - apiGroups: ["service.binding"]
+  - apiGroups: ["servicebinding.io"]
     resources: ["*"]
     verbs: ["*"]
   - apiGroups: ["bindings.labs.vmware.com"]
@@ -63,7 +66,7 @@ metadata:
   name: service-binding-apps
   labels:
     bindings.labs.vmware.com/release: devel
-    service.binding/controller: "true"
+    servicebinding.io/controller: "true"
 rules:
   - apiGroups: ["apps"]
     resources: ["deployments", "daemonsets", "statefulsets"]
@@ -80,7 +83,7 @@ metadata:
   name: service-binding-knative-serving
   labels:
     bindings.labs.vmware.com/release: devel
-    service.binding/controller: "true"
+    servicebinding.io/controller: "true"
 rules:
   - apiGroups: ["serving.knative.dev"]
     resources: ["services", "configurations"]
@@ -95,7 +98,7 @@ metadata:
   name: service-binding-kpack
   labels:
     bindings.labs.vmware.com/release: devel
-    service.binding/controller: "true"
+    servicebinding.io/controller: "true"
 rules:
   - apiGroups: ["build.pivotal.io"]
     resources: ["images"]
@@ -109,7 +112,7 @@ metadata:
   name: service-binding-riff
   labels:
     bindings.labs.vmware.com/release: devel
-    service.binding/controller: "true"
+    servicebinding.io/controller: "true"
 rules:
   - apiGroups: ["build.projectriff.io"]
     resources: ["applications", "containers", "functions"]

config/300-provisionedservice.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     bindings.labs.vmware.com/release: devel
     bindings.labs.vmware.com/crd-install: "true"
-    service.binding/provisioned-service: "true"
+    servicebinding.io/provisioned-service: "true"
 spec:
   group: bindings.labs.vmware.com
   names:

config/300-servicebinding.yaml

@@ -4,15 +4,15 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: servicebindings.service.binding
+  name: servicebindings.servicebinding.io
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
   labels:
     bindings.labs.vmware.com/release: devel
     bindings.labs.vmware.com/crd-install: "true"
     duck.knative.dev/binding: "true"
 spec:
-  group: service.binding
+  group: servicebinding.io
   names:
     kind: ServiceBinding
     listKind: ServiceBindingList
@@ -33,7 +33,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1alpha2
+    name: v1alpha3
     schema:
       openAPIV3Schema:
         description: ServiceBinding is the Schema for the servicebindings API

hack/update-codegen.sh

@@ -18,7 +18,7 @@ export GOPATH=${GOPATH:-${TMP_DIR}}
 TMP_REPO_PATH="${TMP_DIR}/src/github.com/vmware-labs/service-bindings"
 mkdir -p "$(dirname "${TMP_REPO_PATH}")" && ln -s "${REPO_ROOT}" "${TMP_REPO_PATH}"
 
-API_GROUPS="labs:v1alpha1 labsinternal:v1alpha1 servicebinding:v1alpha2 duck:v1alpha2"
+API_GROUPS="labs:v1alpha1 labsinternal:v1alpha1 servicebinding:v1alpha3 duck:v1alpha3"
 
 # generate the code with:
 # --output-base    because this script should also be able to run inside the vendor dir of

pkg/apis/duck/v1alpha2/doc.go → pkg/apis/duck/v1alpha3/doc.go

@@ -5,4 +5,4 @@ SPDX-License-Identifier: Apache-2.0
 
 // +k8s:deepcopy-gen=package
 // +groupName=duck.bindings.labs.vmware.com
-package v1alpha2
+package v1alpha3

pkg/apis/duck/v1alpha2/register.go → pkg/apis/duck/v1alpha3/register.go

@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -15,7 +15,7 @@ var (
 	GroupName = "duck.bindings.labs.vmware.com"
 
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
+	SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha3"}
 )
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind

pkg/apis/duck/v1alpha2/serviceable_types.go → pkg/apis/duck/v1alpha3/serviceable_types.go

@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	corev1 "k8s.io/api/core/v1"

pkg/apis/labs/v1alpha1/implements_test.go

@@ -8,12 +8,12 @@ package v1alpha1
 import (
 	"testing"
 
-	duckv1alpha2 "github.com/vmware-labs/service-bindings/pkg/apis/duck/v1alpha2"
+	duckv1alpha3 "github.com/vmware-labs/service-bindings/pkg/apis/duck/v1alpha3"
 	"knative.dev/pkg/apis/duck"
 )
 
 func TestImplementsBinding(t *testing.T) {
-	if err := duck.VerifyType(&ProvisionedService{}, &duckv1alpha2.Serviceable{}); err != nil {
+	if err := duck.VerifyType(&ProvisionedService{}, &duckv1alpha3.Serviceable{}); err != nil {
 		t.Fatal(err)
 	}
 }

pkg/apis/servicebinding/v1alpha2/doc.go → pkg/apis/servicebinding/v1alpha3/doc.go

@@ -4,5 +4,5 @@ SPDX-License-Identifier: Apache-2.0
 */
 
 // +k8s:deepcopy-gen=package
-// +groupName=service.binding
-package v1alpha2
+// +groupName=servicebinding.io
+package v1alpha3

pkg/apis/servicebinding/v1alpha2/register.go → pkg/apis/servicebinding/v1alpha3/register.go

@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -12,13 +12,13 @@ import (
 )
 
 const (
-	GroupName              = "service.binding"
+	GroupName              = "servicebinding.io"
 	ServiceBindingLabelKey = GroupName + "/servicebinding"
 )
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
+	SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha3"}
 )
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind

pkg/apis/servicebinding/v1alpha2/register_test.go → pkg/apis/servicebinding/v1alpha3/register_test.go

@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	"testing"
@@ -12,15 +12,15 @@ import (
 )
 
 func TestRegisterHelpers(t *testing.T) {
-	if got, want := Kind("Foo"), "Foo.service.binding"; got.String() != want {
+	if got, want := Kind("Foo"), "Foo.servicebinding.io"; got.String() != want {
 		t.Errorf("Kind(Foo) = %v, want %v", got.String(), want)
 	}
 
-	if got, want := Resource("Foo"), "Foo.service.binding"; got.String() != want {
+	if got, want := Resource("Foo"), "Foo.servicebinding.io"; got.String() != want {
 		t.Errorf("Resource(Foo) = %v, want %v", got.String(), want)
 	}
 
-	if got, want := SchemeGroupVersion.String(), "service.binding/v1alpha2"; got != want {
+	if got, want := SchemeGroupVersion.String(), "servicebinding.io/v1alpha3"; got != want {
 		t.Errorf("SchemeGroupVersion() = %v, want %v", got, want)
 	}
 

pkg/apis/servicebinding/v1alpha2/servicebinding_lifecycle.go → pkg/apis/servicebinding/v1alpha3/servicebinding_lifecycle.go

@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	"fmt"

pkg/apis/servicebinding/v1alpha2/servicebinding_test.go → pkg/apis/servicebinding/v1alpha3/servicebinding_test.go

@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	"context"
@@ -20,7 +20,7 @@ import (
 )
 
 func TestServiceBinding_GetGroupVersionKind(t *testing.T) {
-	if got, want := (&ServiceBinding{}).GetGroupVersionKind().String(), "service.binding/v1alpha2, Kind=ServiceBinding"; got != want {
+	if got, want := (&ServiceBinding{}).GetGroupVersionKind().String(), "servicebinding.io/v1alpha3, Kind=ServiceBinding"; got != want {
 		t.Errorf("GetGroupVersionKind() = %v, want %v", got, want)
 	}
 }

pkg/apis/servicebinding/v1alpha2/servicebinding_types.go → pkg/apis/servicebinding/v1alpha3/servicebinding_types.go

@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	"context"