Merge pull request #46 from iawia002/conflicts

Force update fields to handle conflicts
kubesphere · Aug 8, 2023 · d2643f9 · d2643f9
2 parents 7b778d1 + 3e98c50
commit d2643f9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmd/publish.go b/cmd/publish.go
@@ -54,7 +54,7 @@ func (o *publishOptions) publish(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	kubectlArgs := []string{"apply", "--server-side=true", "-f", filePath}
+	kubectlArgs := []string{"apply", "--server-side=true", "--force-conflicts", "-f", filePath}
 	if o.kubeconfig != "" {
 		kubectlArgs = append(kubectlArgs, "--kubeconfig", o.kubeconfig)
 	}