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

Switch to proper x-k8s.io domain #25

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
domain: cluster.x.k8s.io
layout: go.kubebuilder.io/v2
projectName: capn
domain: cluster.x-k8s.io
layout: go.kubebuilder.io/v3
projectName: cluster-api-provider-nested
repo: sigs.k8s.io/cluster-api-provider-nested
resources:
- group: controlplane
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha4/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

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

import (
Expand All @@ -26,7 +26,7 @@ import (

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

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: nestedcontrolplanes.controlplane.cluster.x.k8s.io
name: nestedcontrolplanes.controlplane.cluster.x-k8s.io
spec:
group: controlplane.cluster.x.k8s.io
group: controlplane.cluster.x-k8s.io
names:
kind: NestedControlPlane
listKind: NestedControlPlaneList
Expand Down
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/controlplane.cluster.x.k8s.io_nestedcontrolplanes.yaml
- bases/controlplane.cluster.x-k8s.io_nestedcontrolplanes.yaml
# +kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_nestedcontrolplanes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
name: nestedcontrolplanes.controlplane.cluster.x.k8s.io
name: nestedcontrolplanes.controlplane.cluster.x-k8s.io
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_nestedcontrolplanes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: nestedcontrolplanes.controlplane.cluster.x.k8s.io
name: nestedcontrolplanes.controlplane.cluster.x-k8s.io
spec:
conversion:
strategy: Webhook
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/nestedcontrolplane_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: nestedcontrolplane-editor-role
rules:
- apiGroups:
- controlplane.cluster.x.k8s.io
- controlplane.cluster.x-k8s.io
resources:
- nestedcontrolplanes
verbs:
Expand All @@ -17,7 +17,7 @@ rules:
- update
- watch
- apiGroups:
- controlplane.cluster.x.k8s.io
- controlplane.cluster.x-k8s.io
resources:
- nestedcontrolplanes/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/nestedcontrolplane_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ metadata:
name: nestedcontrolplane-viewer-role
rules:
- apiGroups:
- controlplane.cluster.x.k8s.io
- controlplane.cluster.x-k8s.io
resources:
- nestedcontrolplanes
verbs:
- get
- list
- watch
- apiGroups:
- controlplane.cluster.x.k8s.io
- controlplane.cluster.x-k8s.io
resources:
- nestedcontrolplanes/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: manager-role
rules:
- apiGroups:
- controlplane.cluster.x.k8s.io
- controlplane.cluster.x-k8s.io
resources:
- nestedcontrolplanes
verbs:
Expand All @@ -19,7 +19,7 @@ rules:
- update
- watch
- apiGroups:
- controlplane.cluster.x.k8s.io
- controlplane.cluster.x-k8s.io
resources:
- nestedcontrolplanes/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions controllers/nestedcontrolplane_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ type NestedControlPlaneReconciler struct {
Scheme *runtime.Scheme
}

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

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