feat: use metros instead of facility

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

.github/workflows/ci.yaml

@@ -196,7 +196,7 @@ jobs:
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
         SKIP_IMAGE_BUILD: "1"
         MANIFEST_PATH: "../../../out/release"
-        FACILITY: da11
+        METRO: da
         CONTROLPLANE_NODE_TYPE: c3.medium.x86
         WORKER_NODE_TYPE: c3.medium.x86
         GINKGO_NODES: "1"
@@ -254,7 +254,7 @@ jobs:
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
         SKIP_IMAGE_BUILD: "1"
         MANIFEST_PATH: "../../../out/release"
-        FACILITY: da11
+        METRO: da
         CONTROLPLANE_NODE_TYPE: c3.medium.x86
         WORKER_NODE_TYPE: c3.medium.x86
         GINKGO_NODES: "1"
@@ -312,7 +312,7 @@ jobs:
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
         SKIP_IMAGE_BUILD: "1"
         MANIFEST_PATH: "../../../out/release"
-        FACILITY: da11
+        METRO: da
         CONTROLPLANE_NODE_TYPE: c3.medium.x86
         WORKER_NODE_TYPE: c3.medium.x86
         GINKGO_NODES: "1"
@@ -370,7 +370,7 @@ jobs:
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
         SKIP_IMAGE_BUILD: "1"
         MANIFEST_PATH: "../../../out/release"
-        FACILITY: da11
+        METRO: da
         CONTROLPLANE_NODE_TYPE: c3.medium.x86
         WORKER_NODE_TYPE: c3.medium.x86
         GINKGO_NODES: "1"
@@ -428,7 +428,7 @@ jobs:
         E2E_CONF_FILE_SOURCE: "${{ github.workspace }}/test/e2e/config/packet-ci-actions.yaml"
         SKIP_IMAGE_BUILD: "1"
         MANIFEST_PATH: "../../../out/release"
-        FACILITY: da11
+        METRO: da
         CONTROLPLANE_NODE_TYPE: c3.medium.x86
         WORKER_NODE_TYPE: c3.medium.x86
         GINKGO_NODES: "1"

config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachines.yaml

@@ -214,7 +214,7 @@ spec:
               machineType:
                 type: string
               metro:
-                description: Metro represents the Packet metro for this cluster Override
+                description: Metro represents the Packet metro for this machine Override
                   from the PacketCluster spec.
                 type: string
               os:

config/crd/bases/infrastructure.cluster.x-k8s.io_packetmachinetemplates.yaml

@@ -148,7 +148,7 @@ spec:
                       machineType:
                         type: string
                       metro:
-                        description: Metro represents the Packet metro for this cluster
+                        description: Metro represents the Packet metro for this machine
                           Override from the PacketCluster spec.
                         type: string
                       os:

scripts/ci-e2e-capi-conformance.sh

@@ -35,7 +35,7 @@ source "${REPO_ROOT}/hack/ensure-go.sh"
 # Verify the required Environment Variables are present.
 : "${PACKET_API_KEY:?Environment variable empty or not defined.}"
 : "${PROJECT_ID:?Environment variable empty or not defined.}"
-: "${FACILITY:?Environment variable empty or not defined.}"
+: "${METRO:?Environment variable empty or not defined.}"
 : "${CONTROLPLANE_NODE_TYPE:?Environment variable empty or not defined.}"
 : "${WORKER_NODE_TYPE:?Environment variable empty or not defined.}"
 

scripts/ci-e2e-capi-management-upgrade.sh

@@ -35,7 +35,7 @@ source "${REPO_ROOT}/hack/ensure-go.sh"
 # Verify the required Environment Variables are present.
 : "${PACKET_API_KEY:?Environment variable empty or not defined.}"
 : "${PROJECT_ID:?Environment variable empty or not defined.}"
-: "${FACILITY:?Environment variable empty or not defined.}"
+: "${METRO:?Environment variable empty or not defined.}"
 : "${CONTROLPLANE_NODE_TYPE:?Environment variable empty or not defined.}"
 : "${WORKER_NODE_TYPE:?Environment variable empty or not defined.}"
 

scripts/ci-e2e-capi-quickstart.sh

@@ -35,7 +35,7 @@ source "${REPO_ROOT}/hack/ensure-go.sh"
 # Verify the required Environment Variables are present.
 : "${PACKET_API_KEY:?Environment variable empty or not defined.}"
 : "${PROJECT_ID:?Environment variable empty or not defined.}"
-: "${FACILITY:?Environment variable empty or not defined.}"
+: "${METRO:?Environment variable empty or not defined.}"
 : "${CONTROLPLANE_NODE_TYPE:?Environment variable empty or not defined.}"
 : "${WORKER_NODE_TYPE:?Environment variable empty or not defined.}"
 

scripts/ci-e2e-capi-workload-upgrade.sh

@@ -35,7 +35,7 @@ source "${REPO_ROOT}/hack/ensure-go.sh"
 # Verify the required Environment Variables are present.
 : "${PACKET_API_KEY:?Environment variable empty or not defined.}"
 : "${PROJECT_ID:?Environment variable empty or not defined.}"
-: "${FACILITY:?Environment variable empty or not defined.}"
+: "${METRO:?Environment variable empty or not defined.}"
 : "${CONTROLPLANE_NODE_TYPE:?Environment variable empty or not defined.}"
 : "${WORKER_NODE_TYPE:?Environment variable empty or not defined.}"
 

scripts/ci-e2e-capi.sh

@@ -35,7 +35,7 @@ source "${REPO_ROOT}/hack/ensure-go.sh"
 # Verify the required Environment Variables are present.
 : "${PACKET_API_KEY:?Environment variable empty or not defined.}"
 : "${PROJECT_ID:?Environment variable empty or not defined.}"
-: "${FACILITY:?Environment variable empty or not defined.}"
+: "${METRO:?Environment variable empty or not defined.}"
 : "${CONTROLPLANE_NODE_TYPE:?Environment variable empty or not defined.}"
 : "${WORKER_NODE_TYPE:?Environment variable empty or not defined.}"
 

templates/cluster-template-crs-cni.yaml

@@ -225,7 +225,6 @@ kind: PacketCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  facility: ${FACILITY}
   metro: ${METRO}
   projectID: ${PROJECT_ID}
   vipManager: CPEM

templates/cluster-template-kube-vip-crs-cni.yaml

@@ -244,7 +244,6 @@ kind: PacketCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  facility: ${FACILITY}
   metro: ${METRO}
   projectID: ${PROJECT_ID}
   vipManager: KUBE_VIP