E2E test vpc controller (#91)

Co-authored-by: Richard Kovacs <[email protected]>
linode · Feb 9, 2024 · 24de647 · 24de647
1 parent 660e466
commit 24de647
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 5 deletions.
diff --git a/controller/linodevpc_controller_helpers.go b/controller/linodevpc_controller_helpers.go
@@ -68,6 +68,7 @@ func (r *LinodeVPCReconciler) reconcileVPC(ctx context.Context, vpcScope *scope.
 		return err
 	}
 
+	vpcScope.LinodeVPC.Spec.Label = vpc.Label
 	vpcScope.LinodeVPC.Spec.VPCID = &vpc.ID
 
 	return nil

diff --git a/e2e/linodemachine-controller/byovpc/01-create-vpc.tpl.yml b/e2e/linodemachine-controller/byovpc/01-create-vpc.tpl.yml
@@ -5,6 +5,6 @@ metadata:
     cluster.x-k8s.io/paused: "true"
   name: linodevpc-sample
 spec:
-  label: capli-e2e-byovpc-sample
+  label: capli-e2e-byovpc-for-all-tests
   region: us-sea
   vpcID: ${VPC_ID}
diff --git a/e2e/linodemachine-controller/byovpc/01-vpc-create-options.json b/e2e/linodemachine-controller/byovpc/01-vpc-create-options.json
@@ -1,10 +1,10 @@
 {
-    "label": "capli-e2e-byovpc-sample",
+    "label": "capli-e2e-byovpc-for-all-tests",
     "region": "us-sea",
     "subnets": [
         {
             "ipv4": "10.0.0.0/24",
-            "label": "capli-e2e-byovpc-sample"
+            "label": "capli-e2e-byovpc-for-all-tests"
         }
     ]
 }
diff --git a/e2e/linodemachine-controller/byovpc/Makefile b/e2e/linodemachine-controller/byovpc/Makefile
@@ -1,11 +1,11 @@
 include ../../Makefile
 
 createVPC:
-	@URI=vpcs FILTER='{"label":"capli-e2e-byovpc-sample"}' make --no-print-directory callLinodeApiGet | grep -v 'results": 0' ||\
+	@URI=vpcs FILTER='{"label":"capli-e2e-byovpc-for-all-tests"}' make --no-print-directory callLinodeApiGet | grep -v 'results": 0' ||\
 	URI=vpcs BODY='@01-vpc-create-options.json' make --no-print-directory callLinodeApiPost
 
 enableVPC:
 	PATCH='{"status":{"ready":true}}' OBJ="linodevpcs/linodevpc-sample" make --no-print-directory patchKubeObjStatus
 
 fetchVPCID:
-	@URI=vpcs FILTER='{"label":"capli-e2e-byovpc-sample"}' make --no-print-directory callLinodeApiGet | jq -r .data[0].id
+	@URI=vpcs FILTER='{"label":"capli-e2e-byovpc-for-all-tests"}' make --no-print-directory callLinodeApiGet | jq -r .data[0].id
diff --git a/e2e/linodevpc-controller/minimal/01-assert.yaml b/e2e/linodevpc-controller/minimal/01-assert.yaml
@@ -0,0 +1,9 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeVPC
+metadata:
+  name: linodevpc-sample
+spec:
+  label: capli-e2e-byovpc-sample
+  region: us-sea
+status:
+  ready: true
diff --git a/e2e/linodevpc-controller/minimal/01-create-vpc.yaml b/e2e/linodevpc-controller/minimal/01-create-vpc.yaml
@@ -0,0 +1,7 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeVPC
+metadata:
+  name: linodevpc-sample
+spec:
+  label: capli-e2e-byovpc-sample
+  region: us-sea
diff --git a/e2e/linodevpc-controller/minimal/02-delete-vpc.yaml b/e2e/linodevpc-controller/minimal/02-delete-vpc.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+  kind: LinodeVPC
+  name: linodevpc-sample
diff --git a/e2e/linodevpc-controller/minimal/02-error.yaml b/e2e/linodevpc-controller/minimal/02-error.yaml
@@ -0,0 +1,7 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeVPC
+metadata:
+  name: linodevpc-sample
+spec:
+  label: capli-e2e-byovpc-sample
+  region: us-sea
diff --git a/e2e/linodevpc-controller/minimal/03-verify-vpc.yaml b/e2e/linodevpc-controller/minimal/03-verify-vpc.yaml
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="vpcs" FILTER="{\"label\":\"CLi-$(OBJ=linodevpcs/linodevpc-sample make getKubeUid | sed 's/-//g')\"}" make callLinodeApiGet | grep 'results": 0'
diff --git a/e2e/linodevpc-controller/minimal/Makefile b/e2e/linodevpc-controller/minimal/Makefile
@@ -0,0 +1 @@
+include ../../Makefile