Skip to content

Commit 1786b9d

Browse files
rashedkvmrashedkvm
authored
servicebindings.io/v1alpha3 (vmware-tanzu#173)
Change apiVersion from `service.binding/v1alpha2` to `servicebindings.io/v1alpha3`. Refs servicebinding/spec#185
1 parent c893a9f commit 1786b9d

File tree

67 files changed

+375
-368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+375
-368
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ Samples are located in the [samples directory](./samples), including:
5656

5757
## Resources
5858

59-
### ServiceBinding (service.binding/v1alpha2)
59+
### ServiceBinding (servicebinding.io/v1alpha3)
6060

6161
The `ServiceBinding` resource shape and behavior is defined by the spec.
6262

6363
```
64-
apiVersion: service.binding/v1alpha2
64+
apiVersion: servicebinding.io/v1alpha3
6565
kind: ServiceBinding
6666
metadata:
6767
name: account-db

‎cmd/manager/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
labsv1alpha1 "github.com/vmware-labs/service-bindings/pkg/apis/labs/v1alpha1"
3232
labsinternalv1alpha1 "github.com/vmware-labs/service-bindings/pkg/apis/labsinternal/v1alpha1"
33-
servicebindingv1alpha2 "github.com/vmware-labs/service-bindings/pkg/apis/servicebinding/v1alpha2"
33+
servicebindingv1alpha3 "github.com/vmware-labs/service-bindings/pkg/apis/servicebinding/v1alpha3"
3434
"github.com/vmware-labs/service-bindings/pkg/reconciler/provisionedservice"
3535
"github.com/vmware-labs/service-bindings/pkg/reconciler/servicebinding"
3636
"github.com/vmware-labs/service-bindings/pkg/reconciler/servicebindingprojection"
@@ -62,8 +62,8 @@ var (
6262
)
6363
var ourTypes = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
6464
labsv1alpha1.SchemeGroupVersion.WithKind("ProvisionedService"): &labsv1alpha1.ProvisionedService{},
65-
servicebindingv1alpha2.SchemeGroupVersion.WithKind("ServiceBinding"): &servicebindingv1alpha2.ServiceBinding{},
66-
servicebindingv1alpha2.SchemeGroupVersion.WithKind("ServiceBindingProjection"): &labsinternalv1alpha1.ServiceBindingProjection{},
65+
servicebindingv1alpha3.SchemeGroupVersion.WithKind("ServiceBinding"): &servicebindingv1alpha3.ServiceBinding{},
66+
servicebindingv1alpha3.SchemeGroupVersion.WithKind("ServiceBindingProjection"): &labsinternalv1alpha1.ServiceBindingProjection{},
6767
}
6868

6969
func NewDefaultingAdmissionController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {

‎config/200-clusterrole.yaml

+10-7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ metadata:
99
bindings.labs.vmware.com/release: devel
1010
aggregationRule:
1111
clusterRoleSelectors:
12+
- matchLabels:
13+
servicebinding.io/controller: "true"
14+
# legacy support
1215
- matchLabels:
1316
service.binding/controller: "true"
1417
rules: [] # Rules are automatically filled in by the controller manager.
@@ -19,7 +22,7 @@ metadata:
1922
name: service-binding-core
2023
labels:
2124
bindings.labs.vmware.com/release: devel
22-
service.binding/controller: "true"
25+
servicebinding.io/controller: "true"
2326
rules:
2427
- apiGroups: [""]
2528
resources: ["configmaps", "services", "secrets", "events", "namespaces"]
@@ -43,9 +46,9 @@ metadata:
4346
name: service-binding-crd
4447
labels:
4548
bindings.labs.vmware.com/release: devel
46-
service.binding/controller: "true"
49+
servicebinding.io/controller: "true"
4750
rules:
48-
- apiGroups: ["service.binding"]
51+
- apiGroups: ["servicebinding.io"]
4952
resources: ["*"]
5053
verbs: ["*"]
5154
- apiGroups: ["bindings.labs.vmware.com"]
@@ -63,7 +66,7 @@ metadata:
6366
name: service-binding-apps
6467
labels:
6568
bindings.labs.vmware.com/release: devel
66-
service.binding/controller: "true"
69+
servicebinding.io/controller: "true"
6770
rules:
6871
- apiGroups: ["apps"]
6972
resources: ["deployments", "daemonsets", "statefulsets"]
@@ -80,7 +83,7 @@ metadata:
8083
name: service-binding-knative-serving
8184
labels:
8285
bindings.labs.vmware.com/release: devel
83-
service.binding/controller: "true"
86+
servicebinding.io/controller: "true"
8487
rules:
8588
- apiGroups: ["serving.knative.dev"]
8689
resources: ["services", "configurations"]
@@ -95,7 +98,7 @@ metadata:
9598
name: service-binding-kpack
9699
labels:
97100
bindings.labs.vmware.com/release: devel
98-
service.binding/controller: "true"
101+
servicebinding.io/controller: "true"
99102
rules:
100103
- apiGroups: ["build.pivotal.io"]
101104
resources: ["images"]
@@ -109,7 +112,7 @@ metadata:
109112
name: service-binding-riff
110113
labels:
111114
bindings.labs.vmware.com/release: devel
112-
service.binding/controller: "true"
115+
servicebinding.io/controller: "true"
113116
rules:
114117
- apiGroups: ["build.projectriff.io"]
115118
resources: ["applications", "containers", "functions"]

‎config/300-provisionedservice.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
bindings.labs.vmware.com/release: devel
1010
bindings.labs.vmware.com/crd-install: "true"
11-
service.binding/provisioned-service: "true"
11+
servicebinding.io/provisioned-service: "true"
1212
spec:
1313
group: bindings.labs.vmware.com
1414
names:

‎config/300-servicebinding.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
7-
name: servicebindings.service.binding
7+
name: servicebindings.servicebinding.io
88
annotations:
99
controller-gen.kubebuilder.io/version: v0.3.0
1010
labels:
1111
bindings.labs.vmware.com/release: devel
1212
bindings.labs.vmware.com/crd-install: "true"
1313
duck.knative.dev/binding: "true"
1414
spec:
15-
group: service.binding
15+
group: servicebinding.io
1616
names:
1717
kind: ServiceBinding
1818
listKind: ServiceBindingList
@@ -33,7 +33,7 @@ spec:
3333
- jsonPath: .metadata.creationTimestamp
3434
name: Age
3535
type: date
36-
name: v1alpha2
36+
name: v1alpha3
3737
schema:
3838
openAPIV3Schema:
3939
description: ServiceBinding is the Schema for the servicebindings API

‎hack/update-codegen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export GOPATH=${GOPATH:-${TMP_DIR}}
1818
TMP_REPO_PATH="${TMP_DIR}/src/github.com/vmware-labs/service-bindings"
1919
mkdir -p "$(dirname "${TMP_REPO_PATH}")" && ln -s "${REPO_ROOT}" "${TMP_REPO_PATH}"
2020

21-
API_GROUPS="labs:v1alpha1 labsinternal:v1alpha1 servicebinding:v1alpha2 duck:v1alpha2"
21+
API_GROUPS="labs:v1alpha1 labsinternal:v1alpha1 servicebinding:v1alpha3 duck:v1alpha3"
2222

2323
# generate the code with:
2424
# --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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ SPDX-License-Identifier: Apache-2.0
55

66
// +k8s:deepcopy-gen=package
77
// +groupName=duck.bindings.labs.vmware.com
8-
package v1alpha2
8+
package v1alpha3

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
33
SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package v1alpha2
6+
package v1alpha3
77

88
import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -15,7 +15,7 @@ var (
1515
GroupName = "duck.bindings.labs.vmware.com"
1616

1717
// SchemeGroupVersion is group version used to register these objects
18-
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
18+
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha3"}
1919
)
2020

2121
// 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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
33
SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package v1alpha2
6+
package v1alpha3
77

88
import (
99
corev1 "k8s.io/api/core/v1"

‎pkg/apis/duck/v1alpha2/zz_generated.deepcopy.go ‎pkg/apis/duck/v1alpha3/zz_generated.deepcopy.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/labs/v1alpha1/implements_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ package v1alpha1
88
import (
99
"testing"
1010

11-
duckv1alpha2 "github.com/vmware-labs/service-bindings/pkg/apis/duck/v1alpha2"
11+
duckv1alpha3 "github.com/vmware-labs/service-bindings/pkg/apis/duck/v1alpha3"
1212
"knative.dev/pkg/apis/duck"
1313
)
1414

1515
func TestImplementsBinding(t *testing.T) {
16-
if err := duck.VerifyType(&ProvisionedService{}, &duckv1alpha2.Serviceable{}); err != nil {
16+
if err := duck.VerifyType(&ProvisionedService{}, &duckv1alpha3.Serviceable{}); err != nil {
1717
t.Fatal(err)
1818
}
1919
}

‎pkg/apis/labs/v1alpha1/zz_generated.deepcopy.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/labsinternal/v1alpha1/zz_generated.deepcopy.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ SPDX-License-Identifier: Apache-2.0
44
*/
55

66
// +k8s:deepcopy-gen=package
7-
// +groupName=service.binding
8-
package v1alpha2
7+
// +groupName=servicebinding.io
8+
package v1alpha3

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
33
SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package v1alpha2
6+
package v1alpha3
77

88
import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -12,13 +12,13 @@ import (
1212
)
1313

1414
const (
15-
GroupName = "service.binding"
15+
GroupName = "servicebinding.io"
1616
ServiceBindingLabelKey = GroupName + "/servicebinding"
1717
)
1818

1919
var (
2020
// SchemeGroupVersion is group version used to register these objects
21-
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
21+
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha3"}
2222
)
2323

2424
// 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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
33
SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package v1alpha2
6+
package v1alpha3
77

88
import (
99
"testing"
@@ -12,15 +12,15 @@ import (
1212
)
1313

1414
func TestRegisterHelpers(t *testing.T) {
15-
if got, want := Kind("Foo"), "Foo.service.binding"; got.String() != want {
15+
if got, want := Kind("Foo"), "Foo.servicebinding.io"; got.String() != want {
1616
t.Errorf("Kind(Foo) = %v, want %v", got.String(), want)
1717
}
1818

19-
if got, want := Resource("Foo"), "Foo.service.binding"; got.String() != want {
19+
if got, want := Resource("Foo"), "Foo.servicebinding.io"; got.String() != want {
2020
t.Errorf("Resource(Foo) = %v, want %v", got.String(), want)
2121
}
2222

23-
if got, want := SchemeGroupVersion.String(), "service.binding/v1alpha2"; got != want {
23+
if got, want := SchemeGroupVersion.String(), "servicebinding.io/v1alpha3"; got != want {
2424
t.Errorf("SchemeGroupVersion() = %v, want %v", got, want)
2525
}
2626

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
33
SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package v1alpha2
6+
package v1alpha3
77

88
import (
99
"fmt"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
33
SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package v1alpha2
6+
package v1alpha3
77

88
import (
99
"context"
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
func TestServiceBinding_GetGroupVersionKind(t *testing.T) {
23-
if got, want := (&ServiceBinding{}).GetGroupVersionKind().String(), "service.binding/v1alpha2, Kind=ServiceBinding"; got != want {
23+
if got, want := (&ServiceBinding{}).GetGroupVersionKind().String(), "servicebinding.io/v1alpha3, Kind=ServiceBinding"; got != want {
2424
t.Errorf("GetGroupVersionKind() = %v, want %v", got, want)
2525
}
2626
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright 2020 VMware, Inc.
33
SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package v1alpha2
6+
package v1alpha3
77

88
import (
99
"context"

‎pkg/apis/servicebinding/v1alpha2/zz_generated.deepcopy.go ‎pkg/apis/servicebinding/v1alpha3/zz_generated.deepcopy.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)