[test][fix] E2E test improvements, add missing client for the LOBJ webhook

.github/filters.yml

@@ -4,62 +4,62 @@ src:
 kubeadm:
   - templates/flavors/kubeadm/default/*
   - e2e/capl-cluster-flavors/kubeadm-capl-cluster/*
-kubeadm-cluster-autoscaler:
-  - templates/flavors/kubeadm/cluster-autoscaler/*
-kubeadm-dual-stack:
-  - templates/flavors/kubeadm/dual-stack/*
-kubeadm-etcd-backup-restore:
-  - templates/flavors/kubeadm/etcd-backup-restore/*
-kubeadm-etcd-disk:
-  - templates/flavors/kubeadm/etcd-disk/*
+#kubeadm-cluster-autoscaler:
+#  - templates/flavors/kubeadm/cluster-autoscaler/*
+#kubeadm-dual-stack:
+#  - templates/flavors/kubeadm/dual-stack/*
+#kubeadm-etcd-backup-restore:
+#  - templates/flavors/kubeadm/etcd-backup-restore/*
+#kubeadm-etcd-disk:
+#  - templates/flavors/kubeadm/etcd-disk/*
 kubeadm-full:
   - templates/flavors/kubeadm/full/*
   - e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/*
-kubeadm-full-vpcless:
-  - templates/flavors/kubeadm/full-vpcless/*
-kubeadm-self-healing:
-  - templates/flavors/kubeadm/self-healing/*
-kubeadm-vpcless:
-  - templates/flavors/kubeadm/vpcless/*
-kubeadm-cilium-bgp-lb:
-  - templates/flavors/kubeadm/cilium-bgp-lb/*
-kubeadm-konnectivity:
-  - templates/flavors/kubeadm/konnectivity/*
+#kubeadm-full-vpcless:
+#  - templates/flavors/kubeadm/full-vpcless/*
+#kubeadm-self-healing:
+#  - templates/flavors/kubeadm/self-healing/*
+#kubeadm-vpcless:
+#  - templates/flavors/kubeadm/vpcless/*
+#kubeadm-cilium-bgp-lb:
+#  - templates/flavors/kubeadm/cilium-bgp-lb/*
+#kubeadm-konnectivity:
+#  - templates/flavors/kubeadm/konnectivity/*
 kubeadm-flatcar:
  - templates/flavors/kubeadm/flatcar/*
 
-k3s:
-  - templates/flavors/k3s/default/*
-  - e2e/capl-cluster-flavors/k3s-capl-cluster/*
-k3s-cluster-autoscaler:
-  - templates/flavors/k3s/cluster-autoscaler/*
-k3s-dual-stack:
-  - templates/flavors/k3s/dual-stack/*
-k3s-etcd-backup-restore:
-  - templates/flavors/k3s/etcd-backup-restore/*
-k3s-full:
-  - templates/flavors/k3s/full/*
-k3s-full-vpcless:
-  - templates/flavors/k3s/full-vpcless/*
-k3s-self-healing:
-  - templates/flavors/k3s/self-healing/*
-k3s-vpcless:
-  - templates/flavors/k3s/vpcless/*
-
-rke2:
-  - templates/flavors/rke2/default/*
-  - e2e/capl-cluster-flavors/rke2-capl-cluster/*
-rke2-cluster-autoscaler:
-  - templates/flavors/rke2/cluster-autoscaler/*
-rke2-etcd-backup-restore:
-  - templates/flavors/rke2/etcd-backup-restore/*
-rke2-etcd-disk:
-  - templates/flavors/rke2/etcd-disk/*
-rke2-full:
-  - templates/flavors/rke2/full/*
-rke2-full-vpcless:
-  - templates/flavors/rke2/full-vpcless/*
-rke2-self-healing:
-  - templates/flavors/rke2/self-healing/*
-rke2-vpcless:
-  - templates/flavors/rke2/vpcless/*
+#k3s:
+#  - templates/flavors/k3s/default/*
+#  - e2e/capl-cluster-flavors/k3s-capl-cluster/*
+#k3s-cluster-autoscaler:
+#  - templates/flavors/k3s/cluster-autoscaler/*
+#k3s-dual-stack:
+#  - templates/flavors/k3s/dual-stack/*
+#k3s-etcd-backup-restore:
+#  - templates/flavors/k3s/etcd-backup-restore/*
+#k3s-full:
+#  - templates/flavors/k3s/full/*
+#k3s-full-vpcless:
+#  - templates/flavors/k3s/full-vpcless/*
+#k3s-self-healing:
+#  - templates/flavors/k3s/self-healing/*
+#k3s-vpcless:
+#  - templates/flavors/k3s/vpcless/*
+#
+#rke2:
+#  - templates/flavors/rke2/default/*
+#  - e2e/capl-cluster-flavors/rke2-capl-cluster/*
+#rke2-cluster-autoscaler:
+#  - templates/flavors/rke2/cluster-autoscaler/*
+#rke2-etcd-backup-restore:
+#  - templates/flavors/rke2/etcd-backup-restore/*
+#rke2-etcd-disk:
+#  - templates/flavors/rke2/etcd-disk/*
+#rke2-full:
+#  - templates/flavors/rke2/full/*
+#rke2-full-vpcless:
+#  - templates/flavors/rke2/full-vpcless/*
+#rke2-self-healing:
+#  - templates/flavors/rke2/self-healing/*
+#rke2-vpcless:
+#  - templates/flavors/rke2/vpcless/*

Makefile

@@ -7,7 +7,6 @@ CONTROLLER_IMAGE    ?= $(REGISTRY)/$(IMAGE_NAME)
 TAG                 ?= dev
 ENVTEST_K8S_VERSION := 1.30.0
 VERSION             ?= $(shell git describe --always --tag --dirty=-dev)
-GIT_REF             ?= $(shell git rev-parse --short HEAD)
 BUILD_ARGS          := --build-arg VERSION=$(VERSION)
 SHELL                = /usr/bin/env bash -o pipefail
 .SHELLFLAGS          = -ec
@@ -161,7 +160,7 @@ test: generate fmt vet envtest ## Run tests.
 
 .PHONY: e2etest
 e2etest: generate local-release local-deploy chainsaw s5cmd
-	GIT_REF=$(GIT_REF) SSE_KEY=$$(openssl rand -base64 32) LOCALBIN=$(CACHE_BIN) $(CHAINSAW) test ./e2e --parallel 2 --selector $(E2E_SELECTOR) $(E2E_FLAGS)
+	SSE_KEY=$$(openssl rand -base64 32) LOCALBIN=$(CACHE_BIN) $(CHAINSAW) test ./e2e --parallel 2 --selector $(E2E_SELECTOR) $(E2E_FLAGS)
 
 .PHONY: local-deploy
 local-deploy: kind-cluster tilt kustomize clusterctl
@@ -175,7 +174,6 @@ kind-cluster: kind ctlptl
 
 LATEST_REF         := $(shell git rev-parse --short HEAD)
 LAST_RELEASE       := $(shell git describe --abbrev=0 --tags)
-COMMON_CLUSTER_REF := $(shell echo "up-$(LATEST_REF)" | cut -c1-8)
 COMMON_NAMESPACE   := test-upgrade
 
 .PHONY: checkout-latest-commit
@@ -188,13 +186,13 @@ checkout-last-release:
 
 .PHONY: last-release-cluster
 last-release-cluster: kind ctlptl tilt kustomize clusterctl chainsaw kind-cluster checkout-last-release local-release local-deploy
-	GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) SKIP_CUSTOM_DELETE=true $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 600s --skip-delete ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
+	LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) SKIP_CUSTOM_DELETE=true $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 600s --skip-delete ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
 
 .PHONY: test-upgrade
 test-upgrade: last-release-cluster checkout-latest-commit
 	$(MAKE) local-release
 	$(MAKE) local-deploy
-	GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 800s ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
+	LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test --namespace $(COMMON_NAMESPACE) --assert-timeout 800s ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
 
 .PHONY: clean-kind-cluster
 clean-kind-cluster: ctlptl

e2e/admission-webhooks/validating/chainsaw-test.yaml

@@ -13,7 +13,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'validating-webhooks', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'validating-webhooks', random('[0-9a-z]{7}')]))
     - name: name
       # Format a generic resource name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/capl-cluster-flavors/k3s-capl-cluster/chainsaw-test.yaml

@@ -13,7 +13,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'k3s-cluster', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'k3s-cluster', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/capl-cluster-flavors/kubeadm-capl-cluster/chainsaw-test.yaml

@@ -13,7 +13,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'default-cluster', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'default-cluster', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       # linode firewall has limit of max 32 chars, so we truncate the cluster name to 29 chars

e2e/capl-cluster-flavors/kubeadm-flatcar-vpcless-capl-cluster/chainsaw-test.yaml

@@ -13,7 +13,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'flatcar-cluster', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'flatcar-cluster', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/chainsaw-test.yaml

@@ -13,7 +13,7 @@ spec:
   bindings:
     # Identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'kdmf-tst', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'kdmf-tst', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))
@@ -308,7 +308,7 @@ spec:
               - name: TARGET_API_VERSION
                 value: v4beta
               - name: BUCKET_NAME
-                value: (join('-', ['e2e', 'kdmf-tst', env('GIT_REF'), 'etcd-backup']))
+                value: (join('-', [($run), 'etcd-backup']))
               - name: URI
                 value: (join('/', ['object-storage', 'buckets', env('LINODE_REGION')]))
             content: |
@@ -357,9 +357,9 @@ spec:
               - name: CAPL_KUBECONFIG
                 value: ./kubeadm-full-cluster-kubeconfig.yaml
               - name: BUCKET_NAME
-                value: (join('-', ['e2e', 'kdmf-tst', env('GIT_REF'), 'etcd-backup']))
+                value: (join('-', [($run), 'etcd-backup']))
               - name: SECRET_NAME
-                value: (join('-', ['e2e', 'kdmf-tst', env('GIT_REF'), 'etcd-backup-obj-key']))
+                value: (join('-', [($run), 'etcd-backup-obj-key']))
               - name: BUCKET_ENDPOINT
                 value: (join('.', [(join('-', [env('LINODE_REGION'), '1'])), 'linodeobjects', 'com' ]))
               - name: LOCAL_BIN

e2e/capl-cluster-flavors/rke2-capl-cluster/chainsaw-test.yaml

@@ -12,7 +12,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'rke2', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'rke2', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodecluster-controller/firewall-integration/chainsaw-test.yaml

@@ -12,7 +12,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'firewall-integration', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'firewall-integration', random('[0-9a-z]{7}')]))
     - name: firewall
       # Format the firewall name into a valid Kubernetes object name
       value: (trim((truncate(($run), `63`)), '-'))

e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml

@@ -13,7 +13,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'min-cluster', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'min-cluster', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodefirewall-controller/linodefirewall-addressset/chainsaw-test.yaml

@@ -12,7 +12,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'addrset-firewall', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'addrset-firewall', random('[0-9a-z]{7}')]))
     - name: firewall
       # Format the firewall name into a valid Kubernetes object name
       value: (trim((truncate(($run), `63`)), '-'))

e2e/linodefirewall-controller/linodefirewall-firewall-rule/chainsaw-test.yaml

@@ -12,7 +12,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'fwrule-firewall', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'fwrule-firewall', random('[0-9a-z]{7}')]))
     - name: firewall
       # Format the firewall name into a valid Kubernetes object name
       value: (trim((truncate(($run), `63`)), '-'))

e2e/linodefirewall-controller/minimal-linodefirewall/chainsaw-test.yaml

@@ -12,7 +12,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'min-firewall', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'min-firewall', random('[0-9a-z]{7}')]))
     - name: firewall
       # Format the firewall name into a valid Kubernetes object name
       value: (trim((truncate(($run), `63`)), '-'))

e2e/linodemachine-controller/cluster-object-store/chainsaw-test.yaml

@@ -11,7 +11,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'cluster-obj-store', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'cluster-obj-store', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodemachine-controller/linodecluster-vpcref-integration/chainsaw-test.yaml

@@ -14,7 +14,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'lc-vpc', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'lc-vpc', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodemachine-controller/linodemachine-vpcref-integration/chainsaw-test.yaml

@@ -14,7 +14,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'lm-vpc', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'lm-vpc', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodemachine-controller/metadata-gzip-compression/chainsaw-test.yaml

@@ -11,7 +11,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'metadata-gzip', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'metadata-gzip', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml

@@ -13,7 +13,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'min-lm', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'min-lm', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodemachinetemplate-controller/lmt-tags/chainsaw-test.yaml

@@ -10,7 +10,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'cluster-obj-store', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'cluster-obj-store', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))

e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/chainsaw-test.yaml

@@ -12,7 +12,7 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'force-delete-obj', env('GIT_REF')]))
+      value: (join('-', ['e2e', 'force-delete-obj', random('[0-9a-z]{7}')]))
     - name: bucket
       # Format the bucket name into a valid Kubernetes object name
       # TODO: This is over-truncated to account for the Kubernetes access key Secret