E2E test machine controller

.github/workflows/build_test_ci.yml

@@ -75,7 +75,7 @@ jobs:
     - name: Docker cache
       uses: ScribeMD/[email protected]
       with:
-        key: docker-${{ runner.os }}-${{ hashFiles('Makefile') }}}
+        key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }}}
 
     - name: Lint
       run: make lint
@@ -89,6 +89,59 @@ jobs:
     - name: Nilcheck
       run: make nilcheck
 
+  e2e-test:
+    needs:  [go-build-test, docker-build]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@v2
+      with:
+        disable-sudo: true
+        egress-policy: block
+        allowed-endpoints: >
+          api.linode.com:443
+          api.github.com:443
+          github.com:443
+          gcr.io:443
+          proxy.golang.org:443
+          sum.golang.org:443
+          *.githubusercontent.com:443
+          docker.io:443
+          registry-1.docker.io:443
+          auth.docker.io:443
+          production.cloudflare.docker.com:443
+          storage.googleapis.com:443
+          registry.k8s.io:443
+          *.pkg.dev:443
+          *.amazonaws.com:443
+          *.blob.core.windows.net:443
+          quay.io:443
+          *.quay.io:443
+          api.snapcraft.io:443
+
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: 'stable'
+
+    - name: Docker cache
+      uses: ScribeMD/[email protected]
+      with:
+        key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }}}
+
+    - name: E2E test
+      run: make e2etest
+      env:
+        LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
+
+    - uses: actions/upload-artifact@v4
+      if: ${{ always() }}
+      with:
+        name: kind-logs
+        path: .kind/kind-logs-*
+
   docker-build:
     runs-on: ubuntu-latest
     steps:
@@ -114,7 +167,7 @@ jobs:
     - name: Docker cache
       uses: ScribeMD/[email protected]
       with:
-        key: docker-${{ runner.os }}-${{ hashFiles('Dockerfile') }}
+        key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }}
 
     - name: Build the Docker image
       run: make docker-build

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .idea
 bin/*
+kind-logs-*
 cover.out
 kubeconfig

.husky/hooks/pre-push

@@ -13,7 +13,7 @@ if git status --short | grep -qv "??"; then
     trap unstash EXIT
 fi
 
-make generate manifests
+make generate manifests _setImage
 git diff --exit-code --quiet || (git status && exit 1)
 
 make lint gosec nilcheck test

Makefile

@@ -88,6 +88,13 @@ vulncheck: govulncheck ## Run vulnerability check against code.
 test: manifests generate fmt vet envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -race -timeout 60s ./... -coverprofile cover.out
 
+.PHONY: e2etest
+e2etest: kind kuttl kustomize clusterctl envsubst manifests generate docker-build
+	@echo -n "LINODE_TOKEN=$(LINODE_TOKEN)" > config/default/.env.linode
+	@$(CONTAINER_TOOL) tag ${IMG} capli-controller:e2e
+	IMG=capli-controller:e2e $(KUTTL) test --config e2e/kuttl-config.yaml
+	make _setImage
+
 ##@ Build
 
 .PHONY: build
@@ -140,9 +147,11 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
-.PHONY: deploy
-deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+_setImage: kustomize
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+
+.PHONY: deploy
+deploy: manifests kustomize _setImage ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
 
 .PHONY: undeploy
@@ -152,8 +161,8 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 .PHONY: tilt-cluster
 tilt-cluster: ctlptl tilt kind clusterctl
 	@echo -n "LINODE_TOKEN=$(LINODE_TOKEN)" > config/default/.env.linode
-	$(CTLPTL) apply -f ctlptl-config.yaml
-	$(TILT) up
+	$(CTLPTL) apply -f .tilt/ctlptl-config.yaml
+	$(TILT) up --stream
 
 ##@ Build Dependencies
 
@@ -171,7 +180,9 @@ CLUSTERCTL ?= $(LOCALBIN)/clusterctl
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 TILT ?= $(LOCALBIN)/tilt
 KIND ?= $(LOCALBIN)/kind
+KUTTL ?= $(LOCALBIN)/kuttl
 ENVTEST ?= $(LOCALBIN)/setup-envtest
+ENVSUBST ?= $(LOCALBIN)/envsubst
 HUSKY ?= $(LOCALBIN)/husky
 NILAWAY ?= $(LOCALBIN)/nilaway
 GOVULNC ?= $(LOCALBIN)/govulncheck
@@ -183,6 +194,8 @@ CLUSTERCTL_VERSION ?= v1.5.3
 CONTROLLER_TOOLS_VERSION ?= v0.13.0
 TILT_VERSION ?= 0.33.6
 KIND_VERSION ?= 0.20.0
+KUTTL_VERSION ?= 0.15.0
+ENVSUBST_VERSION ?= v1.4.2
 HUSKY_VERSION ?= v0.2.16
 NILAWAY_VERSION ?= latest
 GOVULNC_VERSION ?= v1.0.1
@@ -231,11 +244,23 @@ $(KIND): $(LOCALBIN)
 	test -s $(KIND) && $(KIND) version | grep -q $(KIND_VERSION) || \
 	(cd $(LOCALBIN); curl -Lso ./kind https://github.com/kubernetes-sigs/kind/releases/download/v$(KIND_VERSION)/kind-$(OS)-$(ARCH_SHORT) && chmod +x kind)
 
+.PHONY: kuttl
+kuttl: $(KUTTL) ## Download kuttl locally if necessary. If wrong version is installed, it will be overwritten.
+$(KUTTL): $(LOCALBIN)
+	test -s $(KUTTL) && $(KUTTL) version | grep -q $(KUTTL_VERSION) || \
+	(cd $(LOCALBIN); curl -Lso ./kuttl https://github.com/kudobuilder/kuttl/releases/download/v$(KUTTL_VERSION)/kubectl-kuttl_$(KUTTL_VERSION)_$(OS)_$(ARCH) && chmod +x kuttl)
+
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
 	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
+.PHONY: envsubst
+envsubst: $(ENVSUBST) ## Download envsubst locally if necessary. If wrong version is installed, it will be overwritten.
+$(ENVSUBST): $(LOCALBIN)
+	test -s $(ENVSUBST) || \
+	(cd $(LOCALBIN); curl -Lso ./envsubst https://github.com/a8m/envsubst/releases/download/$(ENVSUBST_VERSION)/envsubst-$(shell uname -s)-$(ARCH) && chmod +x envsubst)
+
 .PHONY: husky
 husky: $(HUSKY) ## Download husky locally if necessary.
 	@echo Execute install command to enable git hooks: ./bin/husky install

README.md

@@ -1,6 +1,22 @@
 # Cluster API Provider Linode
 A [Cluster API](https://cluster-api.sigs.k8s.io/) implementation for the [Linode](https://www.linode.com/) to create kubernetes clusters.
 
+## Local development
+
+### Enable git hooks
+
+To enable automatic code validation on code push, execute the following commands:
+
+```bash
+PATH="$PWD/bin:$PATH" make husky && husky install
+```
+
+If you temporary would like to disable git hook, set `SKIP_GIT_PUSH_HOOK` value:
+
+```bash
+SKIP_GIT_PUSH_HOOK=1 git push
+```
+
 ### Local development with Tilt
 
 For local development execute the following `make` target:
@@ -10,3 +26,15 @@ LINODE_TOKEN=<YOUR LINODE TOKEN> make tilt-cluster
 ```
 
 This command creates a Kind cluster, and deploys resources via Tilt. You can freely change the code and wait for Tilt to update provider.
+
+### E2E testing
+
+For local development execute the following `make` target:
+
+```bash
+LINODE_TOKEN=<YOUR LINODE TOKEN> make e2etest
+```
+
+This command creates a Kind cluster, and executes all the defined tests.
+
+> Please ensure you have increased maximum open files on your host: https://kind.sigs.k8s.io/docs/user/known-issues/#pod-errors-due-to-too-many-open-files

api/v1alpha1/linodecluster_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
@@ -35,6 +36,10 @@ type LinodeClusterSpec struct {
 	// NetworkSpec encapsulates all things related to Linode network.
 	// +optional
 	Network NetworkSpec `json:"network"`
+
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
+	// +optional
+	VPCRef *corev1.ObjectReference `json:"vpcRef,omitempty"`
 }
 
 // LinodeClusterStatus defines the observed state of LinodeCluster

api/v1alpha1/linodemachine_types.go

@@ -41,7 +41,10 @@ type LinodeMachineSpec struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	Type string `json:"type"`
+	// +kubebuilder:validation:MinLength=3
+	// +kubebuilder:validation:MaxLength=63
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
+	// +optional
 	Label string `json:"label,omitempty"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	Group string `json:"group,omitempty"`
@@ -82,10 +85,13 @@ type InstanceMetadataOptions struct {
 
 // InstanceConfigInterfaceCreateOptions defines network interface config
 type InstanceConfigInterfaceCreateOptions struct {
-	IPAMAddress string                          `json:"ipamAddress,omitempty"`
-	Label       string                          `json:"label,omitempty"`
-	Purpose     linodego.ConfigInterfacePurpose `json:"purpose,omitempty"`
-	Primary     bool                            `json:"primary,omitempty"`
+	IPAMAddress string `json:"ipamAddress,omitempty"`
+	// +kubebuilder:validation:MinLength=3
+	// +kubebuilder:validation:MaxLength=63
+	// +optional
+	Label   string                          `json:"label,omitempty"`
+	Purpose linodego.ConfigInterfacePurpose `json:"purpose,omitempty"`
+	Primary bool                            `json:"primary,omitempty"`
 	// +optional
 	SubnetID *int `json:"subnetId,omitempty"`
 	// +optional
@@ -103,6 +109,7 @@ type VPCIPv4 struct {
 type LinodeMachineStatus struct {
 	// Ready is true when the provider resource is ready.
 	// +optional
+	// +kubebuilder:default=false
 	Ready bool `json:"ready"`
 
 	// Addresses contains the Linode instance associated addresses.