From aa0b4d6f450e7cf0d660393377f6848a001fd56b Mon Sep 17 00:00:00 2001 From: Georgi Chulkov Date: Fri, 1 Mar 2024 13:11:49 +0100 Subject: [PATCH] Switch all internal references from onmetal to ironcore (#285) --- Makefile | 2 +- PROJECT | 4 +-- README.md | 2 +- api/ipam/v1alpha1/doc.go | 2 +- api/ipam/v1alpha1/groupversion_info.go | 4 +-- api/ipam/v1alpha1/ip_webhook.go | 2 +- api/ipam/v1alpha1/network_webhook.go | 2 +- api/ipam/v1alpha1/networkcounter_webhook.go | 2 +- api/ipam/v1alpha1/subnet_webhook.go | 2 +- charts/ipam/local.yaml | 10 +++--- charts/ipam/values.yaml | 12 +++---- .../applyconfiguration/ipam/v1alpha1/ip.go | 4 +-- .../ipam/v1alpha1/network.go | 4 +-- .../ipam/v1alpha1/networkcounter.go | 4 +-- .../ipam/v1alpha1/subnet.go | 4 +-- clientgo/applyconfiguration/utils.go | 2 +- clientgo/informers/generic.go | 2 +- .../ipam/typed/ipam/v1alpha1/ipam_client.go | 2 +- ...de_ips.yaml => ipam.ironcore.dev_ips.yaml} | 4 +-- ...=> ipam.ironcore.dev_networkcounters.yaml} | 4 +-- ...s.yaml => ipam.ironcore.dev_networks.yaml} | 4 +-- ...ts.yaml => ipam.ironcore.dev_subnets.yaml} | 4 +-- config/crd/kustomization.yaml | 8 ++--- config/crd/patches/cainjection_in_ips.yaml | 2 +- config/crd/patches/webhook_in_ips.yaml | 2 +- config/manager/controller_manager_config.yaml | 2 +- config/rbac/ip_editor_role.yaml | 4 +-- config/rbac/ip_viewer_role.yaml | 4 +-- config/rbac/role.yaml | 24 ++++++------- .../samples/ipam_v1alpha1_geneve_network.yaml | 2 +- .../ipam_v1alpha1_ipv4_child_bits_subnet.yaml | 2 +- ...m_v1alpha1_ipv4_child_capacity_subnet.yaml | 2 +- .../ipam_v1alpha1_ipv4_child_cidr_subnet.yaml | 2 +- config/samples/ipam_v1alpha1_ipv4_ip.yaml | 2 +- config/samples/ipam_v1alpha1_ipv4_ip_ip.yaml | 2 +- ...ipam_v1alpha1_ipv4_parent_cidr_subnet.yaml | 2 +- ...ipam_v1alpha1_ipv4_resource_and_ip_ip.yaml | 4 +-- .../ipam_v1alpha1_ipv4_resource_ip.yaml | 4 +-- .../ipam_v1alpha1_ipv6_child_bits_subnet.yaml | 2 +- ...m_v1alpha1_ipv6_child_capacity_subnet.yaml | 2 +- .../ipam_v1alpha1_ipv6_child_cidr_subnet.yaml | 2 +- config/samples/ipam_v1alpha1_ipv6_ip.yaml | 2 +- config/samples/ipam_v1alpha1_ipv6_ip_ip.yaml | 2 +- ...ipam_v1alpha1_ipv6_parent_cidr_subnet.yaml | 2 +- ...ipam_v1alpha1_ipv6_resource_and_ip_ip.yaml | 4 +-- .../ipam_v1alpha1_ipv6_resource_ip.yaml | 4 +-- .../samples/ipam_v1alpha1_mpls_network.yaml | 2 +- config/samples/ipam_v1alpha1_network.yaml | 2 +- ...ipam_v1alpha1_referred_networkcounter.yaml | 2 +- .../samples/ipam_v1alpha1_vxlan_network.yaml | 2 +- config/webhook/manifests.yaml | 16 ++++----- controllers/ip_controller.go | 8 ++--- controllers/network_controller.go | 14 ++++---- controllers/subnet_controller.go | 8 ++--- docs/development.md | 2 +- docs/installation.md | 8 ++--- docs/usage.md | 36 +++++++++---------- main.go | 2 +- 58 files changed, 136 insertions(+), 136 deletions(-) rename config/crd/bases/{ipam.onmetal.de_ips.yaml => ipam.ironcore.dev_ips.yaml} (98%) rename config/crd/bases/{ipam.onmetal.de_networkcounters.yaml => ipam.ironcore.dev_networkcounters.yaml} (97%) rename config/crd/bases/{ipam.onmetal.de_networks.yaml => ipam.ironcore.dev_networks.yaml} (98%) rename config/crd/bases/{ipam.onmetal.de_subnets.yaml => ipam.ironcore.dev_subnets.yaml} (99%) diff --git a/Makefile b/Makefile index f326fbf..8265b41 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ add-license: addlicense ## Add license headers to all go files. .PHONY: check-license check-license: addlicense ## Check that every file has a license header present. - find . -name '*.go' -exec $(ADDLICENSE) -check -c 'OnMetal authors' {} + + find . -name '*.go' -exec $(ADDLICENSE) -check -c 'IronCore authors' {} + .PHONY: lint lint: golangci-lint ## Run golangci-lint against code. diff --git a/PROJECT b/PROJECT index 7ef7f45..6be82c6 100644 --- a/PROJECT +++ b/PROJECT @@ -1,4 +1,4 @@ -domain: onmetal.de +domain: ironcore.dev layout: go.kubebuilder.io/v3 plugins: manifests.sdk.operatorframework.io/v2: {} @@ -10,7 +10,7 @@ resources: crdVersion: v1 namespaced: true controller: true - domain: onmetal.de + domain: ironcore.dev group: ipam kind: Ip path: github.com/ironcore-dev/ipam/api/ipam/v1alpha1 diff --git a/README.md b/README.md index b336076..4f9bea3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # IPAM [![REUSE status](https://api.reuse.software/badge/github.com/ironcore-dev/ipam)](https://api.reuse.software/info/github.com/ironcore-dev/ipam) -[![Go Reference](https://pkg.go.dev/badge/github.com/onmetal/controller-utils.svg)](https://pkg.go.dev/github.com/onmetal/controller-utils) +[![Go Reference](https://pkg.go.dev/badge/github.com/ironcore-dev/controller-utils.svg)](https://pkg.go.dev/github.com/ironcore-dev/controller-utils) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![GitHub License](https://img.shields.io/static/v1?label=License&message=Apache-2.0&color=blue&style=flat-square)](LICENSE) diff --git a/api/ipam/v1alpha1/doc.go b/api/ipam/v1alpha1/doc.go index e45cd26..874f7a5 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.onmetal.de +// +groupName=ipam.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 b692dfa..aa21717 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.onmetal.de +// +groupName=ipam.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.onmetal.de", Version: "v1alpha1"} + SchemeGroupVersion = schema.GroupVersion{Group: "ipam.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 2553fa2..b1b0d27 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-onmetal-de-v1alpha1-ip,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.onmetal.de,resources=ips,verbs=create;update;delete,versions=v1alpha1,name=vip.kb.io,admissionReviewVersions={v1,v1beta1} +// +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} var _ webhook.Validator = &IP{} diff --git a/api/ipam/v1alpha1/network_webhook.go b/api/ipam/v1alpha1/network_webhook.go index c9fc315..c713b9e 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-onmetal-de-v1alpha1-network,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.onmetal.de,resources=networks,verbs=create;update;delete,versions=v1alpha1,name=vnetwork.kb.io,admissionReviewVersions={v1,v1beta1} +// +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} var _ webhook.Validator = &Network{} diff --git a/api/ipam/v1alpha1/networkcounter_webhook.go b/api/ipam/v1alpha1/networkcounter_webhook.go index 11918d7..7c2bb3e 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-onmetal-de-v1alpha1-networkcounter,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.onmetal.de,resources=networkcounters,verbs=create;update;delete,versions=v1alpha1,name=vnetworkcounter.kb.io,admissionReviewVersions={v1,v1beta1} +// +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} var _ webhook.Validator = &NetworkCounter{} diff --git a/api/ipam/v1alpha1/subnet_webhook.go b/api/ipam/v1alpha1/subnet_webhook.go index 7a213d0..8acf989 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-onmetal-de-v1alpha1-subnet,mutating=false,failurePolicy=fail,sideEffects=None,groups=ipam.onmetal.de,resources=subnets,verbs=create;update;delete,versions=v1alpha1,name=vsubnet.kb.io,admissionReviewVersions={v1,v1beta1} +// +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} var _ webhook.Validator = &Subnet{} diff --git a/charts/ipam/local.yaml b/charts/ipam/local.yaml index 9c5385f..041eeed 100644 --- a/charts/ipam/local.yaml +++ b/charts/ipam/local.yaml @@ -47,28 +47,28 @@ cluster: crd: ip: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: ips singular: ip kind: IP listKind: IPList scope: Namespaced subnet: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: subnets singular: subnet kind: Subnet listKind: SubnetList scope: Namespaced network: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: networks singular: network kind: Network listKind: NetworkList scope: Namespaced networkcounter: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: networkcounters singular: networkcounter kind: NetworkCounter @@ -77,4 +77,4 @@ crd: leaderElection: leaderElect: true - resourceName: f42c18d5.onmetal.de \ No newline at end of file + resourceName: f42c18d5.ironcore.dev \ No newline at end of file diff --git a/charts/ipam/values.yaml b/charts/ipam/values.yaml index f92890e..10f7c3a 100644 --- a/charts/ipam/values.yaml +++ b/charts/ipam/values.yaml @@ -8,7 +8,7 @@ proxy: tag: "v0.5.0" manager: image: - repository: core.harbor.onmetal.de/ironcore-dev/ipam + repository: ghcr.io/ironcore-dev/ipam pullPolicy: IfNotPresent tag: "latest" resources: @@ -47,28 +47,28 @@ cluster: crd: ip: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: ips singular: ip kind: IP listKind: IPList scope: Namespaced subnet: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: subnets singular: subnet kind: Subnet listKind: SubnetList scope: Namespaced network: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: networks singular: network kind: Network listKind: NetworkList scope: Namespaced networkcounter: - group: ipam.onmetal.de + group: ipam.ironcore.dev plural: networkcounters singular: networkcounter kind: NetworkCounter @@ -77,4 +77,4 @@ crd: leaderElection: leaderElect: true - resourceName: f42c18d5.onmetal.de \ No newline at end of file + resourceName: f42c18d5.ironcore.dev \ No newline at end of file diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/ip.go b/clientgo/applyconfiguration/ipam/v1alpha1/ip.go index 5c0e842..b6fd85e 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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/network.go b/clientgo/applyconfiguration/ipam/v1alpha1/network.go index e896614..8b49bad 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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go b/clientgo/applyconfiguration/ipam/v1alpha1/networkcounter.go index 52da975..8afde39 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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go b/clientgo/applyconfiguration/ipam/v1alpha1/subnet.go index d21b8b7..cbf6e4b 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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.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.onmetal.de/v1alpha1") + b.WithAPIVersion("ipam.ironcore.dev/v1alpha1") return b, nil } diff --git a/clientgo/applyconfiguration/utils.go b/clientgo/applyconfiguration/utils.go index 2f9897d..e00078d 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.onmetal.de, Version=v1alpha1 + // Group=ipam.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 6e55d88..4848dad 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.onmetal.de, Version=v1alpha1 + // Group=ipam.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 df8b753..b85c053 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.onmetal.de group. +// IpamV1alpha1Client is used to interact with features provided by the ipam.ironcore.dev group. type IpamV1alpha1Client struct { restClient rest.Interface } diff --git a/config/crd/bases/ipam.onmetal.de_ips.yaml b/config/crd/bases/ipam.ironcore.dev_ips.yaml similarity index 98% rename from config/crd/bases/ipam.onmetal.de_ips.yaml rename to config/crd/bases/ipam.ironcore.dev_ips.yaml index 97cbe69..f150034 100644 --- a/config/crd/bases/ipam.onmetal.de_ips.yaml +++ b/config/crd/bases/ipam.ironcore.dev_ips.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - name: ips.ipam.onmetal.de + name: ips.ipam.ironcore.dev spec: - group: ipam.onmetal.de + group: ipam.ironcore.dev names: kind: IP listKind: IPList diff --git a/config/crd/bases/ipam.onmetal.de_networkcounters.yaml b/config/crd/bases/ipam.ironcore.dev_networkcounters.yaml similarity index 97% rename from config/crd/bases/ipam.onmetal.de_networkcounters.yaml rename to config/crd/bases/ipam.ironcore.dev_networkcounters.yaml index a11f4e7..bf60089 100644 --- a/config/crd/bases/ipam.onmetal.de_networkcounters.yaml +++ b/config/crd/bases/ipam.ironcore.dev_networkcounters.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - name: networkcounters.ipam.onmetal.de + name: networkcounters.ipam.ironcore.dev spec: - group: ipam.onmetal.de + group: ipam.ironcore.dev names: kind: NetworkCounter listKind: NetworkCounterList diff --git a/config/crd/bases/ipam.onmetal.de_networks.yaml b/config/crd/bases/ipam.ironcore.dev_networks.yaml similarity index 98% rename from config/crd/bases/ipam.onmetal.de_networks.yaml rename to config/crd/bases/ipam.ironcore.dev_networks.yaml index ab93168..f798eac 100644 --- a/config/crd/bases/ipam.onmetal.de_networks.yaml +++ b/config/crd/bases/ipam.ironcore.dev_networks.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - name: networks.ipam.onmetal.de + name: networks.ipam.ironcore.dev spec: - group: ipam.onmetal.de + group: ipam.ironcore.dev names: kind: Network listKind: NetworkList diff --git a/config/crd/bases/ipam.onmetal.de_subnets.yaml b/config/crd/bases/ipam.ironcore.dev_subnets.yaml similarity index 99% rename from config/crd/bases/ipam.onmetal.de_subnets.yaml rename to config/crd/bases/ipam.ironcore.dev_subnets.yaml index e979bd8..3061b4c 100644 --- a/config/crd/bases/ipam.onmetal.de_subnets.yaml +++ b/config/crd/bases/ipam.ironcore.dev_subnets.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - name: subnets.ipam.onmetal.de + name: subnets.ipam.ironcore.dev spec: - group: ipam.onmetal.de + group: ipam.ironcore.dev names: kind: Subnet listKind: SubnetList diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 7376e66..bf99962 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.onmetal.de_ips.yaml -- bases/ipam.onmetal.de_subnets.yaml -- bases/ipam.onmetal.de_networks.yaml -- bases/ipam.onmetal.de_networkcounters.yaml +- bases/ipam.ironcore.dev_ips.yaml +- bases/ipam.ironcore.dev_subnets.yaml +- bases/ipam.ironcore.dev_networks.yaml +- bases/ipam.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 c56d958..92e4b67 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.onmetal.de + name: ips.ipam.ironcore.dev diff --git a/config/crd/patches/webhook_in_ips.yaml b/config/crd/patches/webhook_in_ips.yaml index fd67708..7855bad 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.onmetal.de + name: ips.ipam.ironcore.dev spec: conversion: strategy: Webhook diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml index 17b5f28..7af68c7 100644 --- a/config/manager/controller_manager_config.yaml +++ b/config/manager/controller_manager_config.yaml @@ -8,4 +8,4 @@ webhook: port: 9443 leaderElection: leaderElect: true - resourceName: f42c18d5.onmetal.de + resourceName: f42c18d5.ironcore.dev diff --git a/config/rbac/ip_editor_role.yaml b/config/rbac/ip_editor_role.yaml index 97aa6f6..1f34c22 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.onmetal.de + - ipam.ironcore.dev resources: - ips verbs: @@ -17,7 +17,7 @@ rules: - update - watch - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - ips/status verbs: diff --git a/config/rbac/ip_viewer_role.yaml b/config/rbac/ip_viewer_role.yaml index 5e923b0..b2754f7 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.onmetal.de + - ipam.ironcore.dev resources: - ips verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - ips/status verbs: diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index bf618b9..52dcaf6 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -20,7 +20,7 @@ rules: - create - patch - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - ips verbs: @@ -32,13 +32,13 @@ rules: - update - watch - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - ips/finalizers verbs: - update - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - ips/status verbs: @@ -46,7 +46,7 @@ rules: - patch - update - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - networkcounters verbs: @@ -58,13 +58,13 @@ rules: - update - watch - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - networkcounters/finalizers verbs: - update - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - networkcounters/status verbs: @@ -72,7 +72,7 @@ rules: - patch - update - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - networks verbs: @@ -84,13 +84,13 @@ rules: - update - watch - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - networks/finalizers verbs: - update - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - networks/status verbs: @@ -98,7 +98,7 @@ rules: - patch - update - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - subnets verbs: @@ -110,13 +110,13 @@ rules: - update - watch - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev resources: - subnets/finalizers verbs: - update - apiGroups: - - ipam.onmetal.de + - ipam.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 2c80fbd..358cbe5 100644 --- a/config/samples/ipam_v1alpha1_geneve_network.yaml +++ b/config/samples/ipam_v1alpha1_geneve_network.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.onmetal.de/v1alpha1 +apiVersion: ipam.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 dd406ef..34c4a14 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-child-bits-subnet-sample diff --git a/config/samples/ipam_v1alpha1_ipv4_child_capacity_subnet.yaml b/config/samples/ipam_v1alpha1_ipv4_child_capacity_subnet.yaml index 83a3121..a3de8b8 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-child-capacity-subnet-sample diff --git a/config/samples/ipam_v1alpha1_ipv4_child_cidr_subnet.yaml b/config/samples/ipam_v1alpha1_ipv4_child_cidr_subnet.yaml index 419ed89..f5dae07 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-child-cidr-subnet-sample diff --git a/config/samples/ipam_v1alpha1_ipv4_ip.yaml b/config/samples/ipam_v1alpha1_ipv4_ip.yaml index 43810e7..3366de6 100644 --- a/config/samples/ipam_v1alpha1_ipv4_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv4_ip.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.onmetal.de/v1alpha1 +apiVersion: ipam.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 8e91cdd..ecfce78 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.onmetal.de/v1alpha1 +apiVersion: ipam.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 68ce55e..587e91d 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv4-parent-cidr-subnet-sample 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 1a7bb5d..5211612 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv4-resource-and-ip-ip-sample spec: subnetName: ipv4-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.onmetal.de/v1alpha1 + apiVersion: ipam.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 898edc2..8ed4e6f 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv4-resource-ip-sample spec: subnetName: ipv4-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.onmetal.de/v1alpha1 + apiVersion: ipam.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 70ce30f..762add3 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-child-bits-subnet-sample diff --git a/config/samples/ipam_v1alpha1_ipv6_child_capacity_subnet.yaml b/config/samples/ipam_v1alpha1_ipv6_child_capacity_subnet.yaml index 3cd1e1d..4199588 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-child-capacity-subnet-sample diff --git a/config/samples/ipam_v1alpha1_ipv6_child_cidr_subnet.yaml b/config/samples/ipam_v1alpha1_ipv6_child_cidr_subnet.yaml index 7633bdd..80c7b18 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-child-cidr-subnet-sample diff --git a/config/samples/ipam_v1alpha1_ipv6_ip.yaml b/config/samples/ipam_v1alpha1_ipv6_ip.yaml index 9993b14..c358e19 100644 --- a/config/samples/ipam_v1alpha1_ipv6_ip.yaml +++ b/config/samples/ipam_v1alpha1_ipv6_ip.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.onmetal.de/v1alpha1 +apiVersion: ipam.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 09c05d6..35e7070 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.onmetal.de/v1alpha1 +apiVersion: ipam.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 33e8611..b54b305 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: ipv6-parent-cidr-subnet-sample 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 0de06b6..e06519b 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv6-resource-and-ip-ip-sample spec: subnetName: ipv6-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.onmetal.de/v1alpha1 + apiVersion: ipam.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 7b1dd22..cdbad35 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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: IP metadata: name: ipv6-resource-ip-sample spec: subnetName: ipv6-child-cidr-subnet-sample resourceReference: - apiVersion: ipam.onmetal.de/v1alpha1 + apiVersion: ipam.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 3836d21..0105d68 100644 --- a/config/samples/ipam_v1alpha1_mpls_network.yaml +++ b/config/samples/ipam_v1alpha1_mpls_network.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.onmetal.de/v1alpha1 +apiVersion: ipam.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 e94d200..5ff3281 100644 --- a/config/samples/ipam_v1alpha1_network.yaml +++ b/config/samples/ipam_v1alpha1_network.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Network metadata: name: network-sample diff --git a/config/samples/ipam_v1alpha1_referred_networkcounter.yaml b/config/samples/ipam_v1alpha1_referred_networkcounter.yaml index 16c5034..e954e61 100644 --- a/config/samples/ipam_v1alpha1_referred_networkcounter.yaml +++ b/config/samples/ipam_v1alpha1_referred_networkcounter.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.onmetal.de/v1alpha1 +apiVersion: ipam.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 1e4ed06..65acf53 100644 --- a/config/samples/ipam_v1alpha1_vxlan_network.yaml +++ b/config/samples/ipam_v1alpha1_vxlan_network.yaml @@ -1,4 +1,4 @@ -apiVersion: ipam.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Network metadata: name: vxlan-network-sample diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 759a237..4dbddc5 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-onmetal-de-v1alpha1-ip + path: /validate-ipam-ironcore-dev-v1alpha1-ip failurePolicy: Fail name: vip.kb.io rules: - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev apiVersions: - v1alpha1 operations: @@ -33,12 +33,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-ipam-onmetal-de-v1alpha1-network + path: /validate-ipam-ironcore-dev-v1alpha1-network failurePolicy: Fail name: vnetwork.kb.io rules: - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev apiVersions: - v1alpha1 operations: @@ -55,12 +55,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-ipam-onmetal-de-v1alpha1-networkcounter + path: /validate-ipam-ironcore-dev-v1alpha1-networkcounter failurePolicy: Fail name: vnetworkcounter.kb.io rules: - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev apiVersions: - v1alpha1 operations: @@ -77,12 +77,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-ipam-onmetal-de-v1alpha1-subnet + path: /validate-ipam-ironcore-dev-v1alpha1-subnet failurePolicy: Fail name: vsubnet.kb.io rules: - apiGroups: - - ipam.onmetal.de + - ipam.ironcore.dev apiVersions: - v1alpha1 operations: diff --git a/controllers/ip_controller.go b/controllers/ip_controller.go index 4c7112c..34ec753 100644 --- a/controllers/ip_controller.go +++ b/controllers/ip_controller.go @@ -22,7 +22,7 @@ import ( ) const ( - CIPFinalizer = "ip.ipam.onmetal.de/finalizer" + CIPFinalizer = "ip.ipam.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.onmetal.de,resources=ips,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=ips/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=ips/finalizers,verbs=update +// +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 // 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 4e64c07..139b8fe 100644 --- a/controllers/network_controller.go +++ b/controllers/network_controller.go @@ -21,7 +21,7 @@ import ( ) const ( - CNetworkFinalizer = "network.ipam.onmetal.de/finalizer" + CNetworkFinalizer = "network.ipam.ironcore.dev/finalizer" CNetworkIDProposalFailureReason = "NetworkIDProposalFailure" CNetworkIDReservationFailureReason = "NetworkIDReservationFailure" @@ -39,13 +39,13 @@ type NetworkReconciler struct { EventRecorder record.EventRecorder } -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=networkcounters,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=networkcounters/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=networkcounters/finalizers,verbs=update +// +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.onmetal.de,resources=networks,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=networks/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=networks/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 // 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 dff0560..cfa8423 100644 --- a/controllers/subnet_controller.go +++ b/controllers/subnet_controller.go @@ -21,7 +21,7 @@ import ( ) const ( - CSubnetFinalizer = "subnet.ipam.onmetal.de/finalizer" + CSubnetFinalizer = "subnet.ipam.ironcore.dev/finalizer" CSubnetFinalizationSuccessReason = "SubnetFinalizationSuccess" @@ -48,9 +48,9 @@ type SubnetReconciler struct { EventRecorder record.EventRecorder } -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=subnets,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=subnets/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=ipam.onmetal.de,resources=subnets/finalizers,verbs=update +// +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 // 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 c12ace9..aaa766b 100644 --- a/docs/development.md +++ b/docs/development.md @@ -51,7 +51,7 @@ patchesJson6902: version: v1 group: apiextensions.k8s.io kind: CustomResourceDefinition - name: ipam.onmetal.de + name: ipam.ironcore.dev path: crd_patch.yaml ``` diff --git a/docs/installation.md b/docs/installation.md index 2185a38..1631684 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -93,7 +93,7 @@ Operator can be deployed to the environment with kubectl, kustomize or Helm. Use ### With Helm chart - # install release "dev" to "onmetal" namespace - helm install dev ./chart/ -n onmetal --create-namespace - # remove release "dev" from "onmetal" namespace - helm uninstall dev -n onmetal \ No newline at end of file + # install release "dev" to "ironcore-dev" namespace + helm install dev ./chart/ -n ironcore-dev --create-namespace + # remove release "dev" from "ironcore-dev" namespace + helm uninstall dev -n ironcore-dev \ No newline at end of file diff --git a/docs/usage.md b/docs/usage.md index 07f68aa..e5ab3b8 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.onmetal.de/v1alpha1 +apiVersion: ipam.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.onmetal.de/v1alpha1 +API Version: ipam.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.onmetal.de/v1alpha1 +API Version: ipam.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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Subnet metadata: name: subnet-sample @@ -195,7 +195,7 @@ spec: # Optional # Object with string fields consumer: - apiVersion: ipam.onmetal.de/v1alpha1 + apiVersion: ipam.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.onmetal.de/v1alpha1 +API Version: ipam.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.onmetal.de/v1alpha1 +apiVersion: ipam.ironcore.dev/v1alpha1 kind: Ip metadata: name: ip-sample @@ -286,7 +286,7 @@ spec: # Optional # Object with string fields consumer: - apiVersion: ipam.onmetal.de/v1alpha1 + apiVersion: ipam.ironcore.dev/v1alpha1 kind: SampleReource name: sample-resorce-name # IP @@ -300,15 +300,15 @@ 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.onmetal.de/v1alpha1 NetworkCounter referred-networkcounter-sample Finished -ipv4-resource-ip-sample 10.0.0.0 ipv4-child-cidr-subnet-sample ipam.onmetal.de/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.onmetal.de/v1alpha1 NetworkCounter referred-networkcounter-sample Finished -ipv6-resource-ip-sample fd34:5d8f:e75e:f3a2:: ipv6-child-cidr-subnet-sample ipam.onmetal.de/v1alpha1 NetworkCounter referred-networkcounter-sample Finished +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 ``` 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.onmetal.de/v1alpha1 +API Version: ipam.ironcore.dev/v1alpha1 Kind: Ip Status: Reserved: 10.0.0.1 diff --git a/main.go b/main.go index a3cd6c9..e38cdcd 100644 --- a/main.go +++ b/main.go @@ -60,7 +60,7 @@ func main() { }, HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, - LeaderElectionID: "f42c18d5.onmetal.de", + LeaderElectionID: "f42c18d5.ironcore.dev", }) if err != nil { setupLog.Error(err, "unable to start manager")