From 369cd1d3fc37684db83e7abf6bdfe958ffdb1968 Mon Sep 17 00:00:00 2001 From: Khaja Omer Date: Tue, 30 Apr 2024 16:19:12 -0500 Subject: [PATCH] Clean up and docs --- .github/workflows/build_test_ci.yml | 14 +- Makefile | 6 +- docs/src/developers/testing.md | 44 ++- .../assert-capi-resources.yaml | 0 .../assert-child-cluster-resources.yaml | 0 .../default-CAPL-cluster/chainsaw-test.yaml | 1 + .../check-child-cluster-and-vpc-deleted.yaml | 0 .../assert-capi-resources.yaml | 0 .../assert-child-cluster-resources.yaml | 0 .../k3s-capl-cluster/chainsaw-test.yaml | 1 + .../check-child-cluster-and-vpc-deleted.yaml | 0 .../assert-capi-resources.yaml | 0 .../assert-child-cluster-resources.yaml | 0 .../rke2-capl-cluster/chainsaw-test.yaml | 1 + .../check-child-cluster-and-vpc-deleted.yaml | 0 .../rke2-capl-cluster/rke2-cluster.yaml | 354 ++++++++++++++++++ ...config.yaml => gha-clusterctl-config.yaml} | 0 .../minimal-linodecluster/chainsaw-test.yaml | 1 + .../minimal-linodemachine/chainsaw-test.yaml | 1 + .../vpc-integration/chainsaw-test.yaml | 4 +- .../chainsaw-test.yaml | 3 +- .../minimal-linodevpc/chainsaw-test.yaml | 3 +- 22 files changed, 415 insertions(+), 18 deletions(-) rename e2e/{ => capl-cluster-flavors}/default-CAPL-cluster/assert-capi-resources.yaml (100%) rename e2e/{ => capl-cluster-flavors}/default-CAPL-cluster/assert-child-cluster-resources.yaml (100%) rename e2e/{ => capl-cluster-flavors}/default-CAPL-cluster/chainsaw-test.yaml (99%) rename e2e/{ => capl-cluster-flavors}/default-CAPL-cluster/check-child-cluster-and-vpc-deleted.yaml (100%) rename e2e/{ => capl-cluster-flavors}/k3s-capl-cluster/assert-capi-resources.yaml (100%) rename e2e/{ => capl-cluster-flavors}/k3s-capl-cluster/assert-child-cluster-resources.yaml (100%) rename e2e/{ => capl-cluster-flavors}/k3s-capl-cluster/chainsaw-test.yaml (99%) rename e2e/{ => capl-cluster-flavors}/k3s-capl-cluster/check-child-cluster-and-vpc-deleted.yaml (100%) rename e2e/{ => capl-cluster-flavors}/rke2-capl-cluster/assert-capi-resources.yaml (100%) rename e2e/{ => capl-cluster-flavors}/rke2-capl-cluster/assert-child-cluster-resources.yaml (100%) rename e2e/{ => capl-cluster-flavors}/rke2-capl-cluster/chainsaw-test.yaml (99%) rename e2e/{ => capl-cluster-flavors}/rke2-capl-cluster/check-child-cluster-and-vpc-deleted.yaml (100%) create mode 100644 e2e/capl-cluster-flavors/rke2-capl-cluster/rke2-cluster.yaml rename e2e/{clusterctl-config.yaml => gha-clusterctl-config.yaml} (100%) diff --git a/.github/workflows/build_test_ci.yml b/.github/workflows/build_test_ci.yml index 3ba957cfc..cdca365c7 100644 --- a/.github/workflows/build_test_ci.yml +++ b/.github/workflows/build_test_ci.yml @@ -127,26 +127,18 @@ jobs: if: github.ref == 'refs/heads/main' run: make e2etest env: + E2E_FLAGS: '--selector all --assert-timeout 15m0s' INSTALL_K3S_PROVIDER: true INSTALL_RKE2_PROVIDER: true LINODE_REGION: us-sea LINODE_CONTROL_PLANE_MACHINE_TYPE: g6-standard-2 LINODE_MACHINE_TYPE: g6-standard-2 - CLUSTERCTL_CONFIG: /home/runner/work/cluster-api-provider-linode/cluster-api-provider-linode/e2e/clusterctl-config.yaml + CLUSTERCTL_CONFIG: /home/runner/work/cluster-api-provider-linode/cluster-api-provider-linode/e2e/gha-clusterctl-config.yaml - name: Quick E2E Test + if: github.ref != 'refs/heads/main' run: make e2etest - env: - # TODO: Switch selector to quick before the PR can be merged - E2E_FLAGS: '--assert-timeout 10m0s' - # TODO: ALL the var below need to be deleted before the PR can be merged - INSTALL_K3S_PROVIDER: true - INSTALL_RKE2_PROVIDER: true - LINODE_REGION: us-sea - LINODE_CONTROL_PLANE_MACHINE_TYPE: g6-standard-2 - LINODE_MACHINE_TYPE: g6-standard-2 - CLUSTERCTL_CONFIG: /home/runner/work/cluster-api-provider-linode/cluster-api-provider-linode/e2e/clusterctl-config.yaml - name: Copy logs if: ${{ always() }} diff --git a/Makefile b/Makefile index a1985c22c..1f508c3b1 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,11 @@ test: generate fmt vet envtest ## Run tests. .PHONY: e2etest e2etest: generate local-release local-deploy chainsaw - GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e $(E2E_FLAGS) + ifeq ($(strip $(E2E_FLAGS)),) ## If E2E_FLAGS not set, run quick e2e tests + GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e --selector quick + else + GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e $(E2E_FLAGS) + endif local-deploy: kind ctlptl tilt kustomize clusterctl @echo -n "LINODE_TOKEN=$(LINODE_TOKEN)" > config/default/.env.linode diff --git a/docs/src/developers/testing.md b/docs/src/developers/testing.md index 9835e20c7..914ce06e7 100644 --- a/docs/src/developers/testing.md +++ b/docs/src/developers/testing.md @@ -177,14 +177,52 @@ var _ = Describe("linode creation", func() { For e2e tests CAPL uses the [Chainsaw project](https://kyverno.github.io/chainsaw) which leverages `kind` and `tilt` to spin up a cluster with the CAPL controllers installed and then uses `chainsaw-test.yaml` files to drive e2e testing. -All test live in the e2e folder with a directory structure of `e2e/${CONTROLLER_NAME}/${TEST_NAME}` +All test live in the e2e folder with a directory structure of `e2e/${COMPONENT}/${TEST_NAME}` ### Running tests -In order to run e2e tests run the following command +In order to run e2e tests run the following command. ```bash make e2etest ``` +*Note: By default `make e2etest` runs only the controller e2e tests* + +In order to run capl-cluster-flavors test, you need to pass flags to chainsaw by setting env var `E2E_FLAGS` + +Example: Only running e2e tests for flavors *(default, k3s, rke2)* +```bash +# Required env vars to run flavor tests +export INSTALL_K3S_PROVIDER=true +export INSTALL_RKE2_PROVIDER=true +export LINODE_REGION=us-sea +export LINODE_CONTROL_PLANE_MACHINE_TYPE=g6-standard-2 +export LINODE_MACHINE_TYPE=g6-standard-2 + +# IMPORTANT: Set linode, k3s, and rke2 providers in this config file. +# Find an example at e2e/gha-clusterctl-config.yaml +export CLUSTERCTL_CONFIG=~/.cluster-api/clusterctl.yaml + +make e2etest E2E_FLAGS='--selector flavors --assert-timeout 10m0s' +``` +*Note: We need to bump up the assert timeout to 10 mins to allow the cluster to complete building and become available* + +There are other selectors you can use to invoke specfic tests. Please look at the table below for all the selectors available: + +| Tests | Selector | +| ------------- | ------------- | +| All E2E Tests | `all` | +| All Controllers | `quick` | +| All Flavors (default, k3s, rke2) | `flavors` | +| K3S Cluster | `k3s` | +| RKE2 Cluster | `rke2` | +| Default (kubeadm) Cluster | `default-cluster` | +| Linode Cluster Controller | `linodecluster` | +| Linode Machine Controller | `linodemachine` | +| Linode Obj Controller | `linodeobj` | +| Linode VPC Controller | `linodevpc` | + +*Note: For any flavor e2e tests, please set the required env variables* + ### Adding tests -1. Create a new directory under the controller you are testing with the naming scheme of `e2e/${CONTROLLER_NAME}/${TEST_NAME}` +1. Create a new directory under the controller you are testing with the naming scheme of `e2e/${COMPONENT}/${TEST_NAME}` 2. Create a minimal `chainsaw-test.yaml` file in the new test dir ```yaml # yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json diff --git a/e2e/default-CAPL-cluster/assert-capi-resources.yaml b/e2e/capl-cluster-flavors/default-CAPL-cluster/assert-capi-resources.yaml similarity index 100% rename from e2e/default-CAPL-cluster/assert-capi-resources.yaml rename to e2e/capl-cluster-flavors/default-CAPL-cluster/assert-capi-resources.yaml diff --git a/e2e/default-CAPL-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/default-CAPL-cluster/assert-child-cluster-resources.yaml similarity index 100% rename from e2e/default-CAPL-cluster/assert-child-cluster-resources.yaml rename to e2e/capl-cluster-flavors/default-CAPL-cluster/assert-child-cluster-resources.yaml diff --git a/e2e/default-CAPL-cluster/chainsaw-test.yaml b/e2e/capl-cluster-flavors/default-CAPL-cluster/chainsaw-test.yaml similarity index 99% rename from e2e/default-CAPL-cluster/chainsaw-test.yaml rename to e2e/capl-cluster-flavors/default-CAPL-cluster/chainsaw-test.yaml index e13158501..c2cbf0d2e 100755 --- a/e2e/default-CAPL-cluster/chainsaw-test.yaml +++ b/e2e/capl-cluster-flavors/default-CAPL-cluster/chainsaw-test.yaml @@ -8,6 +8,7 @@ metadata: labels: default-cluster: flavors: + all: spec: bindings: # A short identifier for the E2E test run diff --git a/e2e/default-CAPL-cluster/check-child-cluster-and-vpc-deleted.yaml b/e2e/capl-cluster-flavors/default-CAPL-cluster/check-child-cluster-and-vpc-deleted.yaml similarity index 100% rename from e2e/default-CAPL-cluster/check-child-cluster-and-vpc-deleted.yaml rename to e2e/capl-cluster-flavors/default-CAPL-cluster/check-child-cluster-and-vpc-deleted.yaml diff --git a/e2e/k3s-capl-cluster/assert-capi-resources.yaml b/e2e/capl-cluster-flavors/k3s-capl-cluster/assert-capi-resources.yaml similarity index 100% rename from e2e/k3s-capl-cluster/assert-capi-resources.yaml rename to e2e/capl-cluster-flavors/k3s-capl-cluster/assert-capi-resources.yaml diff --git a/e2e/k3s-capl-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/k3s-capl-cluster/assert-child-cluster-resources.yaml similarity index 100% rename from e2e/k3s-capl-cluster/assert-child-cluster-resources.yaml rename to e2e/capl-cluster-flavors/k3s-capl-cluster/assert-child-cluster-resources.yaml diff --git a/e2e/k3s-capl-cluster/chainsaw-test.yaml b/e2e/capl-cluster-flavors/k3s-capl-cluster/chainsaw-test.yaml similarity index 99% rename from e2e/k3s-capl-cluster/chainsaw-test.yaml rename to e2e/capl-cluster-flavors/k3s-capl-cluster/chainsaw-test.yaml index 26c95917a..e4028f7be 100755 --- a/e2e/k3s-capl-cluster/chainsaw-test.yaml +++ b/e2e/capl-cluster-flavors/k3s-capl-cluster/chainsaw-test.yaml @@ -8,6 +8,7 @@ metadata: labels: k3s: flavors: + all: spec: bindings: # A short identifier for the E2E test run diff --git a/e2e/k3s-capl-cluster/check-child-cluster-and-vpc-deleted.yaml b/e2e/capl-cluster-flavors/k3s-capl-cluster/check-child-cluster-and-vpc-deleted.yaml similarity index 100% rename from e2e/k3s-capl-cluster/check-child-cluster-and-vpc-deleted.yaml rename to e2e/capl-cluster-flavors/k3s-capl-cluster/check-child-cluster-and-vpc-deleted.yaml diff --git a/e2e/rke2-capl-cluster/assert-capi-resources.yaml b/e2e/capl-cluster-flavors/rke2-capl-cluster/assert-capi-resources.yaml similarity index 100% rename from e2e/rke2-capl-cluster/assert-capi-resources.yaml rename to e2e/capl-cluster-flavors/rke2-capl-cluster/assert-capi-resources.yaml diff --git a/e2e/rke2-capl-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/rke2-capl-cluster/assert-child-cluster-resources.yaml similarity index 100% rename from e2e/rke2-capl-cluster/assert-child-cluster-resources.yaml rename to e2e/capl-cluster-flavors/rke2-capl-cluster/assert-child-cluster-resources.yaml diff --git a/e2e/rke2-capl-cluster/chainsaw-test.yaml b/e2e/capl-cluster-flavors/rke2-capl-cluster/chainsaw-test.yaml similarity index 99% rename from e2e/rke2-capl-cluster/chainsaw-test.yaml rename to e2e/capl-cluster-flavors/rke2-capl-cluster/chainsaw-test.yaml index fbf68f602..0491aa61e 100755 --- a/e2e/rke2-capl-cluster/chainsaw-test.yaml +++ b/e2e/capl-cluster-flavors/rke2-capl-cluster/chainsaw-test.yaml @@ -8,6 +8,7 @@ metadata: labels: rke2: flavors: + all: spec: bindings: # A short identifier for the E2E test run diff --git a/e2e/rke2-capl-cluster/check-child-cluster-and-vpc-deleted.yaml b/e2e/capl-cluster-flavors/rke2-capl-cluster/check-child-cluster-and-vpc-deleted.yaml similarity index 100% rename from e2e/rke2-capl-cluster/check-child-cluster-and-vpc-deleted.yaml rename to e2e/capl-cluster-flavors/rke2-capl-cluster/check-child-cluster-and-vpc-deleted.yaml diff --git a/e2e/capl-cluster-flavors/rke2-capl-cluster/rke2-cluster.yaml b/e2e/capl-cluster-flavors/rke2-capl-cluster/rke2-cluster.yaml new file mode 100644 index 000000000..ab41860fd --- /dev/null +++ b/e2e/capl-cluster-flavors/rke2-capl-cluster/rke2-cluster.yaml @@ -0,0 +1,354 @@ +apiVersion: v1 +kind: Secret +metadata: + labels: + clusterctl.cluster.x-k8s.io/move: "true" + name: e2e-rke2-cluster-6ee9c79-credentials + namespace: chainsaw-positive-tick +stringData: + apiToken: 453270eb663c12a397649927fd2a873e856c559c5f33aa66581432899e1846be +--- +apiVersion: v1 +kind: Secret +metadata: + name: linode-e2e-rke2-cluster-6ee9c79-crs-0 + namespace: chainsaw-positive-tick +stringData: + linode-ccm.yaml: |- + apiVersion: helm.cattle.io/v1 + kind: HelmChart + metadata: + namespace: kube-system + name: ccm-linode + spec: + targetNamespace: kube-system + version: v0.4.4 + chart: ccm-linode + repo: https://linode.github.io/linode-cloud-controller-manager/ + bootstrap: true + valuesContent: |- + routeController: + vpcName: e2e-rke2-cluster-6ee9c79 + clusterCIDR: 10.0.0.0/8 + configureCloudRoutes: true + secretRef: + name: "linode-token-region" + nodeSelector: + node-role.kubernetes.io/control-plane: "true" + linode-token-region.yaml: |- + kind: Secret + apiVersion: v1 + metadata: + name: linode-token-region + namespace: kube-system + stringData: + apiToken: 453270eb663c12a397649927fd2a873e856c559c5f33aa66581432899e1846be + region: us-ord +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: e2e-rke2-cluster-6ee9c79-cilium + namespace: chainsaw-positive-tick +spec: + chartName: cilium + clusterSelector: + matchExpressions: + - key: ipv6 + operator: DoesNotExist + - key: vxlan + operator: DoesNotExist + - key: cni + operator: In + values: + - e2e-rke2-cluster-6ee9c79-cilium + namespace: kube-system + options: + timeout: 5m + wait: true + waitForJobs: true + repoURL: https://helm.cilium.io/ + valuesTemplate: | + bgpControlPlane: + enabled: true + routingMode: native + kubeProxyReplacement: true + ipv4NativeRoutingCIDR: 10.0.0.0/8 + tunnelProtocol: "" + enableIPv4Masquerade: true + egressMasqueradeInterfaces: eth0 + k8sServiceHost: {{ .InfraCluster.spec.controlPlaneEndpoint.host }} + k8sServicePort: {{ .InfraCluster.spec.controlPlaneEndpoint.port }} + extraArgs: + - --direct-routing-device=eth1 + - --nodeport-addresses=0.0.0.0/0 + ipam: + mode: kubernetes + ipv4: + enabled: true + ipv6: + enabled: false + k8s: + requireIPv4PodCIDR: true + hubble: + relay: + enabled: true + ui: + enabled: true + version: 1.15.0 +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: e2e-rke2-cluster-6ee9c79-cilium-ipv6 + namespace: chainsaw-positive-tick +spec: + chartName: cilium + clusterSelector: + matchExpressions: + - key: ipv6 + operator: In + values: + - "true" + - key: cni + operator: In + values: + - e2e-rke2-cluster-6ee9c79-cilium + - key: vxlan + operator: DoesNotExist + namespace: kube-system + options: + timeout: 5m + wait: true + waitForJobs: true + repoURL: https://helm.cilium.io/ + valuesTemplate: | + bgpControlPlane: + enabled: true + ipv6: + enabled: true + ipam: + mode: kubernetes + k8s: + requireIPv4PodCIDR: true + hubble: + relay: + enabled: true + ui: + enabled: true + version: 1.15.0 +--- +apiVersion: addons.cluster.x-k8s.io/v1alpha1 +kind: HelmChartProxy +metadata: + name: e2e-rke2-cluster-6ee9c79-cilium-vxlan + namespace: chainsaw-positive-tick +spec: + chartName: cilium + clusterSelector: + matchExpressions: + - key: vxlan + operator: In + values: + - "true" + - key: cni + operator: In + values: + - e2e-rke2-cluster-6ee9c79-cilium + - key: ipv6 + operator: DoesNotExist + namespace: kube-system + options: + timeout: 5m + wait: true + waitForJobs: true + repoURL: https://helm.cilium.io/ + valuesTemplate: | + bgpControlPlane: + enabled: true + ipam: + mode: kubernetes + k8s: + requireIPv4PodCIDR: true + hubble: + relay: + enabled: true + ui: + enabled: true + version: 1.15.0 +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1alpha1 +kind: RKE2ConfigTemplate +metadata: + name: e2e-rke2-cluster-6ee9c79-md-0 + namespace: chainsaw-positive-tick +spec: + template: + spec: + agentConfig: + cisProfile: cis-1.23 + kubelet: + extraArgs: + - provider-id=linode://{{ ds.meta_data.id }} + nodeName: '{{ ds.meta_data.label }}' + protectKernelDefaults: true + version: v1.29.1+rke2r1 + preRKE2Commands: + - | + mkdir -p /etc/rancher/rke2/config.yaml.d/ + echo "node-ip: $(ip a s eth1 |grep 'inet ' |cut -d' ' -f6|cut -d/ -f1)" >> /etc/rancher/rke2/config.yaml.d/capi-config.yaml + - sed -i '/swap/d' /etc/fstab + - swapoff -a + - hostnamectl set-hostname '{{ ds.meta_data.label }}' && hostname -F /etc/hostname +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: Cluster +metadata: + labels: + cluster: e2e-rke2-cluster-6ee9c79 + cni: e2e-rke2-cluster-6ee9c79-cilium + name: e2e-rke2-cluster-6ee9c79 + namespace: chainsaw-positive-tick +spec: + clusterNetwork: + pods: + cidrBlocks: + - 10.192.0.0/10 + controlPlaneRef: + apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + kind: RKE2ControlPlane + name: e2e-rke2-cluster-6ee9c79-control-plane + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 + kind: LinodeCluster + name: e2e-rke2-cluster-6ee9c79 +--- +apiVersion: cluster.x-k8s.io/v1beta1 +kind: MachineDeployment +metadata: + name: e2e-rke2-cluster-6ee9c79-md-0 + namespace: chainsaw-positive-tick +spec: + clusterName: e2e-rke2-cluster-6ee9c79 + replicas: 1 + selector: + matchLabels: null + template: + spec: + bootstrap: + configRef: + apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + kind: RKE2ConfigTemplate + name: e2e-rke2-cluster-6ee9c79-md-0 + clusterName: e2e-rke2-cluster-6ee9c79 + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 + kind: LinodeMachineTemplate + name: e2e-rke2-cluster-6ee9c79-md-0 + version: v1.29.1+rke2r1 +--- +apiVersion: controlplane.cluster.x-k8s.io/v1alpha1 +kind: RKE2ControlPlane +metadata: + name: e2e-rke2-cluster-6ee9c79-control-plane + namespace: chainsaw-positive-tick +spec: + agentConfig: + cisProfile: cis-1.23 + nodeName: '{{ ds.meta_data.label }}' + protectKernelDefaults: true + version: v1.29.1+rke2r1 + files: + - contentFrom: + secret: + key: linode-ccm.yaml + name: linode-e2e-rke2-cluster-6ee9c79-crs-0 + owner: root:root + path: /var/lib/rancher/rke2/server/manifests/linode-ccm.yaml + - contentFrom: + secret: + key: linode-token-region.yaml + name: linode-e2e-rke2-cluster-6ee9c79-crs-0 + owner: root:root + path: /var/lib/rancher/rke2/server/manifests/linode-token-region.yaml + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 + kind: LinodeMachineTemplate + name: e2e-rke2-cluster-6ee9c79-control-plane + preRKE2Commands: + - | + mkdir -p /etc/rancher/rke2/config.yaml.d/ + echo "node-ip: $(ip a s eth1 |grep 'inet ' |cut -d' ' -f6|cut -d/ -f1)" >> /etc/rancher/rke2/config.yaml.d/capi-config.yaml + - sed -i '/swap/d' /etc/fstab + - swapoff -a + - hostnamectl set-hostname '{{ ds.meta_data.label }}' && hostname -F /etc/hostname + registrationMethod: internal-only-ips + replicas: 1 + serverConfig: + cloudProviderName: external + cni: none + disableComponents: + kubernetesComponents: + - cloudController + - kubeProxy + pluginComponents: + - rke2-ingress-nginx +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 +kind: LinodeCluster +metadata: + name: e2e-rke2-cluster-6ee9c79 + namespace: chainsaw-positive-tick +spec: + credentialsRef: + name: e2e-rke2-cluster-6ee9c79-credentials + region: us-ord + vpcRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 + kind: LinodeVPC + name: e2e-rke2-cluster-6ee9c79 +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 +kind: LinodeMachineTemplate +metadata: + name: e2e-rke2-cluster-6ee9c79-control-plane + namespace: chainsaw-positive-tick +spec: + template: + spec: + authorizedKeys: null + image: linode/ubuntu22.04 + interfaces: + - primary: true + purpose: public + region: us-ord + type: g6-standard-2 +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 +kind: LinodeMachineTemplate +metadata: + name: e2e-rke2-cluster-6ee9c79-md-0 + namespace: chainsaw-positive-tick +spec: + template: + spec: + authorizedKeys: null + image: linode/ubuntu22.04 + interfaces: + - primary: true + purpose: public + region: us-ord + type: g6-standard-2 +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 +kind: LinodeVPC +metadata: + labels: + cluster.x-k8s.io/cluster-name: e2e-rke2-cluster-6ee9c79 + name: e2e-rke2-cluster-6ee9c79 + namespace: chainsaw-positive-tick +spec: + region: us-ord + subnets: + - ipv4: 10.0.0.0/8 + label: default diff --git a/e2e/clusterctl-config.yaml b/e2e/gha-clusterctl-config.yaml similarity index 100% rename from e2e/clusterctl-config.yaml rename to e2e/gha-clusterctl-config.yaml diff --git a/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml b/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml index 1f1227a87..6b35b873b 100755 --- a/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml +++ b/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml @@ -8,6 +8,7 @@ metadata: labels: quick: linodecluster: + all: spec: bindings: # A short identifier for the E2E test run diff --git a/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml b/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml index 4c0b1746b..7b8152f29 100755 --- a/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml +++ b/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml @@ -8,6 +8,7 @@ metadata: labels: quick: linodemachine: + all: spec: bindings: # A short identifier for the E2E test run diff --git a/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml b/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml index 188a00a42..30ada818f 100755 --- a/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml +++ b/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml @@ -7,7 +7,9 @@ metadata: # Label to trigger the test on every PR labels: quick: - vpc: + linodemachine: + linodevpc: + all: spec: bindings: # A short identifier for the E2E test run diff --git a/e2e/linodeobjectstoragebucket-controller/minimal-linodeobjectstoragebucket/chainsaw-test.yaml b/e2e/linodeobjectstoragebucket-controller/minimal-linodeobjectstoragebucket/chainsaw-test.yaml index e44c8bacd..325bf8eea 100755 --- a/e2e/linodeobjectstoragebucket-controller/minimal-linodeobjectstoragebucket/chainsaw-test.yaml +++ b/e2e/linodeobjectstoragebucket-controller/minimal-linodeobjectstoragebucket/chainsaw-test.yaml @@ -6,7 +6,8 @@ metadata: # Label to trigger the test on every PR labels: quick: - obj: + linodeobj: + all: spec: bindings: # A short identifier for the E2E test run diff --git a/e2e/linodevpc-controller/minimal-linodevpc/chainsaw-test.yaml b/e2e/linodevpc-controller/minimal-linodevpc/chainsaw-test.yaml index deaaba1ef..f4660bf53 100644 --- a/e2e/linodevpc-controller/minimal-linodevpc/chainsaw-test.yaml +++ b/e2e/linodevpc-controller/minimal-linodevpc/chainsaw-test.yaml @@ -6,7 +6,8 @@ metadata: # Label to trigger the test on every PR labels: quick: - vpc: + linodevpc: + all: spec: bindings: # A short identifier for the E2E test run