openshift / ocp-release-operator-sdk

Apache License 2.0
16 stars 39 forks source link

Merge upstream tag v1.20.0 #243

Closed ryantking closed 2 years ago

ryantking commented 2 years ago
Merge upstream tag v1.20.0

Operator SDK v1.20.0

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

Overwritten conflicts:
Makefile
testdata/ansible/memcached-operator/Dockerfile
testdata/ansible/memcached-operator/Makefile
testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml
testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml
testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml
testdata/go/v2/memcached-operator/bundle/tests/scorecard/config.yaml
testdata/go/v2/memcached-operator/config/scorecard/patches/basic.config.yaml
testdata/go/v2/memcached-operator/config/scorecard/patches/olm.config.yaml
testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml
testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml
testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml
testdata/helm/memcached-operator/Dockerfile
testdata/helm/memcached-operator/Makefile
testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml
testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml
testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml
website/content/en/docs/installation/_index.md
openshift-ci[bot] commented 2 years ago

Hi @ryantking. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.
jmrodri commented 2 years ago

/ok-to-test

openshift-ci[bot] commented 2 years ago

@ryantking: 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).
michaelryanpeter commented 2 years ago

/label docs-approved

emmajiafan commented 2 years ago

/label qe-approved

openshift-ci[bot] commented 2 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmrodri, ryantking

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)~~ [jmrodri] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
jmrodri commented 2 years ago

/approved