Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.

Commit ef0418c

Browse files
authored
Merge pull request #25 from christopherhein/bug/x-k8s-io-domain
Switch to proper x-k8s.io domain
2 parents 6698808 + 7fb58bc commit ef0418c

10 files changed

+18
-18
lines changed

PROJECT

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
domain: cluster.x.k8s.io
2-
layout: go.kubebuilder.io/v2
3-
projectName: capn
1+
domain: cluster.x-k8s.io
2+
layout: go.kubebuilder.io/v3
3+
projectName: cluster-api-provider-nested
44
repo: sigs.k8s.io/cluster-api-provider-nested
55
resources:
66
- group: controlplane

api/v1alpha4/groupversion_info.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
// Package v1alpha4 contains API Schema definitions for the controlplane v1alpha4 API group
1818
// +kubebuilder:object:generate=true
19-
// +groupName=controlplane.cluster.x.k8s.io
19+
// +groupName=controlplane.cluster.x-k8s.io
2020
package v1alpha4
2121

2222
import (
@@ -26,7 +26,7 @@ import (
2626

2727
var (
2828
// GroupVersion is group version used to register these objects
29-
GroupVersion = schema.GroupVersion{Group: "controlplane.cluster.x.k8s.io", Version: "v1alpha4"}
29+
GroupVersion = schema.GroupVersion{Group: "controlplane.cluster.x-k8s.io", Version: "v1alpha4"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
3232
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

config/crd/bases/controlplane.cluster.x.k8s.io_nestedcontrolplanes.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.3.0
88
creationTimestamp: null
9-
name: nestedcontrolplanes.controlplane.cluster.x.k8s.io
9+
name: nestedcontrolplanes.controlplane.cluster.x-k8s.io
1010
spec:
11-
group: controlplane.cluster.x.k8s.io
11+
group: controlplane.cluster.x-k8s.io
1212
names:
1313
kind: NestedControlPlane
1414
listKind: NestedControlPlaneList

config/crd/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- bases/controlplane.cluster.x.k8s.io_nestedcontrolplanes.yaml
5+
- bases/controlplane.cluster.x-k8s.io_nestedcontrolplanes.yaml
66
# +kubebuilder:scaffold:crdkustomizeresource
77

88
patchesStrategicMerge:

config/crd/patches/cainjection_in_nestedcontrolplanes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
8-
name: nestedcontrolplanes.controlplane.cluster.x.k8s.io
8+
name: nestedcontrolplanes.controlplane.cluster.x-k8s.io

config/crd/patches/webhook_in_nestedcontrolplanes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: apiextensions.k8s.io/v1beta1
44
kind: CustomResourceDefinition
55
metadata:
6-
name: nestedcontrolplanes.controlplane.cluster.x.k8s.io
6+
name: nestedcontrolplanes.controlplane.cluster.x-k8s.io
77
spec:
88
conversion:
99
strategy: Webhook

config/rbac/nestedcontrolplane_editor_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: nestedcontrolplane-editor-role
66
rules:
77
- apiGroups:
8-
- controlplane.cluster.x.k8s.io
8+
- controlplane.cluster.x-k8s.io
99
resources:
1010
- nestedcontrolplanes
1111
verbs:
@@ -17,7 +17,7 @@ rules:
1717
- update
1818
- watch
1919
- apiGroups:
20-
- controlplane.cluster.x.k8s.io
20+
- controlplane.cluster.x-k8s.io
2121
resources:
2222
- nestedcontrolplanes/status
2323
verbs:

config/rbac/nestedcontrolplane_viewer_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
name: nestedcontrolplane-viewer-role
66
rules:
77
- apiGroups:
8-
- controlplane.cluster.x.k8s.io
8+
- controlplane.cluster.x-k8s.io
99
resources:
1010
- nestedcontrolplanes
1111
verbs:
1212
- get
1313
- list
1414
- watch
1515
- apiGroups:
16-
- controlplane.cluster.x.k8s.io
16+
- controlplane.cluster.x-k8s.io
1717
resources:
1818
- nestedcontrolplanes/status
1919
verbs:

config/rbac/role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
name: manager-role
88
rules:
99
- apiGroups:
10-
- controlplane.cluster.x.k8s.io
10+
- controlplane.cluster.x-k8s.io
1111
resources:
1212
- nestedcontrolplanes
1313
verbs:
@@ -19,7 +19,7 @@ rules:
1919
- update
2020
- watch
2121
- apiGroups:
22-
- controlplane.cluster.x.k8s.io
22+
- controlplane.cluster.x-k8s.io
2323
resources:
2424
- nestedcontrolplanes/status
2525
verbs:

controllers/nestedcontrolplane_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ type NestedControlPlaneReconciler struct {
3434
Scheme *runtime.Scheme
3535
}
3636

37-
// +kubebuilder:rbac:groups=controlplane.cluster.x.k8s.io,resources=nestedcontrolplanes,verbs=get;list;watch;create;update;patch;delete
38-
// +kubebuilder:rbac:groups=controlplane.cluster.x.k8s.io,resources=nestedcontrolplanes/status,verbs=get;update;patch
37+
// +kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=nestedcontrolplanes,verbs=get;list;watch;create;update;patch;delete
38+
// +kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=nestedcontrolplanes/status,verbs=get;update;patch
3939

4040
func (r *NestedControlPlaneReconciler) Reconcile(_ context.Context, req ctrl.Request) (ctrl.Result, error) {
4141
_ = r.Log.WithValues("nestedcontrolplane", req.NamespacedName)

0 commit comments

Comments
 (0)