Skip to content

Commit ec609e0

Browse files
committed
Update groupversion_info with recent k8s pattern
Specifically adds the Resource() method which is used by code generated by newer codegen.
1 parent bf3208b commit ec609e0

File tree

5 files changed

+55
-15
lines changed

5 files changed

+55
-15
lines changed

api/v1alpha1/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,18 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/scheme"
2525
)
2626

27-
var (
28-
// SchemeGroupVersion is group version used to register these objects.
29-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha1"}
27+
// GroupName is the group name use in this package.
28+
const GroupName = "infrastructure.cluster.x-k8s.io"
29+
30+
// SchemeGroupVersion is group version used to register these objects.
31+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
3032

33+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
34+
func Resource(resource string) schema.GroupResource {
35+
return SchemeGroupVersion.WithResource(resource).GroupResource()
36+
}
37+
38+
var (
3139
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
3240
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3341

api/v1alpha6/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,18 @@ import (
2121
"sigs.k8s.io/controller-runtime/pkg/scheme"
2222
)
2323

24-
var (
25-
// SchemeGroupVersion is group version used to register these objects.
26-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha6"}
24+
// GroupName is the group name use in this package.
25+
const GroupName = "infrastructure.cluster.x-k8s.io"
26+
27+
// SchemeGroupVersion is group version used to register these objects.
28+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha6"}
2729

30+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
31+
func Resource(resource string) schema.GroupResource {
32+
return SchemeGroupVersion.WithResource(resource).GroupResource()
33+
}
34+
35+
var (
2836
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
2937
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3038

api/v1alpha7/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,18 @@ import (
2121
"sigs.k8s.io/controller-runtime/pkg/scheme"
2222
)
2323

24-
var (
25-
// SchemeGroupVersion is group version used to register these objects.
26-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha7"}
24+
// GroupName is the group name use in this package.
25+
const GroupName = "infrastructure.cluster.x-k8s.io"
26+
27+
// SchemeGroupVersion is group version used to register these objects.
28+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha7"}
2729

30+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
31+
func Resource(resource string) schema.GroupResource {
32+
return SchemeGroupVersion.WithResource(resource).GroupResource()
33+
}
34+
35+
var (
2836
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
2937
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3038

api/v1beta1/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,18 @@ import (
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
)
2727

28-
var (
29-
// SchemeGroupVersion is group version used to register these objects.
30-
SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"}
28+
// GroupName is the group name use in this package.
29+
const GroupName = "infrastructure.cluster.x-k8s.io"
30+
31+
// SchemeGroupVersion is group version used to register these objects.
32+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
3133

34+
// Resource takes an unqualified resource and returns a Group qualified GroupResource.
35+
func Resource(resource string) schema.GroupResource {
36+
return SchemeGroupVersion.WithResource(resource).GroupResource()
37+
}
38+
39+
var (
3240
// schemeBuilder is used to add go types to the GroupVersionKind scheme.
3341
schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3442

orc/api/v1alpha1/groupversion_info.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,18 @@ import (
2525
"sigs.k8s.io/controller-runtime/pkg/scheme"
2626
)
2727

28-
var (
29-
// SchemeGroupVersion is group version used to register these objects
30-
SchemeGroupVersion = schema.GroupVersion{Group: "openstack.k-orc.cloud", Version: "v1alpha1"}
28+
// GroupName is the group name use in this package
29+
const GroupName = "openstack.k-orc.cloud"
30+
31+
// SchemeGroupVersion is group version used to register these objects
32+
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
3133

34+
// Resource takes an unqualified resource and returns a Group qualified GroupResource
35+
func Resource(resource string) schema.GroupResource {
36+
return SchemeGroupVersion.WithResource(resource).GroupResource()
37+
}
38+
39+
var (
3240
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
3341
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
3442

0 commit comments

Comments
 (0)