Skip to content

Commit

Permalink
Fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Kidswiss committed Sep 24, 2024
1 parent 57f247a commit 5516e40
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
10 changes: 6 additions & 4 deletions hack/diff/compare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/comp-functions/functions/common/instance_namespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
}
Expand Down

0 comments on commit 5516e40

Please sign in to comment.