Merge pull request #36 from crossplane-contrib/provider-1.20

feat: TF Equinix Provider 1.20
crossplane-contrib · Nov 19, 2023 · 82df934 · 82df934
2 parents 9687c04 + b3b9144
commit 82df934
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ GOLANGCILINT_VERSION ?= 1.50.0
 export TERRAFORM_VERSION := 1.3.1
 
 export TERRAFORM_PROVIDER_SOURCE := equinix/equinix
-export TERRAFORM_PROVIDER_VERSION := 1.18.0
+export TERRAFORM_PROVIDER_VERSION := 1.20.0
 export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-equinix
 export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://releases.hashicorp.com/${TERRAFORM_PROVIDER_DOWNLOAD_NAME}/${TERRAFORM_PROVIDER_VERSION}
 export TERRAFORM_NATIVE_PROVIDER_BINARY := ${TERRAFORM_PROVIDER_DOWNLOAD_NAME}_v${TERRAFORM_PROVIDER_VERSION}

diff --git a/apis/fabric/v1alpha1/zz_cloudrouter_types.go b/apis/fabric/v1alpha1/zz_cloudrouter_types.go
diff --git a/apis/fabric/v1alpha1/zz_connection_types.go b/apis/fabric/v1alpha1/zz_connection_types.go
diff --git a/apis/fabric/v1alpha1/zz_generated.deepcopy.go b/apis/fabric/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/metal/v1alpha1/zz_device_types.go b/apis/metal/v1alpha1/zz_device_types.go
diff --git a/apis/metal/v1alpha1/zz_generated.deepcopy.go b/apis/metal/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/provider-metadata.yaml b/config/provider-metadata.yaml
@@ -69,6 +69,14 @@ resources:
                   ],
                   "port_uuid": "${data.equinix_ecx_port.sv-qinq-pri.id}",
                   "profile_uuid": "${data.equinix_ecx_l2_sellerprofile.azure.id}",
+                  "secondary_connection": [
+                    {
+                      "name": "tf-azure-sec",
+                      "port_uuid": "${data.equinix_ecx_port.sv-qinq-sec.id}",
+                      "vlan_ctag": 1631,
+                      "vlan_stag": 1904
+                    }
+                  ],
                   "seller_metro_code": "SV",
                   "speed": 50,
                   "speed_unit": "MB",
@@ -78,6 +86,7 @@ resources:
               references:
                 port_uuid: data.equinix_ecx_port.sv-qinq-pri.id
                 profile_uuid: data.equinix_ecx_l2_sellerprofile.azure.id
+                secondary_connection.port_uuid: data.equinix_ecx_port.sv-qinq-sec.id
             - name: router-to-gcp
               manifest: |-
                 {
@@ -541,6 +550,7 @@ resources:
             metro_code: (String) Access point metro code
             metro_name: (String) Access point metro name
             name: (String) Connection name. An alpha-numeric 24 characters string which can include only hyphens and underscores
+            network: (Block Set) Simplified Network (see below for nested schema)
             notifications: '(Block List, Min: 1) Preferences for notifications on connection configuration or status changes (see below for nested schema)'
             operation: (Set of Object) Connection type-specific operational data (see below for nested schema)
             order: (Block Set) Order related to this connection information (see below for nested schema)
@@ -1132,6 +1142,7 @@ resources:
                 - (Optional) Whether the non-OS disks should be kept or wiped during reinstall.
                 Defaults to false.
             root_password: '- Root password to the server (disabled after 24 hours).'
+            sos_hostname: '- The hostname to use for Serial over SSH access to the device'
             ssh_key_ids: '- List of IDs of SSH keys deployed in the device, can be both user and project SSH keys.'
             state: '- The status of the device.'
             storage: |-

diff --git a/config/schema.json b/config/schema.json
diff --git a/package/crds/fabric.equinix.jet.crossplane.io_cloudrouters.yaml b/package/crds/fabric.equinix.jet.crossplane.io_cloudrouters.yaml
@@ -341,6 +341,14 @@ spec:
             properties:
               atProvider:
                 properties:
+                  bgpIpv4RoutesCount:
+                    description: Access point used and maximum number of IPv4 BGP
+                      routes
+                    type: number
+                  bgpIpv6RoutesCount:
+                    description: Access point used and maximum number of IPv6 BGP
+                      routes
+                    type: number
                   changeLog:
                     description: Captures Fabric Cloud Router lifecycle change information
                     items:
@@ -371,6 +379,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  connectionsCount:
+                    description: Number of connections associated with this Access
+                      point
+                    type: number
                   equinixAsn:
                     description: Equinix ASN
                     type: number

diff --git a/package/crds/fabric.equinix.jet.crossplane.io_connections.yaml b/package/crds/fabric.equinix.jet.crossplane.io_connections.yaml
@@ -222,6 +222,10 @@ spec:
                                 description: Virtual device
                                 items:
                                   properties:
+                                    name:
+                                      description: Customer-assigned Virtual Device
+                                        Name
+                                      type: string
                                     type:
                                       description: Virtual Device type
                                       type: string
@@ -491,6 +495,10 @@ spec:
                                 description: Virtual device
                                 items:
                                   properties:
+                                    name:
+                                      description: Customer-assigned Virtual Device
+                                        Name
+                                      type: string
                                     type:
                                       description: Virtual Device type
                                       type: string
@@ -767,7 +775,7 @@ spec:
                                   properties:
                                     id:
                                       description: id
-                                      type: string
+                                      type: number
                                   type: object
                                 type: array
                               network:
@@ -1039,7 +1047,7 @@ spec:
                                   properties:
                                     id:
                                       description: id
-                                      type: string
+                                      type: number
                                   type: object
                                 type: array
                               network:

diff --git a/package/crds/metal.equinix.jet.crossplane.io_devices.yaml b/package/crds/metal.equinix.jet.crossplane.io_devices.yaml
@@ -694,6 +694,11 @@ spec:
                           type: string
                       type: object
                     type: array
+                  sosHostname:
+                    description: The hostname to use for Serial over SSH access to
+                      the device The hostname to use for [Serial over SSH](https://deploy.equinix.com/developers/docs/metal/resilience-recovery/serial-over-ssh/)
+                      access to the device
+                    type: string
                   sshKeyIds:
                     description: List of IDs of SSH keys deployed in the device, can
                       be both user and project SSH keys. List of IDs of SSH keys deployed