diff --git a/ansible/group_vars/all/settings.yml.example b/ansible/group_vars/all/settings.yml.example index 53dc49c1db7d3c234927e4fcc3e05eca87bca299..d51e19b3f2f17e417370129088b0af0c6113024a 100644 --- a/ansible/group_vars/all/settings.yml.example +++ b/ansible/group_vars/all/settings.yml.example @@ -54,6 +54,8 @@ flux: # see https://github.com/fluxcd/flux/blob/master/chart/flux/README.md # for reference extra_opts: "" + # chart version + version: "1.5.0" # If true, let the auto-update mechanism (flux) follow a cluster-local git # repo, not the one specified above local_flux: false @@ -78,7 +80,7 @@ helm_operator: # see https://docs.fluxcd.io/projects/helm-operator/en/stable/references/chart/ # for reference extra_opts: "" - + version: "1.2.0" # A whitelist of applications that will be enabled. enabled_applications: diff --git a/ansible/roles/apps/tasks/core.yml b/ansible/roles/apps/tasks/core.yml index 4e565c7bce679d6f5ce328538085e86313061226..7207bf171bc6bacca6025f42b15dbda374b20ce8 100644 --- a/ansible/roles/apps/tasks/core.yml +++ b/ansible/roles/apps/tasks/core.yml @@ -44,7 +44,7 @@ # helm-operator # # Chart name # helm-operator - shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version 1.1.0 --set helm.versions=v3 --set configureRepositories.enable=true --set configureRepositories.repositories[0].name=stable --set configureRepositories.repositories[0].url=https://kubernetes-charts.storage.googleapis.com --set configureRepositories.repositories[1].name=bitnami --set configureRepositories.repositories[1].url=https://charts.bitnami.com/bitnami --set chartsSyncInterval=20m --set statusUpdateInterval=30s {{ extra_opts }} helm-operator helm-operator + shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version {{ helm_operator.version }} --set helm.versions=v3 --set configureRepositories.enable=true --set configureRepositories.repositories[0].name=stable --set configureRepositories.repositories[0].url=https://kubernetes-charts.storage.googleapis.com --set configureRepositories.repositories[1].name=bitnami --set configureRepositories.repositories[1].url=https://charts.bitnami.com/bitnami --set chartsSyncInterval=20m --set statusUpdateInterval=30s {{ extra_opts }} helm-operator helm-operator - name: Create Kubernetes secret with local-path-provisioner settings tags: @@ -118,7 +118,7 @@ # flux # # Chart name # flux - shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version 1.3.0 --set git.url="{{ git_url }}" --set git.branch="{{ git_branch }}" --set git.path="{{ git_path }}" --set git.readonly=true --set registry.excludeImage='*' --set sync.state="secret" --set syncGarbageCollection.enabled=true --set manifestGeneration=true --set git.pollInterval=1h {{ extra_opts }} flux flux + shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version "{{ flux.version }}" --set git.url="{{ git_url }}" --set git.branch="{{ git_branch }}" --set git.path="{{ git_path }}" --set git.readonly=true --set registry.excludeImage='*' --set sync.state="secret" --set syncGarbageCollection.enabled=true --set manifestGeneration=true --set git.pollInterval=1h {{ extra_opts }} flux flux - name: Install fluxctl via snap tags: