Add --force-conflicts option to Helm upgrade commands across multiple roles to ensure proper handling of conflicts during deployments.
This commit is contained in:
@@ -14,6 +14,7 @@
|
|||||||
- "9.4.17"
|
- "9.4.17"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/argocd/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/argocd/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
- --timeout
|
- --timeout
|
||||||
- 15m
|
- 15m
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
- v1.20.0
|
- v1.20.0
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/cert-manager/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/cert-manager/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
- "1.16.6"
|
- "1.16.6"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/cilium/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/cilium/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
|
|||||||
@@ -59,6 +59,7 @@
|
|||||||
- "3.7.1"
|
- "3.7.1"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
- --timeout
|
- --timeout
|
||||||
- 15m
|
- 15m
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
- "3.7.1"
|
- "3.7.1"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/policies-values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/policies-values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
- --timeout
|
- --timeout
|
||||||
- 10m
|
- 10m
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
- --create-namespace
|
- --create-namespace
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/longhorn/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/longhorn/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
- metallb/metallb
|
- metallb/metallb
|
||||||
- --namespace
|
- --namespace
|
||||||
- metallb-system
|
- metallb-system
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
- --timeout
|
- --timeout
|
||||||
- "{{ noble_helm_metallb_wait_timeout }}"
|
- "{{ noble_helm_metallb_wait_timeout }}"
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
- "3.13.0"
|
- "3.13.0"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/metrics-server/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/metrics-server/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
|
|||||||
@@ -34,6 +34,7 @@
|
|||||||
- "1.2.0"
|
- "1.2.0"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/newt/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/newt/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
|
|||||||
@@ -52,6 +52,7 @@
|
|||||||
- "82.15.1"
|
- "82.15.1"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/kube-prometheus-stack/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/kube-prometheus-stack/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
- --timeout
|
- --timeout
|
||||||
- 30m
|
- 30m
|
||||||
@@ -73,6 +74,7 @@
|
|||||||
- "6.55.0"
|
- "6.55.0"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/loki/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/loki/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
@@ -92,6 +94,7 @@
|
|||||||
- "0.56.0"
|
- "0.56.0"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/fluent-bit/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/fluent-bit/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
@@ -111,6 +114,7 @@
|
|||||||
- headlamp
|
- headlamp
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/headlamp/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/headlamp/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
- "39.0.6"
|
- "39.0.6"
|
||||||
- -f
|
- -f
|
||||||
- "{{ noble_repo_root }}/clusters/noble/bootstrap/traefik/values.yaml"
|
- "{{ noble_repo_root }}/clusters/noble/bootstrap/traefik/values.yaml"
|
||||||
|
- --force-conflicts
|
||||||
- --wait
|
- --wait
|
||||||
environment:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
|
|
||||||
- name: Install Velero
|
- name: Install Velero
|
||||||
ansible.builtin.command:
|
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:
|
environment:
|
||||||
KUBECONFIG: "{{ noble_kubeconfig }}"
|
KUBECONFIG: "{{ noble_kubeconfig }}"
|
||||||
when: noble_velero_install | default(false) | bool
|
when: noble_velero_install | default(false) | bool
|
||||||
|
|||||||
Reference in New Issue
Block a user