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

Merge upstream tag v1.20.0 #243

Merged
merged 55 commits into from
May 9, 2022
Merged

Merge upstream tag v1.20.0 #243

merged 55 commits into from
May 9, 2022

Conversation

ryantking
Copy link
Contributor

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

creydr and others added 30 commits March 1, 2022 13:31
This change adds the labels of the deployment to the
ClusterServiceVersions deployment spec. So the labels defined for the
deployment (and defined in its manifest) will be applied too, if the
operator gets installed via OLM.

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
`memcached-molecule-operator` used in e2e molecule test watches k8s core
resources (Secret). Running the operator in cluster-scope causes
watching all Secrets in the cluster, which causes high load of the
operator and leads to resource creation timeout in the test case.
Configuring the operator to watch own namespace workarounds the issue.

Fixes #5547

Signed-off-by: Ryo Imai <iryo@jp.ibm.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
Bug Fixes
 - Fixes issue 74 - chore: update to JOSDK extension 3.0.4 and Quarkus 2.7.3 (PR 76)

Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
Signed-off-by: James Lakin <james@jameslakin.co.uk>
* fix: K8S_VERSION in Makefile

Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>

* make envtest match

Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>
…receives an error (#5486)

Made for Issue #5409

Signed-off-by: aemperador <alexis.emperador@ibm.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
* log error for url verification failure

Signed-off-by: Clyde Germond <clyde.germond@gmail.com>
…as --skip-tls flag is deprecated. (#5617)

* change is to add opm new flags --skip-tls-verify and --use-http

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

updated versions

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

add changelog for the change

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

updated variable names

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

removed content files

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

modified code according to version changes

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

updated tests

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

modified tests for --use-http

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

modified due to test sanity

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

modified due to test sanity

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

modified due to test sanity

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

modified due to test sanity

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

updated varibale description

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* updated according to PR review comments

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>
log could not be set as it was unexported.

Signed-off-by: Frederic Giloux <fgiloux@redhat.com>
Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>
Signed-off-by: Jonathan Berkhahn <jaberkha@us.ibm.com>
This significantly lowers the load on the test-operator, which was
getting restarted due to resource limits.

Re #5547

Signed-off-by: Austin Macdonald <austin@redhat.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
There is a known controller-tools issue where rbac markers are not
parsed correctly if they are not followed by a newline.

Fixes: Bugzilla 2061611
Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>
Signed-off-by: Prashant Arya <prary2@gmail.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
* Update python dependencies

- Bump openshift 0.12 to 0.13
- Skip pipenv check for pyup-45114
  https://nvd.nist.gov/vuln/detail/CVE-2021-29923 This CVE is filed
  against k8s on Golang < 1.17 and is attached to this lib because
  python-kubernetes uses the Kubernetes API.

Signed-off-by: Austin Macdonald <austin@redhat.com>

* remove pipfile lock, which was used to update the pipfiles

Signed-off-by: Austin Macdonald <austin@redhat.com>

* take 2

Signed-off-by: Austin Macdonald <austin@redhat.com>
* revert back --skip-tls with deprecation notice

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* added changelog

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* modified according to test sanity changes

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* modified according to suggestion

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* removed use-http flag

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* modified tag to use http

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* added typos

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* removed comment

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* removed field as it is not used in registry pod

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>
Part of the image pinning logic is currently missing from master. This
PR adds that back along with the released version of Operator Manifest Tools.

Signed-off-by: Ryan King <ryking@redhat.com>
Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>
Co-authored-by: Prashant Arya <prary2@gmail.com>
Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>

Co-authored-by: Prashant Arya <prary2@gmail.com>
asmacdo and others added 6 commits April 27, 2022 12:00
Signed-off-by: Austin Macdonald <austin@redhat.com>
* Add instructions for archiving unsupported docs

Fixes: #5631

Signed-off-by: Austin Macdonald <austin@redhat.com>

* Change release perms to be like the other files

Signed-off-by: Austin Macdonald <austin@redhat.com>
* update olm bindata

operator-sdk was behind on a few OLM versions. updated the supported versions and bindata.

resolves #5680

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update olm version in testutils

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update olm based on review

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update to be 3 latest minor releases

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update changelog

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* fix netlify badge link

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
* Fix ansible-operator finalizer concurrency issue

For ansible-based operators, this change fixes an issue that caused
finalizers to fail to run if the watched resource (CR) is deleted during
reconciliation.

Fixes #4909

Signed-off-by: Austin Macdonald <austin@redhat.com>

* dont change constants

Signed-off-by: Austin Macdonald <austin@redhat.com>

* change name so we dont have a half-made test

Signed-off-by: Austin Macdonald <austin@redhat.com>

* PR cleanup

Signed-off-by: Austin Macdonald <austin@redhat.com>

* rm extra ---

Signed-off-by: Austin Macdonald <austin@redhat.com>
* Release v1.20.0

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* added changelog

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* removed website/config.toml-E file

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* modified changelog content

Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>
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 openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 4, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 4, 2022

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. 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 requested review from fabianvf and jmrodri May 4, 2022 20:13
@jmrodri
Copy link
Contributor

jmrodri commented May 5, 2022

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 5, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 5, 2022

@ryantking: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@michaelryanpeter
Copy link
Contributor

/label docs-approved

@openshift-ci openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label May 6, 2022
@emmajiafan
Copy link
Contributor

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 7, 2022
Copy link
Contributor

@jmrodri jmrodri left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 9, 2022

[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:

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 May 9, 2022
@jmrodri
Copy link
Contributor

jmrodri commented May 9, 2022

/approved

@openshift-merge-robot openshift-merge-robot merged commit b2cf25b into openshift:master May 9, 2022
@ryantking ryantking deleted the v1.20.0-rebase-master branch May 12, 2022 12:45
@ryantking ryantking restored the v1.20.0-rebase-master branch May 12, 2022 12:45
@ryantking ryantking deleted the v1.20.0-rebase-master branch May 12, 2022 12:45
@ryantking ryantking restored the v1.20.0-rebase-master branch May 12, 2022 12:45
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. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.