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

Bug 1964748: Merge upstream tag v1.7.2 #114

Merged
merged 54 commits into from May 26, 2021

Conversation

jmrodri
Copy link
Contributor

@jmrodri jmrodri commented May 18, 2021

Merge upstream tag v1.7.2

Operator SDK v1.7.2

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

Overwritten conflicts:
Makefile
images/ansible-operator/Dockerfile
images/ansible-operator/base.Dockerfile
images/custom-scorecard-tests/Dockerfile
images/helm-operator/Dockerfile
images/operator-sdk/Dockerfile
images/scorecard-test/Dockerfile
internal/cmd/ansible-operator/run/cmd.go
internal/cmd/helm-operator/run/cmd.go
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

camilamacedo86 and others added 30 commits April 15, 2021 12:46
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
* Change default Image Pull Policy for Scorecard

Signed-off-by: Ish Shah <ishah@redhat.com>

* add changelog fragment

Signed-off-by: Ish Shah <ishah@redhat.com>
Add 'download/' to the OPERATOR_SDK_DL_URL

Signed-off-by: Brad P. Crochet <brad@crochet.net>
…on guide (#4775)

Signed-off-by: timflannagan <timflannagan@gmail.com>
…` updates (#4768)

deps: bump kubebuilder to 9f90d1a3c3cc

internal/plugins: align ansible/helm plugins with kustomize/v1 updates

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
…#4776)

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
This configures Dependabot (Github feature) to automatically create PRs
whenever a newer base image is available. This simplifies the process
of switching to a new base image after security patches are released.

Relates to #4763

Signed-off-by: Tom Hayward <thayward@infoblox.com>
…-operator (#4782)

Bumps ubi8/ubi from 8.3-227 to 8.3-297.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…/operator-sdk (#4784)

Bumps ubi8/ubi-minimal from 8.3-230 to 8.3-298.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…/helm-operator (#4787)

Bumps ubi8/ubi-minimal from 8.3-230 to 8.3-298.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…/scorecard-test (#4786)

Bumps ubi8/ubi-minimal from 8.3-230 to 8.3-298.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…/custom-scorecard-tests (#4785)

Bumps ubi8/ubi-minimal from 8.3-230 to 8.3-298.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oml updates (#4758)

Update the migration guide for the v0.2.x to v0.17.x versions and prefix
any of the **revision for tag "kubernetes-1.*.*"** with a comment so
it's easier to copy-and-paste when working with operator-sdk based
projects that haven't migrated from dep to go modules yet.

Signed-off-by: timflannagan <timflannagan@gmail.com>
Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
OtherLabels stem from a map and will have random order between
executions causing the generated bundle Dockerfile to potentially
result in a dirty git state.

Sorting the OtherLabels fixes the issue.

Co-authored-by: Bartosz Majsak <bartosz.majsak@gmail.com>
Signed-off-by: Aslak Knutsen <aslak@4fs.no>
Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
Signed-off-by: Jeesmon Jacob <jjacob@us.ibm.com>
Co-authored-by: Eric Stroczynski <estroczy@redhat.com>
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
…4810)

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
…work/ansible-operator-base:master-ccae7728df7dfbcba45c6c61d314339539039642 (#4820)

Co-authored-by: estroz <estroz@users.noreply.github.com>
* Add pkgman-to-bundle cmd 
* Added scorecard scaffolding
* Implement building bundle image
* Refactor generate bundle to use bundleutil
* Modify channel collection and nits
* Add tests for migrate command
* Modify flag naming in pkgmantobundle cmd 
* Copy scorecard config logic
* solve packagename collision error by including dir 

Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>
…ing (#4779)

* Add logs that allow users to see what events the controller is receiving
* Add tests for new ansible handlers
* Add prometheus/client_model dependency

Co-authored-by: Eric Stroczynski <estroczy@redhat.com>

Signed-off-by: Fabian von Feilitzsch <fabian@fabianism.us>
Added bindata to support faster installation of
olm 0.18.0 using operator SDK.

Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>
Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>
Signed-off-by: Jonathan Berkhahn <jaberkha@us.ibm.com>
Co-authored-by: Eric Stroczynski <estroczy@redhat.com>
…4843)

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
@emmajiafan
Copy link
Contributor

emmajiafan commented May 26, 2021

Finish one regression test, it's ok except the known issues.
run:20210524-0217

@emmajiafan
Copy link
Contributor

/qe-approved

@jmrodri jmrodri changed the title Merge upstream tag v1.7.2 Bug 1964748: Merge upstream tag v1.7.2 May 26, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2021

@jmrodri: This pull request references Bugzilla bug 1964748, which is invalid:

  • expected the bug to target the "4.8.0" release, but it targets "---" 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 1964748: Merge upstream tag v1.7.2

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/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 26, 2021
@jmrodri
Copy link
Contributor Author

jmrodri commented May 26, 2021

/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 May 26, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2021

@jmrodri: This pull request references Bugzilla bug 1964748, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (jfan@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 May 26, 2021
@jmrodri
Copy link
Contributor Author

jmrodri commented May 26, 2021

/bugzilla refresh

@openshift-ci openshift-ci bot removed the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label May 26, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2021

@jmrodri: This pull request references Bugzilla bug 1964748, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (jfan@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 added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label May 26, 2021
@jmrodri
Copy link
Contributor Author

jmrodri commented May 26, 2021

/cc @estroz @fabianvf

@openshift-ci openshift-ci bot requested review from estroz and fabianvf May 26, 2021 02:49
@@ -4,7 +4,7 @@ SHELL = /bin/bash
# This value must be updated to the release tag of the most recent release, a change that must
# occur in the release commit. IMAGE_VERSION will be removed once each subproject that uses this
Copy link
Contributor

Choose a reason for hiding this comment

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

@jmrodri is K8S_VERSION going to get updated to 1.20.2 in a follow-up? Or does that get updated in some other way downstream? It's purely cosmetic downstream, for those curious.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I created a patch for it b4a97b0
so this will get applied during builds. So when we sync the next SDK down with the version fixed in the Makefile, I will drop this patch.

@estroz
Copy link
Contributor

estroz commented May 26, 2021

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 26, 2021
@openshift-merge-robot openshift-merge-robot merged commit a3b084c into openshift:master May 26, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2021

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

Bugzilla bug 1964748 has been moved to the MODIFIED state.

In response to this:

Bug 1964748: Merge upstream tag v1.7.2

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.

@adellape
Copy link

adellape commented Jun 2, 2021

/label docs-approved

@openshift-ci openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label Jun 2, 2021
@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 Jun 3, 2021
@jmrodri jmrodri deleted the v1.7.2-rebase-master branch August 20, 2021 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet