diff --git a/Containerfile b/Containerfile index 7c825e9..1e3ec56 100644 --- a/Containerfile +++ b/Containerfile @@ -2,8 +2,13 @@ FROM fluxcd/flux-cli:v2.2.3 as flux-source WORKDIR /out RUN cp $(which flux) . +FROM mikefarah/yq as yq-source +WORKDIR /out +RUN cp $(which yq) . + FROM ghcr.io/flant/shell-operator:latest RUN apk update && apk add envsubst --no-cache COPY --from=flux-source /out/flux /usr/bin/flux +COPY --from=yq-source /out/yq /usr/bin/yq ADD /hooks /hooks ADD /tpls /tpls diff --git a/hooks/install-application.sh b/hooks/install-application.sh index e68d2e4..9cc5a58 100755 --- a/hooks/install-application.sh +++ b/hooks/install-application.sh @@ -28,7 +28,7 @@ else export SP_APPLICATION=$(jq -r .[0].object.data.values $BINDING_CONTEXT_PATH | base64 -d | yq '.helm.release') flux create source helm $SP_APPLICATION \ - --namespace=$SP_ACCOUNT \ + --namespace=$SP_CUSTOMER_ID \ --url=oci://registry.badhouseplants.net/softplayer/helm flux create helmrelease $SP_APPLICATION \