chore: merge main-v1beta2 fix initial conflicts

.github/workflows/build_and_publish.yml

@@ -16,42 +16,41 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
             uselagoon/remote-controller
             ghcr.io/uselagoon/remote-controller
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Login to GHCR
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/remote-controller.yaml

@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - main
+      - main-v1beta2
 
 jobs:
   test-suite:

Dockerfile

@@ -16,7 +16,7 @@ COPY controllers/ controllers/
 COPY internal/ internal/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=on go build -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

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:trivialVersions=true,preserveUnknownFields=false"
 
 CONTROLLER_NAMESPACE ?= lagoon-builddeploy
 

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)
+			}
+		})
+	}
+}