Update libs to support Apple silicon (#164)

Re-use test-env, mocks, and linter

Author: astaticvoid

Makefile

@@ -15,7 +15,6 @@ GOBIN=$(shell go env GOBIN)
 endif
 
 # Setting SHELL to bash allows bash commands to be executed by recipes.
-# This is a requirement for 'setup-envtest.sh' in the test target.
 # Options are set to exit when a recipe line exits non-zero or a piped command fails.
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
@@ -58,33 +57,40 @@ mod:
 tidy:
 	go mod tidy
 
+GOLANGCI_LINT=$(shell pwd)/bin/golangci-lint
 golangci-lint: ## Download golangci-lint
+ifneq ($(shell test -f $(GOLANGCI_LINT); echo $$?), 0)
+	@echo Getting golangci-lint...
 	@mkdir -p $(shell pwd)/bin
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell pwd)/bin v1.45.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell pwd)/bin v1.46.2
+endif
 
 .PHONY: lint
 lint: golangci-lint ## Run linter
-	$(shell pwd)/bin/golangci-lint run
+	$(GOLANGCI_LINT) run
 
 .PHONY: goimports
 goimports: ## run goimports updating files in place
 	goimports -w .
 
 ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
-test: manifests generate generate-mocks fmt vet test-setup ## Run tests.
-	source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out -covermode=atomic
+KUBEBUILDER_ASSETS?="$(shell $(ENVTEST) use -i $(ENVTEST_KUBERNETES_VERSION) --bin-dir=$(ENVTEST_ASSETS_DIR) -p path)"
+test: manifests generate generate-mocks fmt vet test-setup ## Run tests
+	KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test ./... -coverprofile cover.out -covermode=atomic
 
-test-setup: ## setup test environment
+test-setup: setup-envtest ## Ensure test environment has been downloaded
+ifneq ($(shell test -d $(ENVTEST_ASSETS_DIR); echo $$?), 0)
+	@echo Setting up K8s test environment...
 	mkdir -p ${ENVTEST_ASSETS_DIR}
-	test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.8.3/hack/setup-envtest.sh
-	source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR)
+	$(ENVTEST) use 1.24.x --bin-dir $(ENVTEST_ASSETS_DIR)
+endif
 
 kind-integration-suite: ## Provision and run integration tests with cleanup
 	make kind-integration-setup && \
 	make kind-integration-run && \
 	make kind-integration-cleanup
 
-kind-integration-setup: build kind test-setup ## Setup the integration test using kind clusters
+kind-integration-setup: build kind ## Setup the integration test using kind clusters
 	@./integration/kind-test/scripts/setup-kind.sh
 
 kind-integration-run: ## Run the integration test controller
@@ -98,7 +104,7 @@ eks-integration-suite: ## Provision and run EKS integration tests with cleanup
 	make eks-integration-run && \
 	make eks-integration-cleanup
 
-eks-integration-setup: build test-setup ## Setup the integration test using EKS clusters
+eks-integration-setup: build ## Setup the integration test using EKS clusters
 	@./integration/eks-test/scripts/eks-setup.sh
 
 eks-integration-run: ## Run the integration test controller
@@ -129,7 +135,8 @@ docker-push: ## Push docker image with the manager.
 clean:
 	@echo Cleaning...
 	go clean
-	rm -rf $(MOCKS_DESTINATION) bin/ testbin/ cover.out
+	if test -d $(ENVTEST_ASSETS_DIR) ; then chmod -R +w $(ENVTEST_ASSETS_DIR) ; fi
+	rm -rf $(MOCKS_DESTINATION)/ bin/ $(ENVTEST_ASSETS_DIR)/ cover.out
 
 ##@ Deployment
 
@@ -148,6 +155,8 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 
 MOCKS_DESTINATION=mocks
 generate-mocks: mockgen
+ifneq ($(shell test -d $(MOCKS_DESTINATION); echo $$?), 0)
+	@echo Generating mocks...
 	$(MOCKGEN) --source pkg/cloudmap/client.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/client_mock.go --package cloudmap_mock
 	$(MOCKGEN) --source pkg/cloudmap/cache.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/cache_mock.go --package cloudmap_mock
 	$(MOCKGEN) --source pkg/cloudmap/operation_poller.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/operation_poller_mock.go --package cloudmap_mock
@@ -156,23 +165,27 @@ generate-mocks: mockgen
 	$(MOCKGEN) --source pkg/cloudmap/aws_facade.go --destination $(MOCKS_DESTINATION)/pkg/cloudmap/aws_facade_mock.go --package cloudmap_mock
 	$(MOCKGEN) --source integration/janitor/api.go --destination $(MOCKS_DESTINATION)/integration/janitor/api_mock.go --package janitor_mock
 	$(MOCKGEN) --source integration/janitor/aws_facade.go --destination $(MOCKS_DESTINATION)/integration/janitor/aws_facade_mock.go --package janitor_mock
-
+endif
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2)
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
+	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
+
+ENVTEST = $(shell pwd)/bin/setup-envtest
+setup-envtest: ## Download setup-envtest
+	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
 
 MOCKGEN = $(shell pwd)/bin/mockgen
 mockgen: ## Download mockgen
 	$(call go-get-tool,$(MOCKGEN),github.com/golang/mock/[email protected])
 
 KIND = $(shell pwd)/bin/kind
 kind: ## Download kind
-	$(call go-get-tool,$(KIND),sigs.k8s.io/kind@v0.13.0)
+	$(call go-get-tool,$(KIND),sigs.k8s.io/kind@v0.14.0)
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

config/crd/bases/multicluster.x-k8s.io_serviceexports.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: serviceexports.multicluster.x-k8s.io
 spec:
@@ -114,9 +114,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/crd/bases/multicluster.x-k8s.io_serviceimports.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: serviceimports.multicluster.x-k8s.io
 spec:
@@ -136,9 +136,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

go.mod

@@ -15,7 +15,7 @@ require (
 	k8s.io/api v0.24.2
 	k8s.io/apimachinery v0.24.2
 	k8s.io/client-go v0.24.2
-	sigs.k8s.io/controller-runtime v0.12.2
+	sigs.k8s.io/controller-runtime v0.12.3
 )
 
 require (

go.sum

@@ -1002,8 +1002,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
-sigs.k8s.io/controller-runtime v0.12.2 h1:nqV02cvhbAj7tbt21bpPpTByrXGn2INHRsi39lXy9sE=
-sigs.k8s.io/controller-runtime v0.12.2/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
+sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
+sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=

integration/eks-test/scripts/eks-run-tests.sh

@@ -28,7 +28,7 @@ if [ "$exit_code" -eq 0 ] ; then
 fi
 
 echo "sleeping..."
-sleep 2s
+sleep 2
 
 # Scaling and verifying deployment
 if [ "$exit_code" -eq 0 ] ; then

integration/eks-test/scripts/eks-setup.sh

@@ -22,5 +22,5 @@ $KUBECTL_BIN apply -f "$CONFIGS/nginx-serviceexport.yaml"
 # Create client-hello pod
 $KUBECTL_BIN config use-context $IMPORT_CLS
 $KUBECTL_BIN apply -f "$CONFIGS/client-hello.yaml"
-sleep 15s
+sleep 15
 $KUBECTL_BIN exec $CLIENT_POD -n $NAMESPACE /bin/sh -- apk add curl ## install curl

integration/kind-test/scripts/common.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export KIND_BIN='./bin/kind'
-export KUBECTL_BIN='./testbin/bin/kubectl'
+export KUBECTL_BIN='kubectl'
 export LOGS='./integration/kind-test/testlog'
 export CONFIGS='./integration/kind-test/configs'
 export SCENARIOS='./integration/shared/scenarios'
@@ -11,6 +11,6 @@ export ENDPT_PORT=80
 export SERVICE_PORT=8080
 export KIND_SHORT='cloud-map-e2e'
 export CLUSTER='kind-cloud-map-e2e'
-export IMAGE='kindest/node:v1.19.16@sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4'
+export IMAGE='kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3'
 export EXPECTED_ENDPOINT_COUNT=5
 export UPDATED_ENDPOINT_COUNT=6

integration/kind-test/scripts/run-tests.sh

@@ -26,7 +26,7 @@ if [ "$exit_code" -eq 0 ] ; then
 fi
 
 echo "sleeping..."
-sleep 2s
+sleep 2
 
 deployment=$($KUBECTL_BIN get deployment --namespace "$NAMESPACE" -o json | jq -r '.items[0].metadata.name')
 

integration/shared/scripts/poll-endpoints.sh

@@ -13,7 +13,7 @@ do
     exit 1
   fi
 
-  sleep 2s
+  sleep 2
   if ! addresses=$($KUBECTL_BIN get endpointslices -o json --namespace "$NAMESPACE" | \
     jq --arg SERVICE "$SERVICE" '.items[] | select(.metadata.ownerReferences[].name==$SERVICE) | .endpoints[].addresses[0]' 2> /dev/null)
   then