From 5516e408902f1c22ac707660d58971c9890454b4 Mon Sep 17 00:00:00 2001 From: Simon Beck Date: Tue, 24 Sep 2024 11:53:17 +0200 Subject: [PATCH] Fix bug --- hack/diff/compare.sh | 10 ++++++---- .../functions/common/instance_namespace.go | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hack/diff/compare.sh b/hack/diff/compare.sh index 9142b7df6b..f326ed181f 100755 --- a/hack/diff/compare.sh +++ b/hack/diff/compare.sh @@ -77,20 +77,20 @@ function diff_func() { # we only get the state on the first run for two reasons: # speed things up # avoid any diffs that could come from actual changes on the cluster - [ "first" == "$2" ] && get_state "$type" "$name" + [ "first" == "$1" ] && get_state "$type" "$name" get_claim_namespace "$type" "$name" - run_single_diff "$type" "$name" "$2" + run_single_diff "$type" "$name" "$1" done <<< "$(kubectl get composite --no-headers | sed 's/\// /g' )" } # do the diff function first_diff() { - diff_func "$(get_running_func_version)" "first" + diff_func "first" } function second_diff() { - diff_func "$(git rev-parse --abbrev-ref HEAD | sed 's/\//_/g')" "second" + diff_func "second" } @@ -137,6 +137,8 @@ template_func_file "$(get_pnt_func_version)" "$(get_running_func_version)" echo "Render live manifests" first_diff +template_func_file "$(get_pnt_func_version)" "$(git rev-parse --abbrev-ref HEAD | sed 's/\//_/g')" + echo "Render against branch" second_diff diff --git a/pkg/comp-functions/functions/common/instance_namespace.go b/pkg/comp-functions/functions/common/instance_namespace.go index 5f01906237..92309aeb27 100644 --- a/pkg/comp-functions/functions/common/instance_namespace.go +++ b/pkg/comp-functions/functions/common/instance_namespace.go @@ -117,6 +117,7 @@ func createInstanceNamespace(serviceName, compName, claimNamespace, instanceName "appuio.io/no-rbac-creation": "true", "appuio.io/billing-name": "appcat-" + serviceName, "appuio.io/organization": org, + "myannotation": "bar", }, }, }