search

openshift / ocp-release-operator-sdk

Apache License 2.0
16 stars 39 forks source link

Merge upstream tag v1.26.0 #295

Closed everettraven closed 1 year ago

everettraven commented 1 year ago

Operator SDK v1.26.0

Merge executed via ./UPSTREAM-MERGE.sh v1.26.0 upstream master

michaelryanpeter commented 1 year ago

/label docs-approved

everettraven commented 1 year ago

/retest

openshift-ci[bot] commented 1 year ago

@everettraven: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
emmajiafan commented 1 year ago

/label qe-approved

oceanc80 commented 1 year ago

/lgtm

openshift-ci[bot] commented 1 year ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: everettraven, oceanc80

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: - ~~[OWNERS](https://github.com/openshift/ocp-release-operator-sdk/blob/master/OWNERS)~~ [everettraven,oceanc80] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
everettraven commented 1 year ago

/cherry-pick release-4.12

openshift-cherrypick-robot commented 1 year ago

@everettraven: #295 failed to apply on top of branch "release-4.12":

Applying: re-orders deploy steps and clarifies instructions (#6109)
Applying: docs: update tutorial.md (#6099)
Applying: fixes broken "make run" for ansible operators (#6110)
Applying: typo (#6105)
Applying: bump operator-framework/api to commit `b611f6cef49cb8c6d621145c4e31d8ddfd4c59f4` (#6119)
.git/rebase-apply/patch:19: trailing whitespace.
      in Kubernetes v1.25.0 the ClusterServiceVersion's CustomResourceDefinitions, 
.git/rebase-apply/patch:20: trailing whitespace.
      ClusterPermissions, and Permissions are now validated to ensure no references to 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Applying: image(ansible-operator): bump base to quay.io/operator-framework/ansible-operator-base:master-0bb70a023cfde5cfd477fb354d350185e5dcf454 (#6120)
Applying: Fix fresh images (#6141)
Applying: (actions): add --mode 700 to gpg directory creation (#6146)
Applying: Update v1.25.0.md (#6132)
Applying: Point kubernetes collection to kubernetes/core instead of community.kubernetes (#6079)
Applying: Update gpg keys with new expiration date (#6151)
Applying: Fix secring. Signed with cncf key instead of mine. (#6160)
Applying: Update the keys and script one more time (#6162)
Applying: Update docs about resources watched by the Controller (#5950)
Applying: docs: small typo update (#6076)
Applying: Move memcached-operator monitoring to a separate operator (#6150)
Applying: change rerun github action to point at the operator-framework repo (#6139)
Applying: docs: fix typo in namespace labeling command (#6125)
Applying: (chore): bump ubi(-minimal) to 8.7 (#6175)
Applying: CHANGE capability level description to independent (#6134)
Applying: image(ansible-operator): bump base to quay.io/operator-framework/ansible-operator-base:master-aa0243440429e60568c27df5c7c22976f2b23a16 (#6179)
Applying: images: add gcc to image dependencies (#6172)
Applying: remove deprecated github actions from CI workflows (#6153)
Applying: docs/upgrade-sdk-version/v1.3.0.md: correct link to migration guide (#6191)
Applying: update Pipfile.lock of ansible-operator (#6176)
Applying: Update createdAt when `make bundle` is run (#6136)
Applying: update kubernetes compatibility matrix (#6113)
Applying: (bugfix): update run bundle(-upgrade) logic (#6182)
Applying: move everettraven from reviewer to approver (#6192)
Using index info to reconstruct a base tree...
M   OWNERS_ALIASES
Falling back to patching base and 3-way merge...
Auto-merging OWNERS_ALIASES
Applying: update docs for operator-sdk run bundle with SQLite (#6054)
Applying: Updated the content to coherent with the code snippet (#6199)
Applying: Add best practice for designing lean operator (#6164)
Applying: Make refresh images github workflow push latest (#6208)
Applying: Add Operator Observability Best Practices (#5975)
Applying: Add alerts to the sample Memcached operator (#6135)
Applying: image(ansible-operator): bump base to quay.io/operator-framework/ansible-operator-base:master-80435707c04072729ce39b776ca9f1755f000d2e (#6214)
Applying: Release v1.26.0 (#6218)
Applying: update versions patch
Using index info to reconstruct a base tree...
M   patches/03-setversion.patch
Falling back to patching base and 3-way merge...
Auto-merging patches/03-setversion.patch
CONFLICT (content): Merge conflict in patches/03-setversion.patch
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0038 update versions patch
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/openshift/ocp-release-operator-sdk/pull/295#issuecomment-1372296294): >/cherry-pick release-4.12 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.
everettraven commented 1 year ago

/cherry-pick release-4.12

openshift-cherrypick-robot commented 1 year ago

@everettraven: #295 failed to apply on top of branch "release-4.12":

Applying: re-orders deploy steps and clarifies instructions (#6109)
Applying: docs: update tutorial.md (#6099)
Applying: fixes broken "make run" for ansible operators (#6110)
Applying: typo (#6105)
Applying: bump operator-framework/api to commit `b611f6cef49cb8c6d621145c4e31d8ddfd4c59f4` (#6119)
.git/rebase-apply/patch:19: trailing whitespace.
      in Kubernetes v1.25.0 the ClusterServiceVersion's CustomResourceDefinitions, 
.git/rebase-apply/patch:20: trailing whitespace.
      ClusterPermissions, and Permissions are now validated to ensure no references to 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Applying: image(ansible-operator): bump base to quay.io/operator-framework/ansible-operator-base:master-0bb70a023cfde5cfd477fb354d350185e5dcf454 (#6120)
Applying: Fix fresh images (#6141)
Applying: (actions): add --mode 700 to gpg directory creation (#6146)
Using index info to reconstruct a base tree...
M   .ci/gpg/create-keyring.sh
Falling back to patching base and 3-way merge...
Auto-merging .ci/gpg/create-keyring.sh
No changes -- Patch already applied.
Applying: Update v1.25.0.md (#6132)
Applying: Point kubernetes collection to kubernetes/core instead of community.kubernetes (#6079)
Applying: Update gpg keys with new expiration date (#6151)
warning: Cannot merge binary files: .ci/gpg/secring.auto.gpg (HEAD vs. Update gpg keys with new expiration date (#6151))
Using index info to reconstruct a base tree...
M   .ci/gpg/pubring.auto
M   .ci/gpg/secring.auto.gpg
Falling back to patching base and 3-way merge...
Auto-merging .ci/gpg/secring.auto.gpg
CONFLICT (content): Merge conflict in .ci/gpg/secring.auto.gpg
Auto-merging .ci/gpg/pubring.auto
CONFLICT (content): Merge conflict in .ci/gpg/pubring.auto
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0011 Update gpg keys with new expiration date (#6151)
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/openshift/ocp-release-operator-sdk/pull/295#issuecomment-1377938010): >/cherry-pick release-4.12 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.