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.

Sign up for GitHub

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

Jump to bottom

Fix reconcile json edit mode #904

Merged
merged 1 commit into from
Feb 15, 2023
Merged

Fix reconcile json edit mode #904

merged 1 commit into from
Feb 15, 2023

Conversation

chilianyi
Copy link
Contributor

@chilianyi chilianyi commented Feb 14, 2023 •
edited
Loading

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #902

Special notes for reviewers:

Please check the following list before waiting reviewers:

  • Already committed the CRD files to the Helm Chart if you created some new CRDs
  • Already added the permission for the new API
  • Already added the RBAC markers for the new controllers

Does this PR introduce a user-facing change??

none

@ks-ci-bot ks-ci-bot requested a review from a team February 14, 2023 10:29
@ks-ci-bot ks-ci-bot added do-not-merge/release-note-label-needed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-none and removed do-not-merge/release-note-label-needed labels Feb 14, 2023
@chilianyi
Copy link
Contributor Author

/cherry-pick release-3.4

@ks-ci-bot
Copy link
Collaborator

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

/cherry-pick 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.

@yudong2015
Copy link
Collaborator

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@ks-ci-bot ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 15, 2023
@ks-ci-bot ks-ci-bot merged commit 1c85b3b into kubesphere:master Feb 15, 2023
@ks-ci-bot
Copy link
Collaborator

@chilianyi: #904 failed to apply on top of branch "release-3.4":

Applying: Fix reconcile json edit mode
Using index info to reconstruct a base tree...
M	controllers/jenkins/pipeline/json_converter.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/jenkins/pipeline/json_converter.go
CONFLICT (content): Merge conflict in controllers/jenkins/pipeline/json_converter.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix reconcile json edit mode
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:

/cherry-pick 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 ks-ci-bot mentioned this pull request Feb 15, 2023
Closed
@ks-ci-bot
Copy link
Collaborator

@chilianyi: new issue created for failed cherrypick: #908

In response to this:

/cherry-pick 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.

chilianyi added a commit to chilianyi/ks-devops that referenced this pull request Feb 28, 2024
@chilianyi
Fix reconcile json edit mode (kubesphere#904)
f19969f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yudong2015 yudong2015

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. release-note-none size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chilianyi @ks-ci-bot @yudong2015