From 5833e421c0444e0d3f9ea85815d669b6f12f075d Mon Sep 17 00:00:00 2001 From: Nikholas Pcenicni <82239765+nikpcenicni@users.noreply.github.com> Date: Wed, 13 May 2026 17:14:22 -0400 Subject: [PATCH] Add --force-conflicts option to Helm upgrade commands across multiple roles to ensure proper handling of conflicts during deployments. --- ansible/roles/noble_argocd/tasks/main.yml | 1 + ansible/roles/noble_cert_manager/tasks/main.yml | 1 + ansible/roles/noble_cilium/tasks/main.yml | 1 + ansible/roles/noble_kyverno/tasks/main.yml | 1 + ansible/roles/noble_kyverno_policies/tasks/main.yml | 1 + ansible/roles/noble_longhorn/tasks/main.yml | 1 + ansible/roles/noble_metallb/tasks/main.yml | 1 + ansible/roles/noble_metrics_server/tasks/main.yml | 1 + ansible/roles/noble_newt/tasks/main.yml | 1 + ansible/roles/noble_platform/tasks/main.yml | 4 ++++ ansible/roles/noble_traefik/tasks/main.yml | 1 + ansible/roles/noble_velero/tasks/main.yml | 2 +- 12 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ansible/roles/noble_argocd/tasks/main.yml b/ansible/roles/noble_argocd/tasks/main.yml index 1c53881..f7d534c 100644 --- a/ansible/roles/noble_argocd/tasks/main.yml +++ b/ansible/roles/noble_argocd/tasks/main.yml @@ -14,6 +14,7 @@ - "9.4.17" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/argocd/values.yaml" + - --force-conflicts - --wait - --timeout - 15m diff --git a/ansible/roles/noble_cert_manager/tasks/main.yml b/ansible/roles/noble_cert_manager/tasks/main.yml index 810142f..e45a4c9 100644 --- a/ansible/roles/noble_cert_manager/tasks/main.yml +++ b/ansible/roles/noble_cert_manager/tasks/main.yml @@ -24,6 +24,7 @@ - v1.20.0 - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/cert-manager/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" diff --git a/ansible/roles/noble_cilium/tasks/main.yml b/ansible/roles/noble_cilium/tasks/main.yml index bcca2a3..3059f60 100644 --- a/ansible/roles/noble_cilium/tasks/main.yml +++ b/ansible/roles/noble_cilium/tasks/main.yml @@ -54,6 +54,7 @@ - "1.16.6" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/cilium/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" diff --git a/ansible/roles/noble_kyverno/tasks/main.yml b/ansible/roles/noble_kyverno/tasks/main.yml index d985ab1..af3b618 100644 --- a/ansible/roles/noble_kyverno/tasks/main.yml +++ b/ansible/roles/noble_kyverno/tasks/main.yml @@ -59,6 +59,7 @@ - "3.7.1" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/values.yaml" + - --force-conflicts - --wait - --timeout - 15m diff --git a/ansible/roles/noble_kyverno_policies/tasks/main.yml b/ansible/roles/noble_kyverno_policies/tasks/main.yml index 5acdc7f..8ddd94e 100644 --- a/ansible/roles/noble_kyverno_policies/tasks/main.yml +++ b/ansible/roles/noble_kyverno_policies/tasks/main.yml @@ -13,6 +13,7 @@ - "3.7.1" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/policies-values.yaml" + - --force-conflicts - --wait - --timeout - 10m diff --git a/ansible/roles/noble_longhorn/tasks/main.yml b/ansible/roles/noble_longhorn/tasks/main.yml index c3d47a3..25a894e 100644 --- a/ansible/roles/noble_longhorn/tasks/main.yml +++ b/ansible/roles/noble_longhorn/tasks/main.yml @@ -23,6 +23,7 @@ - --create-namespace - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/longhorn/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" diff --git a/ansible/roles/noble_metallb/tasks/main.yml b/ansible/roles/noble_metallb/tasks/main.yml index 4cd3e76..1fd2c60 100644 --- a/ansible/roles/noble_metallb/tasks/main.yml +++ b/ansible/roles/noble_metallb/tasks/main.yml @@ -20,6 +20,7 @@ - metallb/metallb - --namespace - metallb-system + - --force-conflicts - --wait - --timeout - "{{ noble_helm_metallb_wait_timeout }}" diff --git a/ansible/roles/noble_metrics_server/tasks/main.yml b/ansible/roles/noble_metrics_server/tasks/main.yml index 6ed761f..739ab26 100644 --- a/ansible/roles/noble_metrics_server/tasks/main.yml +++ b/ansible/roles/noble_metrics_server/tasks/main.yml @@ -13,6 +13,7 @@ - "3.13.0" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/metrics-server/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" diff --git a/ansible/roles/noble_newt/tasks/main.yml b/ansible/roles/noble_newt/tasks/main.yml index f8bc7c6..8ccead6 100644 --- a/ansible/roles/noble_newt/tasks/main.yml +++ b/ansible/roles/noble_newt/tasks/main.yml @@ -34,6 +34,7 @@ - "1.2.0" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/newt/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" diff --git a/ansible/roles/noble_platform/tasks/main.yml b/ansible/roles/noble_platform/tasks/main.yml index ee3899d..67b8ede 100644 --- a/ansible/roles/noble_platform/tasks/main.yml +++ b/ansible/roles/noble_platform/tasks/main.yml @@ -52,6 +52,7 @@ - "82.15.1" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/kube-prometheus-stack/values.yaml" + - --force-conflicts - --wait - --timeout - 30m @@ -73,6 +74,7 @@ - "6.55.0" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/loki/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" @@ -92,6 +94,7 @@ - "0.56.0" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/fluent-bit/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" @@ -111,6 +114,7 @@ - headlamp - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/headlamp/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" diff --git a/ansible/roles/noble_traefik/tasks/main.yml b/ansible/roles/noble_traefik/tasks/main.yml index 8cec5fa..706865a 100644 --- a/ansible/roles/noble_traefik/tasks/main.yml +++ b/ansible/roles/noble_traefik/tasks/main.yml @@ -24,6 +24,7 @@ - "39.0.6" - -f - "{{ noble_repo_root }}/clusters/noble/bootstrap/traefik/values.yaml" + - --force-conflicts - --wait environment: KUBECONFIG: "{{ noble_kubeconfig }}" diff --git a/ansible/roles/noble_velero/tasks/main.yml b/ansible/roles/noble_velero/tasks/main.yml index 65d7ed6..e26e04f 100644 --- a/ansible/roles/noble_velero/tasks/main.yml +++ b/ansible/roles/noble_velero/tasks/main.yml @@ -78,7 +78,7 @@ - name: Install Velero ansible.builtin.command: - argv: "{{ ['helm', 'upgrade', '--install', 'velero', 'vmware-tanzu/velero', '--namespace', 'velero', '--version', noble_velero_chart_version, '-f', noble_repo_root ~ '/clusters/noble/bootstrap/velero/values.yaml', '--set-string', 'configuration.backupStorageLocation[0].bucket=' ~ noble_velero_s3_bucket, '--set-string', 'configuration.backupStorageLocation[0].config.s3Url=' ~ noble_velero_s3_url, '--set-string', 'configuration.backupStorageLocation[0].config.region=' ~ noble_velero_s3_region, '--set-string', 'configuration.backupStorageLocation[0].config.s3ForcePathStyle=' ~ noble_velero_s3_force_path_style] + (noble_velero_helm_prefix_argv | default([])) + ['--wait'] }}" + argv: "{{ ['helm', 'upgrade', '--install', 'velero', 'vmware-tanzu/velero', '--namespace', 'velero', '--version', noble_velero_chart_version, '-f', noble_repo_root ~ '/clusters/noble/bootstrap/velero/values.yaml', '--set-string', 'configuration.backupStorageLocation[0].bucket=' ~ noble_velero_s3_bucket, '--set-string', 'configuration.backupStorageLocation[0].config.s3Url=' ~ noble_velero_s3_url, '--set-string', 'configuration.backupStorageLocation[0].config.region=' ~ noble_velero_s3_region, '--set-string', 'configuration.backupStorageLocation[0].config.s3ForcePathStyle=' ~ noble_velero_s3_force_path_style] + (noble_velero_helm_prefix_argv | default([])) + ['--force-conflicts', '--wait'] }}" environment: KUBECONFIG: "{{ noble_kubeconfig }}" when: noble_velero_install | default(false) | bool