Merge pull request #259 from uselagoon/main-v1beta2

feat: implement v1beta2 api

.github/workflows/remote-controller.yaml

@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - main
+      - main-v1beta2
 
 jobs:
   test-suite:
@@ -51,7 +52,7 @@ jobs:
     - name: Setup correct Go version
       uses: actions/setup-go@v2
       with:
-        go-version: '1.20'
+        go-version: '1.22'
     - name: Install kubebuilder
       run: |
         #kubebuilder

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20-alpine AS builder
+FROM golang:1.22-alpine AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=false"
+CRD_OPTIONS ?= "crd"
 
 CONTROLLER_NAMESPACE ?= lagoon-builddeploy
 
@@ -102,7 +102,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.2 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

PROJECT

@@ -2,6 +2,12 @@ domain: lagoon.sh
 multigroup: true
 repo: github.com/uselagoon/remote-controller
 resources:
+- group: crd
+  kind: LagoonBuild
+  version: v1beta2
+- group: crd
+  kind: LagoonTask
+  version: v1beta2
 - group: crd
   kind: LagoonBuild
   version: v1beta1

apis/lagoon/v1beta1/helpers_test.go

@@ -0,0 +1,105 @@
+package v1beta1
+
+import (
+	"testing"
+)
+
+func TestCheckLagoonVersion(t *testing.T) {
+	type args struct {
+		build        *LagoonBuild
+		checkVersion string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "test1",
+			args: args{
+				build: &LagoonBuild{
+					Spec: LagoonBuildSpec{
+						Project: Project{
+							Variables: LagoonVariables{
+								Project: []byte(`[{"name":"LAGOON_SYSTEM_CORE_VERSION","value":"v2.12.0","scope":"internal_system"}]`),
+							},
+						},
+					},
+				},
+				checkVersion: "2.12.0",
+			},
+			want: true,
+		},
+		{
+			name: "test2",
+			args: args{
+				build: &LagoonBuild{
+					Spec: LagoonBuildSpec{
+						Project: Project{
+							Variables: LagoonVariables{
+								Project: []byte(`[{"name":"LAGOON_SYSTEM_CORE_VERSION","value":"v2.11.0","scope":"internal_system"}]`),
+							},
+						},
+					},
+				},
+				checkVersion: "2.12.0",
+			},
+			want: false,
+		},
+		{
+			name: "test3",
+			args: args{
+				build: &LagoonBuild{
+					Spec: LagoonBuildSpec{
+						Project: Project{
+							Variables: LagoonVariables{
+								Project: []byte(`[]`),
+							},
+						},
+					},
+				},
+				checkVersion: "2.12.0",
+			},
+			want: false,
+		},
+		{
+			name: "test4",
+			args: args{
+				build: &LagoonBuild{
+					Spec: LagoonBuildSpec{
+						Project: Project{
+							Variables: LagoonVariables{
+								Project: []byte(`[{"name":"LAGOON_SYSTEM_CORE_VERSION","value":"v2.12.0","scope":"internal_system"}]`),
+							},
+						},
+					},
+				},
+				checkVersion: "v2.12.0",
+			},
+			want: true,
+		},
+		{
+			name: "test5",
+			args: args{
+				build: &LagoonBuild{
+					Spec: LagoonBuildSpec{
+						Project: Project{
+							Variables: LagoonVariables{
+								Project: []byte(`[{"name":"LAGOON_SYSTEM_CORE_VERSION","value":"v2.11.0","scope":"internal_system"}]`),
+							},
+						},
+					},
+				},
+				checkVersion: "v2.12.0",
+			},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := CheckLagoonVersion(tt.args.build, tt.args.checkVersion); got != tt.want {
+				t.Errorf("CheckLagoonVersion() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}