From 84a901bfda5ca172de314fc9400bd0c085fd250f Mon Sep 17 00:00:00 2001 From: zanejohnson-azure Date: Fri, 1 May 2026 11:15:12 -0700 Subject: [PATCH] fix: add --force-conflicts to helm deploy to resolve server-side apply ownership conflicts Helm 4 uses server-side apply which fails when fields were previously modified by kubectl-edit. Adding --force-conflicts allows Helm to take ownership of conflicting fields. --- .pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml b/.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml index a5f8bb4fc..412a815b0 100644 --- a/.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml +++ b/.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml @@ -121,7 +121,7 @@ jobs: ${{ else }}: overrideValues: 'global.commonGlobals.CloudEnvironment=${{ parameters.cloudEnvironment }},global.commonGlobals.Region=${{ parameters.region }},global.commonGlobals.Versions.Kubernetes=$(K8S_VERSION),OmsAgent.aksResourceID=$(AKS_RESOURCE_ID),OmsAgent.workspaceID=${{ parameters.workspaceId }},OmsAgent.imageRepository=${{ parameters.imageRepository }},OmsAgent.imageTagLinux=${{ parameters.amalogsLinuxImage }},OmsAgent.imageTagWindows=${{ parameters.amalogsWindowsImage }}' waitForExecution: false - arguments: '--timeout 10m --install' + arguments: '--timeout 10m --install --force-conflicts' - task: AzureCLI@2 displayName: Verify Deployment inputs: