Merge pull request #395 from rabbitmq/update-pr-workflow

Update PR workflow to use latest k8s

Author: ChunyiLyu

.github/workflows/pr.yml

@@ -23,22 +23,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        k8s: [v1.19.11, v1.21.1]
+        k8s: [v1.22.9, v1.24.1]
     steps:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: '^1.16.0' # Require Go 1.16 and above, but lower than Go 2.0.0
+        go-version: '^1.17.0' # Require Go 1.16 and above, but lower than Go 2.0.0
     - name: System tests
       env:
         K8S_VERSION: ${{ matrix.k8s }}
       run: |
         export GOPATH="$HOME/go"
         export PATH="$PATH:$GOPATH/bin"
-        make install-tools
+        make install-tools cmctl
         kind create cluster --image kindest/node:"$K8S_VERSION"
-        make cert-manager
-        make cluster-operator
+        make cert-manager cluster-operator
         DOCKER_REGISTRY_SERVER=local-server OPERATOR_IMAGE=local-operator make deploy-kind BUILD_KIT=docker
         make system-tests BUILD_KIT=docker

.gitignore

@@ -6,4 +6,6 @@ cover.out
 tags
 releases/
 testbin/
+bin/
+tmp/
 *.iml

Makefile

@@ -26,6 +26,15 @@ install-tools:
 ENVTEST_K8S_VERSION = 1.22.1
 ARCHITECTURE = amd64
 LOCAL_TESTBIN = $(CURDIR)/testbin
+
+LOCAL_BIN := $(CURDIR)/bin
+$(LOCAL_BIN):
+	mkdir -p -v $(@)
+
+LOCAL_TMP := $(CURDIR)/tmp
+$(LOCAL_TMP):
+	mkdir -p -v $(@)
+
 # "Control plane binaries (etcd and kube-apiserver) are loaded by default from /usr/local/kubebuilder/bin.
 # This can be overridden by setting the KUBEBUILDER_ASSETS environment variable"
 # https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/envtest
@@ -80,6 +89,7 @@ uninstall: manifests
 	kustomize build config/crd | kubectl delete -f -
 
 deploy-manager:
+	$(CMCTL) check api --wait=2m
 	kustomize build config/default/overlays/cert-manager/ | kubectl apply -f -
 
 deploy: manifests deploy-rbac deploy-manager
@@ -90,12 +100,14 @@ destroy:
 
 # Deploy operator with local changes
 deploy-dev: check-env-docker-credentials docker-build-dev manifests deploy-rbac docker-registry-secret set-operator-image-repo
+	$(CMCTL) check api --wait=2m
 	kustomize build config/default/overlays/dev | sed 's@((operator_docker_image))@"$(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)"@' | kubectl apply -f -
 
 # Load operator image and deploy operator into current KinD cluster
 deploy-kind: manifests deploy-rbac
 	$(BUILD_KIT) build --build-arg=GIT_COMMIT=$(GIT_COMMIT) -t $(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT) .
 	kind load docker-image $(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)
+	$(CMCTL) check api --wait=2m
 	kustomize build config/default/overlays/kind | sed 's@((operator_docker_image))@"$(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)"@' | kubectl apply -f -
 
 deploy-rbac:
@@ -176,14 +188,31 @@ endif
 cluster-operator:
 	@kubectl apply -f https://github.com/rabbitmq/cluster-operator/releases/latest/download/cluster-operator.yml
 
+destroy-cluster-operator:
+	@kubectl delete -f https://github.com/rabbitmq/cluster-operator/releases/latest/download/cluster-operator.yml --ignore-not-found
+
 ## used in CI pipeline to create release artifact
 generate-manifests:
 	mkdir -p releases
 	kustomize build config/installation/  > releases/messaging-topology-operator.bak
 	sed '/CERTIFICATE_NAMESPACE.*CERTIFICATE_NAME/d' releases/messaging-topology-operator.bak > releases/messaging-topology-operator.yaml
 	kustomize build config/installation/cert-manager/ > releases/messaging-topology-operator-with-certmanager.yaml
 
-CERT_MANAGER_VERSION ?=v1.2.0
+################
+# Cert Manager #
+################
+
+CERT_MANAGER_VERSION ?= v1.7.0
+CERT_MANAGER_MANIFEST ?= https://github.com/jetstack/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml
+
+CMCTL = $(LOCAL_BIN)/cmctl
+.PHONY: cmctl
+cmctl: | $(CMCTL)
+$(CMCTL): | $(LOCAL_BIN) $(LOCAL_TMP)
+	curl -sSL -o $(LOCAL_TMP)/cmctl.tar.gz https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cmctl-$(platform)-$(shell go env GOARCH).tar.gz
+	tar -C $(LOCAL_TMP) -xzf $(LOCAL_TMP)/cmctl.tar.gz
+	mv $(LOCAL_TMP)/cmctl $(CMCTL)
+
 cert-manager: ## Deploys Cert Manager from JetStack repo. Use CERT_MANAGER_VERSION to customise version e.g. v1.2.0
 	kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml