search

kubesphere / ks-installer

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

update devops helm-chart to 0.2.3 #2267

Closed yudong2015 closed 7 months ago

yudong2015 commented 7 months ago 
bug-fix: devops s2i expired certificate
yudong2015 commented 7 months ago

/cherrypick release-3.4

ks-ci-bot commented 7 months ago

@yudong2015: once the present PR merges, I will cherry-pick it on top of release-3.4 in a new PR and assign it to you.

In response to [this](https://github.com/kubesphere/ks-installer/pull/2267#issuecomment-1953657628): >/cherrypick release-3.4 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
pixiake commented 7 months ago

/lgtm /approve

ks-ci-bot commented 7 months ago

LGTM label has been added.

Git tree hash: 6f2c882bd51d59437b7420ee7eaff9b17c1952cd

ks-ci-bot commented 7 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pixiake, yudong2015

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[roles/ks-devops/OWNERS](https://github.com/kubesphere/ks-installer/blob/master/roles/ks-devops/OWNERS)~~ [pixiake,yudong2015] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
ks-ci-bot commented 7 months ago

@yudong2015: #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".
In response to [this](https://github.com/kubesphere/ks-installer/pull/2267#issuecomment-1953657628): >/cherrypick release-3.4 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
ks-ci-bot commented 7 months ago

@yudong2015: new issue created for failed cherrypick: #2268

In response to [this](https://github.com/kubesphere/ks-installer/pull/2267#issuecomment-1953657628): >/cherrypick release-3.4 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.