From 44d6c0db24980f5db3507165fb0e6b407cbabf01 Mon Sep 17 00:00:00 2001 From: Steven Borrelli Date: Tue, 4 Jun 2024 17:58:51 +0200 Subject: [PATCH 1/2] migrate resources to crossplane.io group Signed-off-by: Steven Borrelli --- apis/dns/v1alpha1/zz_groupversion_info.go | 4 +- apis/ip/v1alpha1/zz_groupversion_info.go | 4 +- apis/ipv4/v1alpha1/zz_groupversion_info.go | 4 +- apis/ipv6/v1alpha1/zz_groupversion_info.go | 4 +- apis/network/v1alpha1/zz_groupversion_info.go | 4 +- apis/v1alpha1/doc.go | 2 +- apis/v1alpha1/register.go | 2 +- apis/v1beta1/doc.go | 2 +- apis/v1beta1/register.go | 2 +- cluster/test/setup.sh | 2 +- config/provider.go | 2 + examples/providerconfig/providerconfig.yaml | 2 +- examples/storeconfig/vault.yaml | 2 +- ...ns.infoblox-nios.crossplane.io_aaaas.yaml} | 4 +- ...s.infoblox-nios.crossplane.io_cnames.yaml} | 4 +- ... dns.infoblox-nios.crossplane.io_mxs.yaml} | 4 +- ...dns.infoblox-nios.crossplane.io_ptrs.yaml} | 4 +- ....infoblox-nios.crossplane.io_records.yaml} | 4 +- ...dns.infoblox-nios.crossplane.io_srvs.yaml} | 4 +- ...dns.infoblox-nios.crossplane.io_txts.yaml} | 4 +- ...x-nios.crossplane.io_providerconfigs.yaml} | 4 +- ...s.crossplane.io_providerconfigusages.yaml} | 4 +- ...blox-nios.crossplane.io_storeconfigs.yaml} | 4 +- ...oblox-nios.crossplane.io_allocations.yaml} | 4 +- ...blox-nios.crossplane.io_associations.yaml} | 4 +- ...oblox-nios.crossplane.io_allocations.yaml} | 4 +- ...blox-nios.crossplane.io_associations.yaml} | 4 +- ...nios.crossplane.io_networkcontainers.yaml} | 4 +- ...infoblox-nios.crossplane.io_networks.yaml} | 4 +- ...oblox-nios.crossplane.io_allocations.yaml} | 4 +- ...blox-nios.crossplane.io_associations.yaml} | 4 +- ...nios.crossplane.io_networkcontainers.yaml} | 4 +- ...infoblox-nios.crossplane.io_networks.yaml} | 4 +- ...rk.infoblox-nios.crossplane.io_views.yaml} | 4 +- package/crossplane.yaml | 40 +++++++++++++++++++ 35 files changed, 101 insertions(+), 59 deletions(-) rename package/crds/{dns.infoblox-nios.upbound.io_aaaas.yaml => dns.infoblox-nios.crossplane.io_aaaas.yaml} (99%) rename package/crds/{dns.infoblox-nios.upbound.io_cnames.yaml => dns.infoblox-nios.crossplane.io_cnames.yaml} (99%) rename package/crds/{dns.infoblox-nios.upbound.io_mxs.yaml => dns.infoblox-nios.crossplane.io_mxs.yaml} (99%) rename package/crds/{dns.infoblox-nios.upbound.io_ptrs.yaml => dns.infoblox-nios.crossplane.io_ptrs.yaml} (99%) rename package/crds/{dns.infoblox-nios.upbound.io_records.yaml => dns.infoblox-nios.crossplane.io_records.yaml} (99%) rename package/crds/{dns.infoblox-nios.upbound.io_srvs.yaml => dns.infoblox-nios.crossplane.io_srvs.yaml} (99%) rename package/crds/{dns.infoblox-nios.upbound.io_txts.yaml => dns.infoblox-nios.crossplane.io_txts.yaml} (99%) rename package/crds/{infoblox-nios.upbound.io_providerconfigs.yaml => infoblox-nios.crossplane.io_providerconfigs.yaml} (98%) rename package/crds/{infoblox-nios.upbound.io_providerconfigusages.yaml => infoblox-nios.crossplane.io_providerconfigusages.yaml} (97%) rename package/crds/{infoblox-nios.upbound.io_storeconfigs.yaml => infoblox-nios.crossplane.io_storeconfigs.yaml} (99%) rename package/crds/{ip.infoblox-nios.upbound.io_allocations.yaml => ip.infoblox-nios.crossplane.io_allocations.yaml} (99%) rename package/crds/{ip.infoblox-nios.upbound.io_associations.yaml => ip.infoblox-nios.crossplane.io_associations.yaml} (99%) rename package/crds/{ipv6.infoblox-nios.upbound.io_allocations.yaml => ipv4.infoblox-nios.crossplane.io_allocations.yaml} (99%) rename package/crds/{ipv6.infoblox-nios.upbound.io_associations.yaml => ipv4.infoblox-nios.crossplane.io_associations.yaml} (99%) rename package/crds/{ipv4.infoblox-nios.upbound.io_networkcontainers.yaml => ipv4.infoblox-nios.crossplane.io_networkcontainers.yaml} (99%) rename package/crds/{ipv4.infoblox-nios.upbound.io_networks.yaml => ipv4.infoblox-nios.crossplane.io_networks.yaml} (99%) rename package/crds/{ipv4.infoblox-nios.upbound.io_allocations.yaml => ipv6.infoblox-nios.crossplane.io_allocations.yaml} (99%) rename package/crds/{ipv4.infoblox-nios.upbound.io_associations.yaml => ipv6.infoblox-nios.crossplane.io_associations.yaml} (99%) rename package/crds/{ipv6.infoblox-nios.upbound.io_networkcontainers.yaml => ipv6.infoblox-nios.crossplane.io_networkcontainers.yaml} (99%) rename package/crds/{ipv6.infoblox-nios.upbound.io_networks.yaml => ipv6.infoblox-nios.crossplane.io_networks.yaml} (99%) rename package/crds/{network.infoblox-nios.upbound.io_views.yaml => network.infoblox-nios.crossplane.io_views.yaml} (99%) diff --git a/apis/dns/v1alpha1/zz_groupversion_info.go b/apis/dns/v1alpha1/zz_groupversion_info.go index 7a4c86e..2aeb759 100755 --- a/apis/dns/v1alpha1/zz_groupversion_info.go +++ b/apis/dns/v1alpha1/zz_groupversion_info.go @@ -5,7 +5,7 @@ Copyright 2022 Upbound Inc. // Code generated by upjet. DO NOT EDIT. // +kubebuilder:object:generate=true -// +groupName=dns.infoblox-nios.upbound.io +// +groupName=dns.infoblox-nios.crossplane.io // +versionName=v1alpha1 package v1alpha1 @@ -16,7 +16,7 @@ import ( // Package type metadata. const ( - CRDGroup = "dns.infoblox-nios.upbound.io" + CRDGroup = "dns.infoblox-nios.crossplane.io" CRDVersion = "v1alpha1" ) diff --git a/apis/ip/v1alpha1/zz_groupversion_info.go b/apis/ip/v1alpha1/zz_groupversion_info.go index f683c0e..d26f9aa 100755 --- a/apis/ip/v1alpha1/zz_groupversion_info.go +++ b/apis/ip/v1alpha1/zz_groupversion_info.go @@ -5,7 +5,7 @@ Copyright 2022 Upbound Inc. // Code generated by upjet. DO NOT EDIT. // +kubebuilder:object:generate=true -// +groupName=ip.infoblox-nios.upbound.io +// +groupName=ip.infoblox-nios.crossplane.io // +versionName=v1alpha1 package v1alpha1 @@ -16,7 +16,7 @@ import ( // Package type metadata. const ( - CRDGroup = "ip.infoblox-nios.upbound.io" + CRDGroup = "ip.infoblox-nios.crossplane.io" CRDVersion = "v1alpha1" ) diff --git a/apis/ipv4/v1alpha1/zz_groupversion_info.go b/apis/ipv4/v1alpha1/zz_groupversion_info.go index a4df116..19bc530 100755 --- a/apis/ipv4/v1alpha1/zz_groupversion_info.go +++ b/apis/ipv4/v1alpha1/zz_groupversion_info.go @@ -5,7 +5,7 @@ Copyright 2022 Upbound Inc. // Code generated by upjet. DO NOT EDIT. // +kubebuilder:object:generate=true -// +groupName=ipv4.infoblox-nios.upbound.io +// +groupName=ipv4.infoblox-nios.crossplane.io // +versionName=v1alpha1 package v1alpha1 @@ -16,7 +16,7 @@ import ( // Package type metadata. const ( - CRDGroup = "ipv4.infoblox-nios.upbound.io" + CRDGroup = "ipv4.infoblox-nios.crossplane.io" CRDVersion = "v1alpha1" ) diff --git a/apis/ipv6/v1alpha1/zz_groupversion_info.go b/apis/ipv6/v1alpha1/zz_groupversion_info.go index 2558c5f..847e00a 100755 --- a/apis/ipv6/v1alpha1/zz_groupversion_info.go +++ b/apis/ipv6/v1alpha1/zz_groupversion_info.go @@ -5,7 +5,7 @@ Copyright 2022 Upbound Inc. // Code generated by upjet. DO NOT EDIT. // +kubebuilder:object:generate=true -// +groupName=ipv6.infoblox-nios.upbound.io +// +groupName=ipv6.infoblox-nios.crossplane.io // +versionName=v1alpha1 package v1alpha1 @@ -16,7 +16,7 @@ import ( // Package type metadata. const ( - CRDGroup = "ipv6.infoblox-nios.upbound.io" + CRDGroup = "ipv6.infoblox-nios.crossplane.io" CRDVersion = "v1alpha1" ) diff --git a/apis/network/v1alpha1/zz_groupversion_info.go b/apis/network/v1alpha1/zz_groupversion_info.go index 4780b69..96c318e 100755 --- a/apis/network/v1alpha1/zz_groupversion_info.go +++ b/apis/network/v1alpha1/zz_groupversion_info.go @@ -5,7 +5,7 @@ Copyright 2022 Upbound Inc. // Code generated by upjet. DO NOT EDIT. // +kubebuilder:object:generate=true -// +groupName=network.infoblox-nios.upbound.io +// +groupName=network.infoblox-nios.crossplane.io // +versionName=v1alpha1 package v1alpha1 @@ -16,7 +16,7 @@ import ( // Package type metadata. const ( - CRDGroup = "network.infoblox-nios.upbound.io" + CRDGroup = "network.infoblox-nios.crossplane.io" CRDVersion = "v1alpha1" ) diff --git a/apis/v1alpha1/doc.go b/apis/v1alpha1/doc.go index 8973748..ac01bb6 100644 --- a/apis/v1alpha1/doc.go +++ b/apis/v1alpha1/doc.go @@ -4,6 +4,6 @@ Copyright 2021 Upbound Inc. // Package v1alpha1 contains the core resources of the infoblox-nios jet provider. // +kubebuilder:object:generate=true -// +groupName=infoblox-nios.upbound.io +// +groupName=infoblox-nios.crossplane.io // +versionName=v1alpha1 package v1alpha1 diff --git a/apis/v1alpha1/register.go b/apis/v1alpha1/register.go index 7019881..0f35343 100644 --- a/apis/v1alpha1/register.go +++ b/apis/v1alpha1/register.go @@ -13,7 +13,7 @@ import ( // Package type metadata. const ( - Group = "infoblox-nios.upbound.io" + Group = "infoblox-nios.crossplane.io" Version = "v1alpha1" ) diff --git a/apis/v1beta1/doc.go b/apis/v1beta1/doc.go index f8b9948..adf0d89 100644 --- a/apis/v1beta1/doc.go +++ b/apis/v1beta1/doc.go @@ -4,6 +4,6 @@ Copyright 2022 Upbound Inc. // Package v1beta1 contains the core resources of the infoblox-nios upjet provider. // +kubebuilder:object:generate=true -// +groupName=infoblox-nios.upbound.io +// +groupName=infoblox-nios.crossplane.io // +versionName=v1beta1 package v1beta1 diff --git a/apis/v1beta1/register.go b/apis/v1beta1/register.go index 4c2ea4c..258aedc 100644 --- a/apis/v1beta1/register.go +++ b/apis/v1beta1/register.go @@ -13,7 +13,7 @@ import ( // Package type metadata. const ( - Group = "infoblox-nios.upbound.io" + Group = "infoblox-nios.crossplane.io" Version = "v1beta1" ) diff --git a/cluster/test/setup.sh b/cluster/test/setup.sh index c81ebc4..900e6b0 100755 --- a/cluster/test/setup.sh +++ b/cluster/test/setup.sh @@ -13,7 +13,7 @@ ${KUBECTL} -n upbound-system wait --for=condition=Available deployment --all --t echo "Creating a default provider config..." cat < + meta.crossplane.io/source: github.com/crossplane-contrib/provider-infoblox-nios + meta.crossplane.io/license: Apache-2.0 + friendly-name.meta.crossplane.io: Provider Infoblox NIOS + meta.crossplane.io/description: | + This provider enables management of Infoblox IPAM resources. + meta.crossplane.io/readme: | + This provider enables management of Infoblox IPAM resources. + + Notes from the Terraform Provider: + + Network and network container resources have two versions: IPv4 and IPv6. + In addition, there are two operations which are implemented as resources: + IP address allocation and IP address association with a network host (ex. + VM in a cloud environment); they have three versions: IPv4 and IPv6 + separately, and IPv4/IPv6 combined. + + The recommendation is to avoid using separate IPv4 and IPv6 versions of IP + allocation and IP association resources. This recommendation does not + relate to network container and network-related resources. + + To work with DNS records a user must ensure that appropriate DNS zones + exist on the NIOS side, because currently the plugin does not support + creating a DNS zone. + + Every resource has common attributes: 'comment' and 'extAttrs'. 'comment' + is text which describes the resource. 'extAttrs' is a set of NIOS + Extensible Attributes attached to the resource. + + For DNS-related resources there is 'ttl' attribute as well, it specifies + TTL value (in seconds) for appropriate record. There is no default value, + zone's TTL is used by NIOS, if the value is omitted. In this case, the + field 'ttl' will be set to a negative value in the Terraform's state for + the resource, just to indicate the absence of a value. TTL value of 0 + (zero) means caching should be disabled for this record. Please note that + anywhere in the documents about this plugin, the default DNS view or the + default network view means: a view with the name default. Usually, this is + the name for the view which is marked as the default view on NIOS side, + but this may be overridden. But the plugin does use the name default for + the view, despite which view is marked as the default on NIOS side. From a0ad916cb778a8c2f167c981bde1502903f0b554 Mon Sep 17 00:00:00 2001 From: Steven Borrelli Date: Tue, 4 Jun 2024 18:00:54 +0200 Subject: [PATCH 2/2] update version Signed-off-by: Steven Borrelli --- README.md | 4 ++-- examples/install.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7eb42fd..161b75a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Install the provider by using the following command after changing the image tag to the [latest release](https://marketplace.upbound.io/providers/crossplane-contrib/provider-infoblox-nios): ```shell -up ctp provider install crossplane-contrib/provider-infoblox-nios:v0.2.0 +up ctp provider install crossplane-contrib/provider-infoblox-nios:v0.3.0 ``` Alternatively, you can use declarative installation: @@ -25,7 +25,7 @@ kind: Provider metadata: name: crossplane-contrib-provider-infoblox-nios spec: - package: xpkg.upbound.io/crossplane-contrib/provider-infoblox-nios:v0.2.0 + package: xpkg.upbound.io/crossplane-contrib/provider-infoblox-nios:v0.3.0 EOF ``` diff --git a/examples/install.yaml b/examples/install.yaml index 40a20c1..f290a64 100644 --- a/examples/install.yaml +++ b/examples/install.yaml @@ -3,4 +3,4 @@ kind: Provider metadata: name: crossplane-contrib-provider-infoblox-nios spec: - package: xpkg.upbound.io/crossplane-contrib/provider-infoblox-nios:v0.2.0 + package: xpkg.upbound.io/crossplane-contrib/provider-infoblox-nios:v0.3.0