Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update devops helm-chart to 0.2.3 #2267

Merged
merged 1 commit into from
Feb 22, 2024
Merged

Conversation

yudong2015
Copy link
Collaborator

bug-fix: devops s2i expired certificate

@ks-ci-bot ks-ci-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 20, 2024
@yudong2015
Copy link
Collaborator Author

/cherrypick release-3.4

@ks-ci-bot
Copy link
Collaborator

@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:

/cherrypick release-3.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@pixiake
Copy link
Collaborator

pixiake commented Feb 22, 2024

/lgtm
/approve

@ks-ci-bot ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 22, 2024
@ks-ci-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: 6f2c882bd51d59437b7420ee7eaff9b17c1952cd

@ks-ci-bot
Copy link
Collaborator

[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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@pixiake pixiake merged commit 1b85ac9 into kubesphere:master Feb 22, 2024
1 of 3 checks passed
@ks-ci-bot
Copy link
Collaborator

@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:

/cherrypick release-3.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ks-ci-bot
Copy link
Collaborator

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

In response to this:

/cherrypick release-3.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants