From f2e8a85b1f59f13a09c9a4ff40f576d25ea56ca8 Mon Sep 17 00:00:00 2001 From: dd di cesare Date: Thu, 14 Dec 2023 17:32:00 +0100 Subject: [PATCH] [refactor] Renaming and adding sample patching --- Makefile | 13 +++++++------ .../samples/kustomization.template.yaml | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7ed902b97..cb7842406 100644 --- a/Makefile +++ b/Makefile @@ -239,10 +239,10 @@ $(ACT): act: $(ACT) ## Download act locally if necessary. ##@ Development -define patch-dependencies-config +define patch-config envsubst \ - < $2 \ - > $3 + < $1 \ + > $2 endef define update-csv-config @@ -265,9 +265,10 @@ dependencies-manifests: export AUTHORINO_OPERATOR_GITREF := $(AUTHORINO_OPERATOR dependencies-manifests: export LIMITADOR_OPERATOR_GITREF := $(LIMITADOR_OPERATOR_GITREF) dependencies-manifests: export POLICY_CONTROLLER_GITREF := $(POLICY_CONTROLLER_GITREF) dependencies-manifests: ## Update kuadrant dependencies manifests. - $(call patch-dependencies-config,authorino,config/dependencies/authorino/kustomization.template.yaml,config/dependencies/authorino/kustomization.yaml) - $(call patch-dependencies-config,limitador,config/dependencies/limitador/kustomization.template.yaml,config/dependencies/limitador/kustomization.yaml) - $(call patch-dependencies-config,policy-controller,config/dependencies/policy-controller/kustomization.template.yaml,config/dependencies/policy-controller/kustomization.yaml) + $(call patch-config,config/dependencies/authorino/kustomization.template.yaml,config/dependencies/authorino/kustomization.yaml) + $(call patch-config,config/dependencies/limitador/kustomization.template.yaml,config/dependencies/limitador/kustomization.yaml) + $(call patch-config,config/dependencies/policy-controller/kustomization.template.yaml,config/dependencies/policy-controller/kustomization.yaml) + $(call patch-config,config/dependencies/policy-controller/samples/kustomization.template.yaml,config/dependencies/policy-controller/samples/kustomization.yaml) .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. diff --git a/config/dependencies/policy-controller/samples/kustomization.template.yaml b/config/dependencies/policy-controller/samples/kustomization.template.yaml index 9f77aa4d5..6af47e717 100644 --- a/config/dependencies/policy-controller/samples/kustomization.template.yaml +++ b/config/dependencies/policy-controller/samples/kustomization.template.yaml @@ -1,3 +1,2 @@ resources: - github.com/Kuadrant/multicluster-gateway-controller/config/samples?ref=${POLICY_CONTROLLER_GITREF} -