Merge branch 'main' of github.com:pluralsh/deployment-operator

Author: floreks

.github/workflows/ci.yaml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches:
       - main
+env:
+  GOPATH: /home/runner/go/
+  GOPROXY: "https://proxy.golang.org"
 jobs:
   build:
     name: Build

Makefile

@@ -1,19 +1,17 @@
-MODULES_DIRECTORY := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-API_DIRECTORY = $(MODULES_DIRECTORY)/api
-COMMON_DIRECTORY = $(MODULES_DIRECTORY)/common
-OPERATOR_DIRECTORY = $(MODULES_DIRECTORY)/operator
-PROVIDER_DIRECTORY = $(MODULES_DIRECTORY)/providers
-ARGOCD_PROVIDER_DIRECTORY = $(PROVIDER_DIRECTORY)/argocd
-FAKE_PROVIDER_DIRECTORY = $(PROVIDER_DIRECTORY)/fake
-PROVISIONER_DIRECTORY = $(MODULES_DIRECTORY)/provisioner
-MODULES := $(API_DIRECTORY) $(COMMON_DIRECTORY) $(OPERATOR_DIRECTORY) $(ARGOCD_PROVIDER_DIRECTORY) $(FAKE_PROVIDER_DIRECTORY) $(PROVISIONER_DIRECTORY)
-
-MAKEFLAGS += -j2
-
-.PHONY: --run $(MODULES)
---run: $(MODULES)
-
-$(MODULES):
+ROOT_DIRECTORY := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(ROOT_DIRECTORY)/config.mk
+
+PRE = --ensure-tools
+
+.PHONY: --ensure-tools
+--ensure-tools:
+	@$(MAKE) --no-print-directory -C $(TOOLS_DIRECTORY) ensure
+
+.PHONY: --run $(MODULE_DIRECTORIES)
+--run: $(MODULE_DIRECTORIES)
+
+$(MODULE_DIRECTORIES):
 	@$(MAKE) --directory=$@ $(TARGET)
 
 ##@ General
@@ -24,25 +22,25 @@ help: ## show help
 
 ##@ Build
 
-# TODO: build target is not defined for all modules at the moment.
+# TODO: Fix.
 .PHONY: build
 build: ## build all modules
-	@$(MAKE) --no-print-directory -C $(MODULES_DIRECTORY) TARGET=build
-
-##@ Code quality
+	@$(MAKE) --no-print-directory -C $(MODULE_DIRECTORIES) build
 
-.PHONY: check
-check: fmt vet lint ## run all code quality checks
+.PHONY: build-api
+build-api: ## build api module
+	@$(MAKE) -C $(API_DIRECTORY) build
 
-.PHONY: fmt
-fmt: ## format code
-	@$(MAKE) --no-print-directory -C $(MODULES_DIRECTORY) TARGET=fmt
+##@ Tests and checks
 
-.PHONY: vet
-vet: ## examine code to find potential errors and suspicious constructs
-	@$(MAKE) --no-print-directory -C $(MODULES_DIRECTORY) TARGET=vet
+.PHONY: test
+test: $(PRE) ## test workspace modules
+	go work edit -json | jq -r '.Use[].DiskPath'  | xargs -I{} go test {}/...
 
-# TODO: It doesn't seem to work when running with make. Should we remove vet since it already includes it?
 .PHONY: lint
-lint: ## lint code
-	docker run -t --rm -v $$(pwd):/app -v ~/.cache/golangci-lint/v1.54.2:/root/.cache -w /app golangci/golangci-lint:v1.54.2 golangci-lint run -v --fix
+lint: $(PRE) ## lint workspace code
+	go work edit -json | jq -r '.Use[].DiskPath'  | xargs -I{} golangci-lint run {}/...
+
+.PHONY: fix
+fix: $(PRE) ## fix workspace code
+	go work edit -json | jq -r '.Use[].DiskPath'  | xargs -I{} golangci-lint run --fix {}/...

api/Makefile

@@ -1,49 +1,30 @@
+ROOT_DIRECTORY := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+TOOLS_DIRECTORY = $(ROOT_DIRECTORY)/../tools
 CRD_OPTIONS ?= "crd"
 
-ifeq (,$(shell go env GOBIN))
-GOBIN=$(shell go env GOPATH)/bin
-else
-GOBIN=$(shell go env GOBIN)
-endif
+# List of targets that should be executed before other targets
+PRE = --ensure-tools
+
+.PHONY: --ensure-tools
+--ensure-tools:
+	@$(MAKE) --no-print-directory -C $(TOOLS_DIRECTORY) ensure
 
 ##@ General
 
+.PHONY: help
 help: ## show help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 ##@ Build
 
-CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
-get-controller-gen: ## install controller-gen
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
-
-manifests: get-controller-gen ## generate manifests
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+.PHONY: manifests
+manifests: $(PRE) ## generate manifests
+	controller-gen $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
-generate: get-controller-gen ## generate code
+.PHONY: generate
+generate: $(PRE) ## generate code
 	go generate ./pkg/...
-	$(CONTROLLER_GEN) object:headerFile="../boilerplate.go.txt" paths="./..."
-
-build: manifests generate ## generate manifests and code
-
-##@ Code quality
-
-fmt: ## format code
-	go fmt ./...
-
-vet: ## examine code to find potential errors and suspicious constructs
-	go vet ./...
-
-# go-get-tool will 'go get' any package $2 and install it to $1.
-PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-define go-get-tool
-@[ -f $(1) ] || { \
-set -e ;\
-TMP_DIR=$$(mktemp -d) ;\
-cd $$TMP_DIR ;\
-go mod init tmp ;\
-echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
-rm -rf $$TMP_DIR ;\
-}
-endef
+	controller-gen object:headerFile="../boilerplate.go.txt" paths="./..."
+
+.PHONY: build
+build: manifests generate ## build module

api/apis/platform/v1alpha1/zz_generated.deepcopy.go

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: deploymentaccessclasses.platform.plural.sh
 spec:
   group: platform.plural.sh

api/config/crd/bases/platform.plural.sh_deploymentaccessclasses.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: deploymentaccesses.platform.plural.sh
 spec:
   group: platform.plural.sh

api/config/crd/bases/platform.plural.sh_deploymentaccesses.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: deploymentclasses.platform.plural.sh
 spec:
   group: platform.plural.sh

api/config/crd/bases/platform.plural.sh_deploymentclasses.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: deployments.platform.plural.sh
 spec:
   group: platform.plural.sh

api/config/crd/bases/platform.plural.sh_deployments.yaml

@@ -4,9 +4,12 @@ metadata:
   name: test
 spec:
   pluralId: ""
-  repoUrl: https://github.com/pluralsh/deployment-api
-  ref: 957bde0e71dad665e53f7fcbff43fc2f0e10b0a9
-  subfolder: example/test_deployment
+  revision:
+    version: ""
+    ref: ""
+  git:
+    ref: https://github.com/argoproj/argocd-example-apps
+    folder: blue-green
   namespace: test
-  providerName: fake.platform.plural.sh
-  deploymentClassName: fake
+  providerName: argocd.platform.plural.sh
+  deploymentClassName: argocd