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

move chart images to ghcr.io #2533

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Conversation

jkhelil
Copy link
Member

@jkhelil jkhelil commented Jan 23, 2025

Changes

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide for more details.

Release Notes

@tekton-robot tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jan 23, 2025
@tekton-robot tekton-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 23, 2025
@PuneetPunamiya
Copy link
Member

/approve

@tekton-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: PuneetPunamiya

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 23, 2025
Copy link
Contributor

@savitaashture savitaashture left a comment

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2025
@tekton-robot tekton-robot merged commit 4e323f9 into tektoncd:main Jan 23, 2025
9 checks passed
@jkhelil
Copy link
Member Author

jkhelil commented Jan 23, 2025

/cherry-pick release-v0.73.x

@tekton-robot
Copy link
Contributor

@jkhelil: #2533 failed to apply on top of branch "release-v0.73.x":

Applying: move chart images to ghcr.io
Using index info to reconstruct a base tree...
M	charts/tekton-operator/values.yaml
M	config/kubernetes/base/operator.yaml
M	config/openshift/base/operator.yaml
M	operatorhub/kubernetes/config.yaml
M	operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml
Auto-merging operatorhub/kubernetes/config.yaml
CONFLICT (content): Merge conflict in operatorhub/kubernetes/config.yaml
Auto-merging config/openshift/base/operator.yaml
CONFLICT (content): Merge conflict in config/openshift/base/operator.yaml
Auto-merging config/kubernetes/base/operator.yaml
CONFLICT (content): Merge conflict in config/kubernetes/base/operator.yaml
Auto-merging charts/tekton-operator/values.yaml
CONFLICT (content): Merge conflict in charts/tekton-operator/values.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 move chart images to ghcr.io
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-v0.73.x

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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants