diff --git a/api/ipam/v1alpha1/doc.go b/api/ipam/v1alpha1/doc.go index 874f7a5..46255c0 100644 --- 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 index aa21717..58c90c3 100644 --- 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 index b1b0d27..f198a5b 100644 --- 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 index c713b9e..a59cfd7 100644 --- 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 index 7c2bb3e..006afd5 100644 --- 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 index 8acf989..7323e7f 100644 --- 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 index 041eeed..a709423 100644 --- 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 \ No newline at end of file + resourceName: f42c18d5.ironcore.dev diff --git a/charts/ipam/values.yaml b/charts/ipam/values.yaml index 10f7c3a..c69aa58 100644 --- 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 \ No newline at end of file + resourceName: f42c18d5.ironcore.dev diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/ip.go b/clientgo/applyconfiguration/ipam/v1alpha1/ip.go index b6fd85e..7d43a37 100644 --- a/clientgo/applyconfiguration/ipam/v1alpha1/ip.go +++ b/clientgo/applyconfiguration/ipam/v1alpha1/ip.go @@ -30,7 +30,7 @@ func IP(name, namespace string) *IPApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("IP") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b } @@ -66,7 +66,7 @@ func extractIP(iP *ipamv1alpha1.IP, fieldManager string, subresource string) (*I b.WithNamespace(iP.Namespace) b.WithKind("IP") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/network.go b/clientgo/applyconfiguration/ipam/v1alpha1/network.go index 8b49bad..474a143 100644 --- a/clientgo/applyconfiguration/ipam/v1alpha1/network.go +++ b/clientgo/applyconfiguration/ipam/v1alpha1/network.go @@ -30,7 +30,7 @@ func Network(name, namespace string) *NetworkApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("Network") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b } @@ -66,7 +66,7 @@ func extractNetwork(network *ipamv1alpha1.Network, fieldManager string, subresou b.WithNamespace(network.Namespace) b.WithKind("Network") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go b/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go index 8afde39..216d30b 100644 --- a/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go +++ b/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go @@ -30,7 +30,7 @@ func NetworkCounter(name, namespace string) *NetworkCounterApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("NetworkCounter") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b } @@ -66,7 +66,7 @@ func extractNetworkCounter(networkCounter *ipamv1alpha1.NetworkCounter, fieldMan b.WithNamespace(networkCounter.Namespace) b.WithKind("NetworkCounter") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go b/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go index cbf6e4b..d3828db 100644 --- a/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go +++ b/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go @@ -30,7 +30,7 @@ func Subnet(name, namespace string) *SubnetApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("Subnet") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b } @@ -66,7 +66,7 @@ func extractSubnet(subnet *ipamv1alpha1.Subnet, fieldManager string, subresource b.WithNamespace(subnet.Namespace) b.WithKind("Subnet") - b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") + b.WithAPIVersion("ipam.metal.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/utils.go b/clientgo/applyconfiguration/utils.go index e00078d..6c7a309 100644 --- a/clientgo/applyconfiguration/utils.go +++ b/clientgo/applyconfiguration/utils.go @@ -17,7 +17,7 @@ import ( // apply configuration type exists for the given GroupVersionKind. func ForKind(kind schema.GroupVersionKind) interface{} { switch kind { - // Group=ipam.ironcore.dev, Version=v1alpha1 + // Group=ipam.metal.ironcore.dev, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithKind("IP"): return &ipamv1alpha1.IPApplyConfiguration{} case v1alpha1.SchemeGroupVersion.WithKind("IPSpec"): diff --git a/clientgo/informers/generic.go b/clientgo/informers/generic.go index 4848dad..a0cc40f 100644 --- a/clientgo/informers/generic.go +++ b/clientgo/informers/generic.go @@ -39,7 +39,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=ipam.ironcore.dev, Version=v1alpha1 + // Group=ipam.metal.ironcore.dev, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithResource("ips"): return &genericInformer{resource: resource.GroupResource(), informer: f.Ipam().V1alpha1().IPs().Informer()}, nil case v1alpha1.SchemeGroupVersion.WithResource("networks"): diff --git a/clientgo/ipam/typed/ipam/v1alpha1/ipam_client.go b/clientgo/ipam/typed/ipam/v1alpha1/ipam_client.go index b85c053..e48c1c5 100644 --- a/clientgo/ipam/typed/ipam/v1alpha1/ipam_client.go +++ b/clientgo/ipam/typed/ipam/v1alpha1/ipam_client.go @@ -21,7 +21,7 @@ type IpamV1alpha1Interface interface { SubnetsGetter } -// IpamV1alpha1Client is used to interact with features provided by the ipam.ironcore.dev group. +// IpamV1alpha1Client is used to interact with features provided by the ipam.metal.ironcore.dev group. type IpamV1alpha1Client struct { restClient rest.Interface } diff --git a/clientgo/openapi/zz_generated.openapi.go b/clientgo/openapi/zz_generated.openapi.go index 470686f..e414b2c 100644 --- a/clientgo/openapi/zz_generated.openapi.go +++ b/clientgo/openapi/zz_generated.openapi.go @@ -8009,7 +8009,7 @@ func schema_k8sio_api_core_v1_PersistentVolumeStatus(ref common.ReferenceCallbac }, "lastPhaseTransitionTime": { SchemaProps: spec.SchemaProps{ - Description: "lastPhaseTransitionTime is the time the phase transitioned from one to another and automatically resets to current time everytime a volume phase transitions. This is an alpha field and requires enabling PersistentVolumeLastPhaseTransitionTime feature.", + Description: "lastPhaseTransitionTime is the time the phase transitioned from one to another and automatically resets to current time everytime a volume phase transitions. This is a beta field and requires the PersistentVolumeLastPhaseTransitionTime feature to be enabled (enabled by default).", Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, diff --git a/config/crd/bases/ipam.ironcore.dev_ips.yaml b/config/crd/bases/ipam.metal.ironcore.dev_ips.yaml similarity index 98% rename from config/crd/bases/ipam.ironcore.dev_ips.yaml rename to config/crd/bases/ipam.metal.ironcore.dev_ips.yaml index f150034..8ffa023 100644 --- a/config/crd/bases/ipam.ironcore.dev_ips.yaml +++ b/config/crd/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/config/crd/bases/ipam.ironcore.dev_networkcounters.yaml b/config/crd/bases/ipam.metal.ironcore.dev_networkcounters.yaml similarity index 96% rename from config/crd/bases/ipam.ironcore.dev_networkcounters.yaml rename to config/crd/bases/ipam.metal.ironcore.dev_networkcounters.yaml index bf60089..92c6d13 100644 --- a/config/crd/bases/ipam.ironcore.dev_networkcounters.yaml +++ b/config/crd/bases/ipam.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/config/crd/bases/ipam.ironcore.dev_networks.yaml b/config/crd/bases/ipam.metal.ironcore.dev_networks.yaml similarity index 98% rename from config/crd/bases/ipam.ironcore.dev_networks.yaml rename to config/crd/bases/ipam.metal.ironcore.dev_networks.yaml index f798eac..e6397f6 100644 --- a/config/crd/bases/ipam.ironcore.dev_networks.yaml +++ b/config/crd/bases/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/config/crd/bases/ipam.ironcore.dev_subnets.yaml b/config/crd/bases/ipam.metal.ironcore.dev_subnets.yaml similarity index 99% rename from config/crd/bases/ipam.ironcore.dev_subnets.yaml rename to config/crd/bases/ipam.metal.ironcore.dev_subnets.yaml index 3061b4c..8e9d616 100644 --- a/config/crd/bases/ipam.ironcore.dev_subnets.yaml +++ b/config/crd/bases/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 index bf99962..0f79c8c 100644 --- 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 index 92e4b67..e93e820 100644 --- 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 index 7855bad..5817194 100644 --- 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 index 1f34c22..3e43523 100644 --- 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 index b2754f7..0d2b5a2 100644 --- a/config/rbac/ip_viewer_role.yaml +++ b/config/rbac/ip_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: ip-viewer-role rules: - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - ips verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - ips/status verbs: diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 52dcaf6..693e6ea 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -20,7 +20,7 @@ rules: - create - patch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - ips verbs: @@ -32,13 +32,13 @@ rules: - update - watch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - ips/finalizers verbs: - update - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - ips/status verbs: @@ -46,7 +46,7 @@ rules: - patch - update - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - networkcounters verbs: @@ -58,13 +58,13 @@ rules: - update - watch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - networkcounters/finalizers verbs: - update - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - networkcounters/status verbs: @@ -72,7 +72,7 @@ rules: - patch - update - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - networks verbs: @@ -84,13 +84,13 @@ rules: - update - watch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - networks/finalizers verbs: - update - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - networks/status verbs: @@ -98,7 +98,7 @@ rules: - patch - update - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - subnets verbs: @@ -110,13 +110,13 @@ rules: - update - watch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - subnets/finalizers verbs: - update - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - subnets/status verbs: diff --git a/config/samples/ipam_v1alpha1_geneve_network.yaml b/config/samples/ipam_v1alpha1_geneve_network.yaml index 358cbe5..c9c0239 100644 --- a/config/samples/ipam_v1alpha1_geneve_network.yaml +++ b/config/samples/ipam_v1alpha1_geneve_network.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Network metadata: name: geneve-network-sample diff --git a/config/samples/ipam_v1alpha1_ipv4_child_bits_subnet.yaml b/config/samples/ipam_v1alpha1_ipv4_child_bits_subnet.yaml index 34c4a14..0199621 100644 --- a/config/samples/ipam_v1alpha1_ipv4_child_bits_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_child_bits_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-child-bits-subnet-sample @@ -10,4 +10,4 @@ spec: - name: euw availabilityZones: - a - - b \ No newline at end of file + - b diff --git a/config/samples/ipam_v1alpha1_ipv4_child_capacity_subnet.yaml b/config/samples/ipam_v1alpha1_ipv4_child_capacity_subnet.yaml index a3de8b8..172715e 100644 --- a/config/samples/ipam_v1alpha1_ipv4_child_capacity_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_child_capacity_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-child-capacity-subnet-sample @@ -10,4 +10,4 @@ spec: - name: euw availabilityZones: - a - - b \ No newline at end of file + - b diff --git a/config/samples/ipam_v1alpha1_ipv4_child_cidr_subnet.yaml b/config/samples/ipam_v1alpha1_ipv4_child_cidr_subnet.yaml index f5dae07..6c18d57 100644 --- a/config/samples/ipam_v1alpha1_ipv4_child_cidr_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_child_cidr_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-child-cidr-subnet-sample @@ -10,4 +10,4 @@ spec: - name: euw availabilityZones: - a - - b \ No newline at end of file + - b diff --git a/config/samples/ipam_v1alpha1_ipv4_ip.yaml b/config/samples/ipam_v1alpha1_ipv4_ip.yaml index 3366de6..d67cd8e 100644 --- a/config/samples/ipam_v1alpha1_ipv4_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_ip.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv4-ip-sample diff --git a/config/samples/ipam_v1alpha1_ipv4_ip_ip.yaml b/config/samples/ipam_v1alpha1_ipv4_ip_ip.yaml index ecfce78..ade2bf3 100644 --- a/config/samples/ipam_v1alpha1_ipv4_ip_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_ip_ip.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv4-ip-ip-sample diff --git a/config/samples/ipam_v1alpha1_ipv4_parent_cidr_subnet.yaml b/config/samples/ipam_v1alpha1_ipv4_parent_cidr_subnet.yaml index 587e91d..6049652 100644 --- a/config/samples/ipam_v1alpha1_ipv4_parent_cidr_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_parent_cidr_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-parent-cidr-subnet-sample @@ -10,4 +10,4 @@ spec: availabilityZones: - a - b - - c \ No newline at end of file + - c diff --git a/config/samples/ipam_v1alpha1_ipv4_resource_and_ip_ip.yaml b/config/samples/ipam_v1alpha1_ipv4_resource_and_ip_ip.yaml index 5211612..8c197e6 100644 --- a/config/samples/ipam_v1alpha1_ipv4_resource_and_ip_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_resource_and_ip_ip.yaml @@ -1,11 +1,11 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv4-resource-and-ip-ip-sample spec: subnetName: ipv4-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.ironcore.dev/v1alpha1 + apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: NetworkCounter name: referred-networkcounter-sample ip: 10.0.0.2 diff --git a/config/samples/ipam_v1alpha1_ipv4_resource_ip.yaml b/config/samples/ipam_v1alpha1_ipv4_resource_ip.yaml index 8ed4e6f..9b27579 100644 --- a/config/samples/ipam_v1alpha1_ipv4_resource_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_resource_ip.yaml @@ -1,10 +1,10 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv4-resource-ip-sample spec: subnetName: ipv4-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.ironcore.dev/v1alpha1 + apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: NetworkCounter name: referred-networkcounter-sample diff --git a/config/samples/ipam_v1alpha1_ipv6_child_bits_subnet.yaml b/config/samples/ipam_v1alpha1_ipv6_child_bits_subnet.yaml index 762add3..52c22fc 100644 --- a/config/samples/ipam_v1alpha1_ipv6_child_bits_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_child_bits_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-child-bits-subnet-sample @@ -10,4 +10,4 @@ spec: - name: euw availabilityZones: - a - - b \ No newline at end of file + - b diff --git a/config/samples/ipam_v1alpha1_ipv6_child_capacity_subnet.yaml b/config/samples/ipam_v1alpha1_ipv6_child_capacity_subnet.yaml index 4199588..9d87448 100644 --- a/config/samples/ipam_v1alpha1_ipv6_child_capacity_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_child_capacity_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-child-capacity-subnet-sample @@ -10,4 +10,4 @@ spec: - name: euw availabilityZones: - a - - b \ No newline at end of file + - b diff --git a/config/samples/ipam_v1alpha1_ipv6_child_cidr_subnet.yaml b/config/samples/ipam_v1alpha1_ipv6_child_cidr_subnet.yaml index 80c7b18..fe7a744 100644 --- a/config/samples/ipam_v1alpha1_ipv6_child_cidr_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_child_cidr_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-child-cidr-subnet-sample @@ -10,4 +10,4 @@ spec: - name: euw availabilityZones: - a - - b \ No newline at end of file + - b diff --git a/config/samples/ipam_v1alpha1_ipv6_ip.yaml b/config/samples/ipam_v1alpha1_ipv6_ip.yaml index c358e19..c70f3b9 100644 --- a/config/samples/ipam_v1alpha1_ipv6_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_ip.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv6-ip-sample diff --git a/config/samples/ipam_v1alpha1_ipv6_ip_ip.yaml b/config/samples/ipam_v1alpha1_ipv6_ip_ip.yaml index 35e7070..fbb3bd4 100644 --- a/config/samples/ipam_v1alpha1_ipv6_ip_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_ip_ip.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv6-ip-ip-sample diff --git a/config/samples/ipam_v1alpha1_ipv6_parent_cidr_subnet.yaml b/config/samples/ipam_v1alpha1_ipv6_parent_cidr_subnet.yaml index b54b305..51a3422 100644 --- a/config/samples/ipam_v1alpha1_ipv6_parent_cidr_subnet.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_parent_cidr_subnet.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-parent-cidr-subnet-sample @@ -10,4 +10,4 @@ spec: availabilityZones: - a - b - - c \ No newline at end of file + - c diff --git a/config/samples/ipam_v1alpha1_ipv6_resource_and_ip_ip.yaml b/config/samples/ipam_v1alpha1_ipv6_resource_and_ip_ip.yaml index e06519b..72a8ded 100644 --- a/config/samples/ipam_v1alpha1_ipv6_resource_and_ip_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_resource_and_ip_ip.yaml @@ -1,11 +1,11 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv6-resource-and-ip-ip-sample spec: subnetName: ipv6-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.ironcore.dev/v1alpha1 + apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: NetworkCounter name: referred-networkcounter-sample ip: fd34:5d8f:e75e:f3a2::0002 diff --git a/config/samples/ipam_v1alpha1_ipv6_resource_ip.yaml b/config/samples/ipam_v1alpha1_ipv6_resource_ip.yaml index cdbad35..1f91791 100644 --- a/config/samples/ipam_v1alpha1_ipv6_resource_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_resource_ip.yaml @@ -1,10 +1,10 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv6-resource-ip-sample spec: subnetName: ipv6-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.ironcore.dev/v1alpha1 + apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: NetworkCounter name: referred-networkcounter-sample diff --git a/config/samples/ipam_v1alpha1_mpls_network.yaml b/config/samples/ipam_v1alpha1_mpls_network.yaml index 0105d68..0e73faa 100644 --- a/config/samples/ipam_v1alpha1_mpls_network.yaml +++ b/config/samples/ipam_v1alpha1_mpls_network.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Network metadata: name: mpls-network-sample diff --git a/config/samples/ipam_v1alpha1_network.yaml b/config/samples/ipam_v1alpha1_network.yaml index 5ff3281..4aa5ace 100644 --- a/config/samples/ipam_v1alpha1_network.yaml +++ b/config/samples/ipam_v1alpha1_network.yaml @@ -1,6 +1,6 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Network metadata: name: network-sample spec: - description: sample \ No newline at end of file + description: sample diff --git a/config/samples/ipam_v1alpha1_referred_networkcounter.yaml b/config/samples/ipam_v1alpha1_referred_networkcounter.yaml index e954e61..75e27bb 100644 --- a/config/samples/ipam_v1alpha1_referred_networkcounter.yaml +++ b/config/samples/ipam_v1alpha1_referred_networkcounter.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: NetworkCounter metadata: name: referred-networkcounter-sample diff --git a/config/samples/ipam_v1alpha1_vxlan_network.yaml b/config/samples/ipam_v1alpha1_vxlan_network.yaml index 65acf53..237efac 100644 --- a/config/samples/ipam_v1alpha1_vxlan_network.yaml +++ b/config/samples/ipam_v1alpha1_vxlan_network.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Network metadata: name: vxlan-network-sample diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 4dbddc5..212e062 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -11,12 +11,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-ipam-ironcore-dev-v1alpha1-ip + path: /validate-ipam-metal-ironcore-dev-v1alpha1-ip failurePolicy: Fail name: vip.kb.io rules: - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev apiVersions: - v1alpha1 operations: @@ -33,12 +33,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-ipam-ironcore-dev-v1alpha1-network + path: /validate-ipam-metal-ironcore-dev-v1alpha1-network failurePolicy: Fail name: vnetwork.kb.io rules: - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev apiVersions: - v1alpha1 operations: @@ -55,12 +55,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-ipam-ironcore-dev-v1alpha1-networkcounter + path: /validate-ipam-metal-ironcore-dev-v1alpha1-networkcounter failurePolicy: Fail name: vnetworkcounter.kb.io rules: - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev apiVersions: - v1alpha1 operations: @@ -77,12 +77,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-ipam-ironcore-dev-v1alpha1-subnet + path: /validate-ipam-metal-ironcore-dev-v1alpha1-subnet failurePolicy: Fail name: vsubnet.kb.io rules: - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev apiVersions: - v1alpha1 operations: diff --git a/controllers/ip_controller.go b/controllers/ip_controller.go index 34ec753..9d35d16 100644 --- a/controllers/ip_controller.go +++ b/controllers/ip_controller.go @@ -22,7 +22,7 @@ import ( ) const ( - CIPFinalizer = "ip.ipam.ironcore.dev/finalizer" + CIPFinalizer = "ip.ipam.metal.ironcore.dev/finalizer" CIPReservationFailureReason = "IPReservationFailure" CIPProposalFailureReason = "IPProposalFailure" @@ -40,9 +40,9 @@ type IPReconciler struct { // +kubebuilder:rbac:groups=*,resources=*,verbs=get;list;watch // +kubebuilder:rbac:groups=*,resources=events,verbs=create;patch -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=ips,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=ips/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=ips/finalizers,verbs=update +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=ips,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=ips/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=ips/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/network_controller.go b/controllers/network_controller.go index 139b8fe..bf73afd 100644 --- a/controllers/network_controller.go +++ b/controllers/network_controller.go @@ -21,7 +21,7 @@ import ( ) const ( - CNetworkFinalizer = "network.ipam.ironcore.dev/finalizer" + CNetworkFinalizer = "network.ipam.metal.ironcore.dev/finalizer" CNetworkIDProposalFailureReason = "NetworkIDProposalFailure" CNetworkIDReservationFailureReason = "NetworkIDReservationFailure" @@ -39,13 +39,13 @@ type NetworkReconciler struct { EventRecorder record.EventRecorder } -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=networkcounters,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=networkcounters/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=networkcounters/finalizers,verbs=update +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=networkcounters,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=networkcounters/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=networkcounters/finalizers,verbs=update -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=networks,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=networks/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=networks/finalizers,verbs=update +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=networks,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=networks/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=networks/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/subnet_controller.go b/controllers/subnet_controller.go index cfa8423..c7dcacd 100644 --- a/controllers/subnet_controller.go +++ b/controllers/subnet_controller.go @@ -21,7 +21,7 @@ import ( ) const ( - CSubnetFinalizer = "subnet.ipam.ironcore.dev/finalizer" + CSubnetFinalizer = "subnet.ipam.metal.ironcore.dev/finalizer" CSubnetFinalizationSuccessReason = "SubnetFinalizationSuccess" @@ -48,9 +48,9 @@ type SubnetReconciler struct { EventRecorder record.EventRecorder } -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=subnets,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=subnets/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.ironcore.dev,resources=subnets/finalizers,verbs=update +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=subnets,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=subnets/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=subnets/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/docs/development.md b/docs/development.md index aaa766b..5c2de16 100644 --- a/docs/development.md +++ b/docs/development.md @@ -51,7 +51,7 @@ patchesJson6902: version: v1 group: apiextensions.k8s.io kind: CustomResourceDefinition - name: ipam.ironcore.dev + name: ipam.metal.ironcore.dev path: crd_patch.yaml ``` diff --git a/docs/usage.md b/docs/usage.md index e5ab3b8..3e268f5 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -25,7 +25,7 @@ Network is able to handle both IPv4 and IPv6 address spaces simultaneously. A proper Network CR should be formed following the rules below. ```yaml -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Network metadata: name: network-sample @@ -63,7 +63,7 @@ may be inspected. It contains a list of address ranges booked by subnets. [user@localhost ~]$ kubectl describe network mpls-network-sample Name: network-sample Namespace: default -API Version: ipam.ironcore.dev/v1alpha1 +API Version: ipam.metal.ironcore.dev/v1alpha1 Kind: Network Status: ipv4Capacity: 16777216 @@ -96,7 +96,7 @@ If `Vacant` collection is empty, then there are no intervals left. [user@localhost ~]$ kubectl describe networkcounter k8s-vxlan-network-counter Name: k8s-vxlan-network-counter Namespace: default -API Version: ipam.ironcore.dev/v1alpha1 +API Version: ipam.metal.ironcore.dev/v1alpha1 Kind: NetworkCounter Spec: Vacant: @@ -131,7 +131,7 @@ Subnets may be also categorized by their regional affiliation: Here is an explanation on how to setup the Subnet. ```yaml -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Subnet metadata: name: subnet-sample @@ -195,7 +195,7 @@ spec: # Optional # Object with string fields consumer: - apiVersion: ipam.ironcore.dev/v1alpha1 + apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: SampleReource name: sample-resorce-name ``` @@ -222,7 +222,7 @@ Vacant ranges left may be also checked with `describe` method of `kubectl`. [user@localhost ~]$ kubectl describe subnet ipv4-parent-cidr-subnet-sample Name: ipv4-parent-cidr-subnet-sample Namespace: default -API Version: ipam.ironcore.dev/v1alpha1 +API Version: ipam.metal.ironcore.dev/v1alpha1 Kind: Subnet Status: Capacity: 16777216 @@ -271,7 +271,7 @@ IPs are always booked on specified Subnet as CIDRs, reducing their capacity. IPs may or may not point to resource they are assigned to. ```yaml -apiVersion: ipam.ironcore.dev/v1alpha1 +apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: Ip metadata: name: ip-sample @@ -286,7 +286,7 @@ spec: # Optional # Object with string fields consumer: - apiVersion: ipam.ironcore.dev/v1alpha1 + apiVersion: ipam.metal.ironcore.dev/v1alpha1 kind: SampleReource name: sample-resorce-name # IP @@ -301,14 +301,14 @@ Sample output for the `kubectl`. ```shell [user@localhost ~]$ kubectl get ips NAME IP SUBNET RESOURCE GROUP RESOURCE KIND RESOURCE NAME STATE MESSAGE -ipv4-ip-ip-sample 10.0.0.1 ipv4-child-cidr-subnet-sample Finished -ipv4-ip-sample 10.0.0.3 ipv4-child-cidr-subnet-sample Finished -ipv4-resource-and-ip-ip-sample 10.0.0.2 ipv4-child-cidr-subnet-sample ipam.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished -ipv4-resource-ip-sample 10.0.0.0 ipv4-child-cidr-subnet-sample ipam.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished -ipv6-ip-ip-sample fd34:5d8f:e75e:f3a2::1 ipv6-child-cidr-subnet-sample Finished -ipv6-ip-sample fd34:5d8f:e75e:f3a2::3 ipv6-child-cidr-subnet-sample Finished -ipv6-resource-and-ip-ip-sample fd34:5d8f:e75e:f3a2::2 ipv6-child-cidr-subnet-sample ipam.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished -ipv6-resource-ip-sample fd34:5d8f:e75e:f3a2:: ipv6-child-cidr-subnet-sample ipam.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished +ipv4-ip-ip-sample 10.0.0.1 ipv4-child-cidr-subnet-sample Finished +ipv4-ip-sample 10.0.0.3 ipv4-child-cidr-subnet-sample Finished +ipv4-resource-and-ip-ip-sample 10.0.0.2 ipv4-child-cidr-subnet-sample ipam.metal.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished +ipv4-resource-ip-sample 10.0.0.0 ipv4-child-cidr-subnet-sample ipam.metal.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished +ipv6-ip-ip-sample fd34:5d8f:e75e:f3a2::1 ipv6-child-cidr-subnet-sample Finished +ipv6-ip-sample fd34:5d8f:e75e:f3a2::3 ipv6-child-cidr-subnet-sample Finished +ipv6-resource-and-ip-ip-sample fd34:5d8f:e75e:f3a2::2 ipv6-child-cidr-subnet-sample ipam.metal.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished +ipv6-resource-ip-sample fd34:5d8f:e75e:f3a2:: ipv6-child-cidr-subnet-sample ipam.metal.ironcore.dev/v1alpha1 NetworkCounter referred-networkcounter-sample Finished ``` IPs status is pretty simple and does not provide any additional info. @@ -316,7 +316,7 @@ IPs status is pretty simple and does not provide any additional info. ```shell Name: ipv4-ip-ip-sample Namespace: default -API Version: ipam.ironcore.dev/v1alpha1 +API Version: ipam.metal.ironcore.dev/v1alpha1 Kind: Ip Status: Reserved: 10.0.0.1