diff --git a/install/flux-patches/helm-controller.yaml b/install/flux-patches/helm-controller.yaml new file mode 100644 index 0000000000000000000000000000000000000000..87d0f58c69514208769d588c4e73a2d3b336a925 --- /dev/null +++ b/install/flux-patches/helm-controller.yaml @@ -0,0 +1,12 @@ +spec: + template: + spec: + containers: + - name: manager + resources: + limits: + cpu: "1" + memory: 1536Mi + requests: + cpu: 100m + memory: 512Mi diff --git a/install/install-openappstack.sh b/install/install-openappstack.sh index 6a8475d2eabfd9dbb11428c2c252a5e1c2b4ec05..7d65d7ffcd3f17f13ab451430259938cce485600 100755 --- a/install/install-openappstack.sh +++ b/install/install-openappstack.sh @@ -2,7 +2,8 @@ set -euo pipefail -. $(dirname "$0")/flux-version-check.sh +# shellcheck source=install/flux-version-check.sh +. "$(dirname "$0")/flux-version-check.sh" flux install \ --network-policy=false \ @@ -10,6 +11,8 @@ flux install \ --namespace=flux-system \ --components="source-controller,kustomize-controller,helm-controller" +kubectl patch deployment -n flux-system helm-controller --patch-file flux-patches/helm-controller.yaml + # get current git branch name branch=${CI_COMMIT_REF_NAME:-} [ -z "$branch" ] && branch=$(git rev-parse --abbrev-ref HEAD) @@ -31,7 +34,7 @@ python "$(dirname "$0")/generate_secrets.py" alertmanager flux create source git openappstack \ --url=https://open.greenhost.net/openappstack/openappstack \ - --branch=$branch \ + --branch="$branch" \ --interval=1h flux create kustomization openappstack \