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

[release-4.7] Bug 1970485: Add pipeline annotation to secrets for private git repo import with pipeline #9207

Conversation

rottencandy
Copy link
Contributor

This is a manual cherry pick of #9058
Jira: https://issues.redhat.com/browse/ODC-4927

Adds pipeine secret annotations to git credential secret when add
pipeline is checked, and link created secret to pipeline ServiceAccount.
@rottencandy rottencandy changed the title Bug 1970485: Add pipeline annotation to secrets for private git repo import with pipeline [release-4.7] Bug 1970485: Add pipeline annotation to secrets for private git repo import with pipeline Jun 10, 2021
@openshift-ci openshift-ci bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jun 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 10, 2021

@rottencandy: This pull request references Bugzilla bug 1970485, which is invalid:

  • expected dependent Bugzilla bug 1970470 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1970485: Add pipeline annotation to secrets for private git repo import with pipeline

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.

@openshift-ci openshift-ci bot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. component/dev-console Related to dev-console labels Jun 10, 2021
@karthikjeeyar
Copy link
Contributor

/bugzilla refresh

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jun 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 10, 2021

@karthikjeeyar: This pull request references Bugzilla bug 1970485, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1970470 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1970470 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (gamore@redhat.com), skipping review request.

In response to this:

/bugzilla refresh

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.

@openshift-ci openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jun 10, 2021
@karthikjeeyar
Copy link
Contributor

Verified locally, works as expected
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2021
@rottencandy
Copy link
Contributor Author

/cc @andrewballantyne

Copy link
Contributor

@andrewballantyne andrewballantyne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict was in the imports (things have moved around in 4.8). Content the same.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andrewballantyne, karthikjeeyar, rottencandy

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 10, 2021
@rottencandy
Copy link
Contributor Author

/cherrypick release-4.6

@openshift-cherrypick-robot

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

In response to this:

/cherrypick release-4.6

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.

@ecordell ecordell added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 11, 2021
@openshift-merge-robot openshift-merge-robot merged commit 08afae5 into openshift:release-4.7 Jun 11, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 11, 2021

@rottencandy: All pull requests linked via external trackers have merged:

Bugzilla bug 1970485 has been moved to the MODIFIED state.

In response to this:

[release-4.7] Bug 1970485: Add pipeline annotation to secrets for private git repo import with pipeline

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.

@openshift-cherrypick-robot

@rottencandy: #9207 failed to apply on top of branch "release-4.6":

Applying: link git secret to pipeine serviceaccount
Using index info to reconstruct a base tree...
M	frontend/packages/dev-console/src/components/import/__tests__/import-submit-utils.spec.ts
M	frontend/packages/dev-console/src/components/import/import-submit-utils.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/dev-console/src/components/import/import-submit-utils.ts
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/import/import-submit-utils.ts
Auto-merging frontend/packages/dev-console/src/components/import/__tests__/import-submit-utils.spec.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 link git secret to pipeine serviceaccount
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-4.6

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. component/dev-console Related to dev-console lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants