kubesphere / ks-installer

Install KubeSphere on existing Kubernetes cluster
https://kubesphere.io
Apache License 2.0
533 stars 746 forks source link

[release-3.4] update devops helm-chart to 0.2.3 #2268

Closed ks-ci-bot closed 9 months ago

ks-ci-bot commented 9 months ago

Manual cherrypick required.

2267 failed to apply on top of branch "release-3.4":

Applying: update devops helm-chart to 0.2.3
Using index info to reconstruct a base tree...
A   roles/ks-devops/files/ks-devops/charts/ks-devops-0.2.1.tgz
M   roles/ks-devops/tasks/main.yaml
Falling back to patching base and 3-way merge...
Auto-merging roles/ks-devops/tasks/main.yaml
CONFLICT (content): Merge conflict in roles/ks-devops/tasks/main.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update devops helm-chart to 0.2.3
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
yudong2015 commented 9 months ago

fixed: #2269