ironcore-dev · damyan · Mar 13, 2024 · Mar 13, 2024
diff --git a/api/ipam/v1alpha1/doc.go b/api/ipam/v1alpha1/doc.go
@@ -3,7 +3,7 @@
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
-// +groupName=ipam.ironcore.dev
+// +groupName=ipam.metal.ironcore.dev
 
 // Package v1alpha1 is the v1alpha1 version of the API.
 package v1alpha1 // import "github.com/ironcore-dev/ipam/api/ipam/v1alpha1"
diff --git a/api/ipam/v1alpha1/groupversion_info.go b/api/ipam/v1alpha1/groupversion_info.go
@@ -3,7 +3,7 @@
 
 // Package v1alpha1 contains API Schema definitions for the ipam v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=ipam.ironcore.dev
+// +groupName=ipam.metal.ironcore.dev
 package v1alpha1
 
 import (
@@ -13,7 +13,7 @@ import (
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "ipam.ironcore.dev", Version: "v1alpha1"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "ipam.metal.ironcore.dev", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}

diff --git a/api/ipam/v1alpha1/ip_webhook.go b/api/ipam/v1alpha1/ip_webhook.go
@@ -33,7 +33,7 @@ func (in *IP) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/validate-ipam-ironcore-dev-v1alpha1-ip,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.ironcore.dev,resources=ips,verbs=create;update;delete,versions=v1alpha1,name=vip.kb.io,admissionReviewVersions={v1,v1beta1}
+// +kubebuilder:webhook:path=/validate-ipam-metal-ironcore-dev-v1alpha1-ip,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.metal.ironcore.dev,resources=ips,verbs=create;update;delete,versions=v1alpha1,name=vip.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &IP{}
 

diff --git a/api/ipam/v1alpha1/network_webhook.go b/api/ipam/v1alpha1/network_webhook.go
@@ -28,7 +28,7 @@ func (in *Network) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/validate-ipam-ironcore-dev-v1alpha1-network,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.ironcore.dev,resources=networks,verbs=create;update;delete,versions=v1alpha1,name=vnetwork.kb.io,admissionReviewVersions={v1,v1beta1}
+// +kubebuilder:webhook:path=/validate-ipam-metal-ironcore-dev-v1alpha1-network,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.metal.ironcore.dev,resources=networks,verbs=create;update;delete,versions=v1alpha1,name=vnetwork.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &Network{}
 

diff --git a/api/ipam/v1alpha1/networkcounter_webhook.go b/api/ipam/v1alpha1/networkcounter_webhook.go
@@ -24,7 +24,7 @@ func (in *NetworkCounter) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/validate-ipam-ironcore-dev-v1alpha1-networkcounter,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.ironcore.dev,resources=networkcounters,verbs=create;update;delete,versions=v1alpha1,name=vnetworkcounter.kb.io,admissionReviewVersions={v1,v1beta1}
+// +kubebuilder:webhook:path=/validate-ipam-metal-ironcore-dev-v1alpha1-networkcounter,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.metal.ironcore.dev,resources=networkcounters,verbs=create;update;delete,versions=v1alpha1,name=vnetworkcounter.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &NetworkCounter{}
 

diff --git a/api/ipam/v1alpha1/subnet_webhook.go b/api/ipam/v1alpha1/subnet_webhook.go
@@ -81,7 +81,7 @@ func (in *Subnet) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/validate-ipam-ironcore-dev-v1alpha1-subnet,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.ironcore.dev,resources=subnets,verbs=create;update;delete,versions=v1alpha1,name=vsubnet.kb.io,admissionReviewVersions={v1,v1beta1}
+// +kubebuilder:webhook:path=/validate-ipam-metal-ironcore-dev-v1alpha1-subnet,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.metal.ironcore.dev,resources=subnets,verbs=create;update;delete,versions=v1alpha1,name=vsubnet.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &Subnet{}
 

diff --git a/charts/ipam/local.yaml b/charts/ipam/local.yaml
@@ -47,28 +47,28 @@ cluster:
 
 crd:
   ip:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: ips
     singular: ip
     kind: IP
     listKind: IPList
     scope: Namespaced
   subnet:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: subnets
     singular: subnet
     kind: Subnet
     listKind: SubnetList
     scope: Namespaced
   network:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: networks
     singular: network
     kind: Network
     listKind: NetworkList
     scope: Namespaced
   networkcounter:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: networkcounters
     singular: networkcounter
     kind: NetworkCounter
@@ -77,4 +77,4 @@ crd:
 
 leaderElection:
   leaderElect: true
-  resourceName: f42c18d5.ironcore.dev
+  resourceName: f42c18d5.ironcore.dev
diff --git a/charts/ipam/values.yaml b/charts/ipam/values.yaml
@@ -47,28 +47,28 @@ cluster:
 
 crd:
   ip:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: ips
     singular: ip
     kind: IP
     listKind: IPList
     scope: Namespaced
   subnet:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: subnets
     singular: subnet
     kind: Subnet
     listKind: SubnetList
     scope: Namespaced
   network:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: networks
     singular: network
     kind: Network
     listKind: NetworkList
     scope: Namespaced
   networkcounter:
-    group: ipam.ironcore.dev
+    group: ipam.metal.ironcore.dev
     plural: networkcounters
     singular: networkcounter
     kind: NetworkCounter
@@ -77,4 +77,4 @@ crd:
 
 leaderElection:
   leaderElect: true
-  resourceName: f42c18d5.ironcore.dev
+  resourceName: f42c18d5.ironcore.dev
diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/ip.go b/clientgo/applyconfiguration/ipam/v1alpha1/ip.go
diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/network.go b/clientgo/applyconfiguration/ipam/v1alpha1/network.go
diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go b/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go
diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go b/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go
diff --git a/clientgo/applyconfiguration/utils.go b/clientgo/applyconfiguration/utils.go
diff --git a/clientgo/informers/generic.go b/clientgo/informers/generic.go
diff --git a/clientgo/ipam/typed/ipam/v1alpha1/ipam_client.go b/clientgo/ipam/typed/ipam/v1alpha1/ipam_client.go
diff --git a/clientgo/openapi/zz_generated.openapi.go b/clientgo/openapi/zz_generated.openapi.go
diff --git a/config/crd/bases/ipam.ironcore.dev_ips.yaml → ...rd/bases/ipam.metal.ironcore.dev_ips.yaml b/config/crd/bases/ipam.ironcore.dev_ips.yaml → ...rd/bases/ipam.metal.ironcore.dev_ips.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: ips.ipam.ironcore.dev
+  name: ips.ipam.metal.ironcore.dev
 spec:
-  group: ipam.ironcore.dev
+  group: ipam.metal.ironcore.dev
   names:
     kind: IP
     listKind: IPList

diff --git a/...es/ipam.ironcore.dev_networkcounters.yaml → ...m.metal.ironcore.dev_networkcounters.yaml b/...es/ipam.ironcore.dev_networkcounters.yaml → ...m.metal.ironcore.dev_networkcounters.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: networkcounters.ipam.ironcore.dev
+  name: networkcounters.ipam.metal.ironcore.dev
 spec:
-  group: ipam.ironcore.dev
+  group: ipam.metal.ironcore.dev
   names:
     kind: NetworkCounter
     listKind: NetworkCounterList

diff --git a/...crd/bases/ipam.ironcore.dev_networks.yaml → ...ses/ipam.metal.ironcore.dev_networks.yaml b/...crd/bases/ipam.ironcore.dev_networks.yaml → ...ses/ipam.metal.ironcore.dev_networks.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: networks.ipam.ironcore.dev
+  name: networks.ipam.metal.ironcore.dev
 spec:
-  group: ipam.ironcore.dev
+  group: ipam.metal.ironcore.dev
   names:
     kind: Network
     listKind: NetworkList

diff --git a/.../crd/bases/ipam.ironcore.dev_subnets.yaml → ...ases/ipam.metal.ironcore.dev_subnets.yaml b/.../crd/bases/ipam.ironcore.dev_subnets.yaml → ...ases/ipam.metal.ironcore.dev_subnets.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: subnets.ipam.ironcore.dev
+  name: subnets.ipam.metal.ironcore.dev
 spec:
-  group: ipam.ironcore.dev
+  group: ipam.metal.ironcore.dev
   names:
     kind: Subnet
     listKind: SubnetList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,10 +2,10 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/ipam.ironcore.dev_ips.yaml
-- bases/ipam.ironcore.dev_subnets.yaml
-- bases/ipam.ironcore.dev_networks.yaml
-- bases/ipam.ironcore.dev_networkcounters.yaml
+- bases/ipam.metal.ironcore.dev_ips.yaml
+- bases/ipam.metal.ironcore.dev_subnets.yaml
+- bases/ipam.metal.ironcore.dev_networks.yaml
+- bases/ipam.metal.ironcore.dev_networkcounters.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_ips.yaml b/config/crd/patches/cainjection_in_ips.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: ips.ipam.ironcore.dev
+  name: ips.ipam.metal.ironcore.dev
diff --git a/config/crd/patches/webhook_in_ips.yaml b/config/crd/patches/webhook_in_ips.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ips.ipam.ironcore.dev
+  name: ips.ipam.metal.ironcore.dev
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/rbac/ip_editor_role.yaml b/config/rbac/ip_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: ip-editor-role
 rules:
 - apiGroups:
-  - ipam.ironcore.dev
+  - ipam.metal.ironcore.dev
   resources:
   - ips
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - ipam.ironcore.dev
+  - ipam.metal.ironcore.dev
   resources:
   - ips/status
   verbs:

diff --git a/config/rbac/ip_viewer_role.yaml b/config/rbac/ip_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: ip-viewer-role
 rules:
 - apiGroups:
-  - ipam.ironcore.dev
+  - ipam.metal.ironcore.dev
   resources:
   - ips
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - ipam.ironcore.dev
+  - ipam.metal.ironcore.dev
   resources:
   - ips/status
   verbs: