Dependencies from kustomize resources (#200)

* Makefile: remove unused deploy-manifest target

* dependencies from kustomize

* kuadrant tunning

* simple-rl-for-api-owners.md: small fix

* fix issues from upgrading authorino to v0.10.0

* fix little issues

* fix little issues

* fix user guide rate limit syntax

Author: eguzki

Diff for: .github/workflows/building.yaml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v2
       - name: build
         run: |
-          make manager
+          make build
 
   build-image:
     name: Build image

Diff for: .github/workflows/testing.yaml

@@ -14,11 +14,13 @@
 
 # This file is automagically synced here from github.com/knative-sandbox/.github
 # repo by knobots: https://github.com/knative-sandbox/knobots and will be overwritten.
-
+---
 name: Testing
-
-on: pull_request
-
+on:
+  push:
+    branches: ['*']
+  pull_request:
+    branches: ['*']
 jobs:
   unittests:
     name: Run unit tests
@@ -34,7 +36,6 @@ jobs:
       - name: run tests
         run: |
           make test-unit
-
   integrationtests:
     name: Run integration tests
     runs-on: ubuntu-latest
@@ -58,28 +59,12 @@ jobs:
           kubectl cluster-info dump
       - name: Deploy Kuadrant deps
         run: |
-          make deploy-kuadrant-deps
+          make local-env-setup
       - name: run tests
         run: |
           make test-integration
-
-  verify-istio-manifest:
-    name: Verify istio manifests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Go 1.17.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17.x
-        id: go
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: run tests
-        run: |
-          make istio-manifest-update-test
-
-  verify-gateway-api-manifest:
-    name: Verify Gateway API manifests
+  verify-manifests:
+    name: Verify manifests
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.17.x
@@ -89,12 +74,11 @@ jobs:
         id: go
       - name: Check out code
         uses: actions/checkout@v2
-      - name: run tests
+      - name: Run make verify-manifests
         run: |
-          make gwapi-manifests-update-test
-
-  verify-kuadrant-manifest:
-    name: Verify kuadrant manifests
+          make verify-manifests
+  verify-fmt:
+    name: Verify fmt
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.17.x
@@ -104,6 +88,6 @@ jobs:
         id: go
       - name: Check out code
         uses: actions/checkout@v2
-      - name: run tests
+      - name: Run make verify-fmt
         run: |
-          make manifests-update-test
+          make verify-fmt

Diff for: Makefile

@@ -60,6 +60,8 @@ SHELL = /usr/bin/env bash -o pipefail
 KIND_CLUSTER_NAME = kuadrant-local
 GOLANGCI-LINT = $(PROJECT_PATH)/bin/golangci-lint
 
+KUADRANT_NAMESPACE=kuadrant-system
+
 all: build
 
 ##@ General
@@ -82,15 +84,6 @@ help: ## Display this help.
 
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
-	$(MAKE) deploy-manifest
-
-.PHONY: deploy-manifest
-deploy-manifest: kustomize ## Generate deployment manifests.
-	mkdir -p $(PROJECT_DIR)/config/deploy
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/default > $(PROJECT_DIR)/config/deploy/manifests.yaml
-	# clean up
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(DEFAULT_IMG)
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -113,73 +106,40 @@ clean-cov:
 	rm -rf $(PROJECT_PATH)/cover.out
 
 .PHONY: local-setup
-local-setup: local-cleanup local-setup-kind manifests kustomize generate ## Deploy locally kuadrant controller from the current code
-	export PATH=$(PROJECT_PATH)/bin:$$PATH;	./utils/local-deployment/local-setup.sh
+local-setup: export IMG := $(IMAGE_TAG_BASE):dev
+local-setup: ## Deploy locally kuadrant controller from the current code
+	$(MAKE) local-env-setup
+	$(MAKE) docker-build
+	$(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME)
+	$(MAKE) deploy
+	kubectl -n kuadrant-system wait --timeout=300s --for=condition=Available deployments --all
+	@echo
+	@echo "Now you can export the kuadrant gateway by doing:"
+	@echo "kubectl port-forward --namespace ${KUADRANT_NAMESPACE} deployment/kuadrant-gateway 8080:8080 8443:8443"
+	@echo "after that, you can curl -H \"Host: myhost.com\" localhost:8080"
+	@echo "-- Linux only -- Ingress gateway is exported using nodePort service in port 9080"
+	@echo "curl -H \"Host: myhost.com\" localhost:9080"
+	@echo
 
+.PHONY: local-cleanup
+local-cleanup: ## Delete local cluster
+	$(MAKE) kind-delete-cluster
 
 # kuadrant is not deployed
 .PHONY: local-env-setup
-local-env-setup: local-cleanup local-setup-kind deploy-kuadrant-deps generate install ## Deploys all services and manifests required by kuadrant to run. Used to run kuadrant with "make run"
-
-.PHONY: deploy-kuadrant-deps
-deploy-kuadrant-deps:
-	./utils/local-deployment/deploy-kuadrant-deps.sh
-
-.PHONY: local-setup-kind
-local-setup-kind: kind
-	$(KIND) create cluster --name $(KIND_CLUSTER_NAME) --config utils/local-deployment/kind-cluster.yaml
-
-.PHONY: local-cleanup
-local-cleanup: kind
-	$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
+local-env-setup: ## Deploys all services and manifests required by kuadrant to run. Used to run kuadrant with "make run"
+	$(MAKE) kind-delete-cluster
+	$(MAKE) kind-create-cluster
+	$(MAKE) gateway-api-install
+	$(MAKE) istio-install
+	$(MAKE) deploy-gateway
+	$(MAKE) deploy-dependencies
+	$(MAKE) install
 
 .PHONY: run-lint
 run-lint: $(GOLANGCI-LINT) ## Run lint tests
 	$(GOLANGCI-LINT) run
 
-ISTIO_MANIFEST_PATH = $(PROJECT_DIR)/utils/local-deployment/istio-manifests/autogenerated
-.PHONY: generate-istio-manifests
-generate-istio-manifests: istioctl ## Generates istio manifests with patches.
-	-rm -rf $(ISTIO_MANIFEST_PATH)
-	mkdir -p $(ISTIO_MANIFEST_PATH)
-	$(ISTIOCTL) manifest generate --set profile=minimal --set values.gateways.istio-ingressgateway.autoscaleEnabled=false --set values.pilot.autoscaleEnabled=false --set values.global.istioNamespace=$(KUADRANT_NAMESPACE) -f utils/local-deployment/patches/istio-externalProvider.yaml -o $(ISTIO_MANIFEST_PATH)
-
-.PHONY: istio-manifest-update-test
-istio-manifest-update-test: generate-istio-manifests ## Test istio manifest
-	git diff --exit-code $(ISTIO_MANIFEST_PATH)
-	[ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory $(ISTIO_MANIFEST_PATH))" ]
-
-GATEWAYAPI_MANIFEST_PATH = $(PROJECT_DIR)/utils/local-deployment/gatewayapi-manifests/autogenerated
-.PHONY: generate-gwapi-manifests
-generate-gwapi-manifests:  ## Generates Gateway API manifests
-	-rm -rf $(GATEWAYAPI_MANIFEST_PATH)
-	mkdir -p $(GATEWAYAPI_MANIFEST_PATH)
-	kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.0" > $(GATEWAYAPI_MANIFEST_PATH)/Base.yaml
-
-.PHONY: gwapi-manifests-update-test
-gwapi-manifests-update-test: generate-gwapi-manifests ## Test Gateway API manifests
-	git diff --exit-code $(GATEWAYAPI_MANIFEST_PATH)
-	[ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory $(GATEWAYAPI_MANIFEST_PATH))" ]
-
-
-.PHONY: manifests-update-test
-manifests-update-test: manifests ## Test autogenerated controller manifests
-	git diff --exit-code ./config
-	[ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory ./config)" ]
-
-LIMITADOR_OPERATOR_SCM_VERSION=main
-LIMITADOR_OPERATOR_IMAGE_TAG=latest
-LIMITADOR_OPERATOR_IMAGE=quay.io/kuadrant/limitador-operator:$(LIMITADOR_OPERATOR_IMAGE_TAG)
-.PHONY: generate-limitador-manifests
-generate-limitador-manifests: ## Generates limitador manifests.
-	$(eval TMP := $(shell mktemp -d))
-	cd $(TMP); git clone --depth 1 --branch $(LIMITADOR_OPERATOR_SCM_VERSION) https://github.com/kuadrant/limitador-operator.git
-	cd $(TMP)/limitador-operator; make kustomize
-	cd $(TMP)/limitador-operator/config/manager; $(TMP)/limitador-operator/bin/kustomize edit set image controller=$(LIMITADOR_OPERATOR_IMAGE)
-	cd $(TMP)/limitador-operator/config/default; $(TMP)/limitador-operator/bin/kustomize edit set namespace $(KUADRANT_NAMESPACE)
-	cd $(TMP)/limitador-operator; bin/kustomize build config/default -o $(PROJECT_PATH)/utils/local-deployment/limitador-operator.yaml
-	-rm -rf $(TMP)
-
 ##@ Build
 
 build: generate fmt vet ## Build manager binary.
@@ -196,9 +156,6 @@ docker-build: ## Build docker image with the manager.
 docker-push: ## Push docker image with the manager.
 	docker push ${IMG}
 
-# old
-manager: build
-
 ##@ Deployment
 
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
@@ -209,10 +166,21 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default | kubectl apply -f -
+	$(KUSTOMIZE) build config/deploy | kubectl apply -f -
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${DEFAULT_IMG}
 
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/default | kubectl delete -f -
+	$(KUSTOMIZE) build config/deploy | kubectl delete -f -
+
+deploy-dependencies: kustomize ## Deploy dependencies to the K8s cluster specified in ~/.kube/config.
+	$(KUSTOMIZE) build config/dependencies | kubectl apply -f -
+	kubectl -n "$(KUADRANT_NAMESPACE)" wait --timeout=300s --for=condition=Available deployments --all
+	kubectl apply -n "$(KUADRANT_NAMESPACE)" -f utils/local-deployment/authorino.yaml
+	kubectl apply -n "$(KUADRANT_NAMESPACE)" -f utils/local-deployment/limitador.yaml
+
+##@ Misc
+
+## Miscellaneous Custom targets
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
@@ -226,6 +194,12 @@ ENVTEST = $(shell pwd)/bin/setup-envtest
 envtest: ## Download envtest-setup locally if necessary.
 	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
 
+$(GOLANGCI-LINT):
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.46.1
+
+.PHONY: golangci-lint
+golangci-lint: $(GOLANGCI-LINT) ## Download golangci-lint locally if necessary.
+
 OPERATOR_SDK = $(shell pwd)/bin/operator-sdk
 OPERATOR_SDK_VERSION = v1.22.0
 operator-sdk: ## Download operator-sdk locally if necessary.
@@ -245,87 +219,5 @@ rm -rf $$TMP_DIR ;\
 }
 endef
 
-.PHONY: bundle
-bundle: manifests kustomize ## Generate bundle manifests and metadata, then validate generated files.
-	operator-sdk generate kustomize manifests -q
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
-	operator-sdk bundle validate ./bundle
-
-.PHONY: bundle-build
-bundle-build: ## Build the bundle image.
-	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
-
-.PHONY: bundle-push
-bundle-push: ## Push the bundle image.
-	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
-
-.PHONY: opm
-OPM = ./bin/opm
-opm: ## Download opm locally if necessary.
-ifeq (,$(wildcard $(OPM)))
-ifeq (,$(shell which opm 2>/dev/null))
-	@{ \
-	set -e ;\
-	mkdir -p $(dir $(OPM)) ;\
-	OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
-	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\
-	chmod +x $(OPM) ;\
-	}
-else
-OPM = $(shell which opm)
-endif
-endif
-
-# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0).
-# These images MUST exist in a registry and be pull-able.
-BUNDLE_IMGS ?= $(BUNDLE_IMG)
-
-# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v0.2.0).
-CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:v$(VERSION)
-
-# Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image.
-ifneq ($(origin CATALOG_BASE_IMG), undefined)
-FROM_INDEX_OPT := --from-index $(CATALOG_BASE_IMG)
-endif
-
-# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
-# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
-# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
-.PHONY: catalog-build
-catalog-build: opm ## Build a catalog image.
-	$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
-
-# Push the catalog image.
-.PHONY: catalog-push
-catalog-push: ## Push a catalog image.
-	$(MAKE) docker-push IMG=$(CATALOG_IMG)
-
-##@ Misc
-
-## Miscellaneous Custom targets
-
-KUADRANT_NAMESPACE=kuadrant-system
-
-KIND = $(shell pwd)/bin/kind
-kind: ## Download kind locally if necessary.
-	$(call go-get-tool,$(KIND),sigs.k8s.io/[email protected])
-
-$(GOLANGCI-LINT):
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.46.1
-
-.PHONY: golangci-lint
-golangci-lint: $(GOLANGCI-LINT) ## Download golangci-lint locally if necessary.
-
-# istioctl tool
-ISTIOCTL=$(PROJECT_PATH)/bin/istioctl
-ISTIOVERSION = 1.12.1
-$(ISTIOCTL):
-	mkdir -p $(PROJECT_PATH)/bin
-	$(eval TMP := $(shell mktemp -d))
-	cd $(TMP); curl -sSL https://istio.io/downloadIstio | ISTIO_VERSION=$(ISTIOVERSION) sh -
-	cp $(TMP)/istio-$(ISTIOVERSION)/bin/istioctl ${ISTIOCTL}
-	-rm -rf $(TMP)
-
-.PHONY: istioctl
-istioctl: $(ISTIOCTL) ## Download istioctl locally if necessary.
+# Include last to avoid changing MAKEFILE_LIST used above
+include ./make/*.mk