Merge pull request #90 from amazeeio/kubernetes-1.22

Updates to support Kubernetes 1.22

.github/workflows/lagoon-kbd.yaml

@@ -18,22 +18,22 @@ jobs:
         fetch-depth: "0"
     - name: Set up testing dependencies
       run: sudo apt-get update && sudo apt-get -y install build-essential && sudo apt-get clean
-    - name: Install go, kustomize, kubebuilder, helm, docker-compose, kind
+    - name: Setup correct Go version
+      uses: actions/setup-go@v2
+      with:
+        go-version: '1.16'
+    - name: Install kustomize, kubebuilder, helm, docker-compose, kind
       run: |
-        #go
-        sudo rm -rf /usr/local/go
-        curl -sLo /tmp/go1.13.7.linux-amd64.tar.gz https://dl.google.com/go/go1.13.7.linux-amd64.tar.gz
-        sudo tar -C /usr/local -xzf /tmp/go1.13.7.linux-amd64.tar.gz
         #kustomize
         curl -sLo /tmp/kustomize_v3.5.4_linux_amd64.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv3.5.4/kustomize_v3.5.4_linux_amd64.tar.gz
         sudo tar -C /usr/local/bin -xzf /tmp/kustomize_v3.5.4_linux_amd64.tar.gz
         #kubebuilder
-        curl -sL https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.2.0/kubebuilder_2.2.0_linux_amd64.tar.gz | tar -xz -C /tmp/
+        curl -sL https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.2/kubebuilder_2.3.2_linux_amd64.tar.gz | tar -xz -C /tmp/
         sudo mkdir -p /usr/local/kubebuilder/bin
-        sudo mv /tmp/kubebuilder_2.2.0_linux_amd64/bin/* /usr/local/kubebuilder/bin
+        sudo mv /tmp/kubebuilder_2.3.2_linux_amd64/bin/* /usr/local/kubebuilder/bin
         chmod +x /usr/local/kubebuilder/bin/*
         #helm
-        curl -sL https://get.helm.sh/helm-v3.3.0-rc.1-linux-amd64.tar.gz | tar -xz -C /tmp/
+        curl -sL https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz | tar -xz -C /tmp/
         sudo mv /tmp/linux-amd64/helm /usr/local/bin/helm
         chmod +x /usr/local/bin/helm
         #docker-compose

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.13 as builder
+FROM golang:1.16-alpine3.13 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -73,7 +73,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.4 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen