Skip to content

Commit b96f8c0

Browse files
fix: add --force-conflicts to helm deploy to resolve server-side apply ownership conflicts (#1667)
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.
1 parent bd57777 commit b96f8c0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
${{ else }}:
122122
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 }}'
123123
waitForExecution: false
124-
arguments: '--timeout 10m --install'
124+
arguments: '--timeout 10m --install --force-conflicts'
125125
- task: AzureCLI@2
126126
displayName: Verify Deployment
127127
inputs:

0 commit comments

Comments
 (0)