Bug 1992405: Merge upstream tag v1.10.1 #141

jmrodri · 2021-08-11T02:14:24Z

Merge upstream tag v1.10.1

Operator SDK v1.10.1

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

Overwritten conflicts:

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

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>

Signed-off-by: timflannagan <timflannagan@gmail.com>

…r (#4957) Adding a check to filter out empty patch requests from an empty map out of the 3-way merge. Signed-off-by: Cheuk Lam <chlam4@hotmail.com> Co-authored-by: Eric Stroczynski <estroczy@redhat.com>

…erator (#4963) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.4...1.26.5) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>

* fix: build-cmd arg in pkgman-to-bundle The custom build command in pkgman-to-bundle accepts the input and executes it using `exec.Command()`. However, `exec.Command()` requires the first argument to be the path or name of the binary. This change separates the user input and considers first argument as the path. Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com> * update docs for pkgman to bundle cmd Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com> * add example command in doc Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

Fix the link to memcached_controller.go to point to master. Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

* Print to StdOut * Parsing of verbosity * Refactoring * Handling errors * Changing to assignments * Some changes * New changes Signed-off-by: Venkat Ramaraju <venky2063@gmail.com>

Signed-off-by: Camila Macedo <cmacedo@redhat.com>

* modified files Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * fix for the path issue - operator-framework/operator-sdk#4980 Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * added changelog Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * worked on review comments Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * testdata Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified error Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified error Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified changelog Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * changelog change Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * Update internal/cmd/ansible-operator/run/cmd.go Signed-off-by: Fabian von Feilitzsch <fabian@fabianism.us> Co-authored-by: Fabian von Feilitzsch <fabian@fabianism.us>

…cumentation (#4991) Update the client.md documentation and change the function signature documented from client.UpdateOption to client.PatchOption for the patch method header. Signed-off-by: timflannagan <timflannagan@gmail.com>

* Print to StdOut Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Parsing of verbosity Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Refactoring Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Handling errors Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Changing to assignments Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Handling of loops Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Missed return statement Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Some changes Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * New changes Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Moved logging to log_events.go Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * Changes Signed-off-by: Venkat Ramaraju <venky2063@gmail.com> * New changes Signed-off-by: Venkat Ramaraju <venky2063@gmail.com>

* modified version for OLM * modified olm.go file from etstutils Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

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

Signed-off-by: akumarab <akumarab@cisco.com>

…981) Update comment to mention that webhooks are not supported by helm The comment is in the helm plugin but only mentions ansible which is confusing. I used the helm/ansible term to be consistent with the rest of the comments in the file. Signed-off-by: Brad Topol <btopol@us.ibm.com>

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

Signed-off-by: Venkat Ramaraju <venky2063@gmail.com>

Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

* Bump java-operator-plugins. * Add changelog Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>

Signed-off-by: cndoit18 <cndoit18@outlook.com>

The reference link is based on the link in golang/quickstart page: https://github.com/operator-framework/operator-sdk/blob/f298f7c92ee154a0e8123fb13398a7f21720cf0e/website/content/en/docs/building-operators/golang/quickstart.md#L59 . Signed-off-by: Sunny <darkowlzz@protonmail.com>

Update convertConfig3AlphaTo3() to use an empty string as a domain name when the read config has no domain information. Check the existence of "domain" field in the config before attempting a type assertion. This helps avoid panic: ``` panic: interface conversion: interface {} is nil, not string ``` Signed-off-by: Sunny <darkowlzz@protonmail.com>

Signed-off-by: Vincent Hou <shou@us.ibm.com>

* modified release instructions for macos users Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified according comments Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified according comments Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

* modified and added admission webhook Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified according to suggestions Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * untracked file Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified according to comments Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified according to comments Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified according to comments Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified according to PR comments Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * added new changes and removed memcached example Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * updated Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * modified and added the changes Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com> * removed file Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

This commit bumps: 1. k8s dependencies to 1.21+. 2. Bump controller-runtime to 0.9.2 and kb to the latest commit. 2. Bump kustomize version in Ansible and Helm operator projects. Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

Previously, the versions of manifests other than the latest version, used to have channel specified as `candidate`. This caused errors while running the bundle. With this commit, the channels for those manifests would be the `defaultchannel` specified in package.yaml. Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

Signed-off-by: Sam Schneider <samuel.schneider@delhivery.com>

jmrodri · 2021-08-11T19:29:28Z

/test images

jmrodri · 2021-08-16T20:43:03Z

/test images

jmrodri · 2021-08-17T20:36:08Z

/test images

jmrodri · 2021-08-19T20:11:20Z

/test images

jmrodri · 2021-08-19T20:48:48Z

/test e2e-aws-ansible

jmrodri · 2021-08-19T20:48:55Z

/test e2e-aws-helm

jmrodri · 2021-08-20T13:14:53Z

/bugzilla refresh

openshift-ci · 2021-08-20T13:14:58Z

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

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.9.0) matches configured target release for branch (4.9.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.

emmajiafan · 2021-08-25T03:13:23Z

@jmrodri Regression test finished (id: 20210824-0328) , one bug: 1996638 . Other "POST" bugs are passed.
I don't think bug 1996638 is a blocker for this PR.

emmajiafan · 2021-08-25T03:16:16Z

/label qe-approved

adellape · 2021-08-25T22:34:44Z

/label docs-approved

rashmigottipati

A few incorrect PR links in CHANGELOG notes.

rashmigottipati · 2021-08-26T01:10:21Z

changelog/generated/v1.10.1.md

+
+### Additions
+
+- (go/v3, ansible/v1, helm/v1) Added `containerPort` protocol field required for server-side apply in manifests. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))


Suggested change

- (go/v3, ansible/v1, helm/v1) Added `containerPort` protocol field required for server-side apply in manifests. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))

- (go/v3, ansible/v1, helm/v1) Added `containerPort` protocol field required for server-side apply in manifests. ([#5117](https://github.com/operator-framework/operator-sdk/pull/5117))

rashmigottipati · 2021-08-26T01:13:17Z

changelog/generated/v1.10.1.md

+
+### Changes
+
+- (go/v3, ansible/v1, helm/v1) Increased default resource limits for controller manager. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))


Suggested change

- (go/v3, ansible/v1, helm/v1) Increased default resource limits for controller manager. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))

- (go/v3, ansible/v1, helm/v1) Increased default resource limits for controller manager. ([#5117](https://github.com/operator-framework/operator-sdk/pull/5117))

rashmigottipati · 2021-08-26T01:15:55Z

changelog/generated/v1.10.1.md

+### Bug Fixes
+
+- In `generate bundle`, exclude ServiceAccounts already in a CSV from generated bundle. ([#5124](https://github.com/operator-framework/operator-sdk/pull/5124))
+- (go/v3) Fixed a bug in `make test` caused by incorrect envtest asset setup. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))


Suggested change

- (go/v3) Fixed a bug in `make test` caused by incorrect envtest asset setup. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))

- (go/v3) Fixed a bug in `make test` caused by incorrect envtest asset setup. ([#5117](https://github.com/operator-framework/operator-sdk/pull/5117))

rashmigottipati

@jmrodri as we discussed, we can ignore the PR link corrections as this should reflect upstream.

Everything else looks good.
/lgtm

openshift-ci · 2021-08-26T01:36:08Z

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

openshift/ocp-release-operator-sdk#141

Bugzilla bug 1992405 has been moved to the MODIFIED state.

In response to this:

Bug 1992405: Merge upstream tag v1.10.1

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.

Eric Stroczynski and others added 30 commits May 26, 2021 17:25

docs(release): add branch information so the correct commit is tagged…

c7401c7

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

Update assumptions on run bundle-upgrade to include a scenario (#4968)

be54561

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>

website: Fix broken bundle quickstart link (#4958)

d2ad02a

Signed-off-by: timflannagan <timflannagan@gmail.com>

fix(helm-operator): do not send empty patch requests to kube apiserve…

ec26aad

…r (#4957) Adding a check to filter out empty patch requests from an empty map out of the 3-way merge. Signed-off-by: Cheuk Lam <chlam4@hotmail.com> Co-authored-by: Eric Stroczynski <estroczy@redhat.com>

fix: link to memcached_controller.go (#4973)

bd6fa84

Fix the link to memcached_controller.go to point to master. Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

Closes #4446: Logging to Stdout based on verbosity (#4961)

0c3d84d

* Print to StdOut * Parsing of verbosity * Refactoring * Handling errors * Changing to assignments * Some changes * New changes Signed-off-by: Venkat Ramaraju <venky2063@gmail.com>

feat: update channel namming to reflect to the conv (#4978)

35bc0a2

Signed-off-by: Camila Macedo <cmacedo@redhat.com>

modified version for OLM (#4995)

0370f30

* modified version for OLM * modified olm.go file from etstutils Signed-off-by: laxmikantbpandhare <laxmikantpandhare@gmail.com>

Release (#4994)

205e0a0

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

update image name in "operator-sdk run bundle" cmd (#4988)

3779341

Signed-off-by: akumarab <akumarab@cisco.com>

reorganze scorecard documentation (#5007)

60bfe2e

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

internal metrics (#5011)

e222e98

Signed-off-by: Venkat Ramaraju <venky2063@gmail.com>

fix: specify the right path of metadata in bundle.Dockerfile (#5030)

7356782

Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

Bump java-operator-plugins. (#5020)

2781cf8

* Bump java-operator-plugins. * Add changelog Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>

fix: issue-5041 (#5042)

57ac0fe

Signed-off-by: cndoit18 <cndoit18@outlook.com>

Add the missing test suite for the metrics (#5039)

95ed52a

Signed-off-by: Vincent Hou <shou@us.ibm.com>

Bump k8s dependencies to 1.21+ (#5057)

fb2a657

This commit bumps: 1. k8s dependencies to 1.21+. 2. Bump controller-runtime to 0.9.2 and kb to the latest commit. 2. Bump kustomize version in Ansible and Helm operator projects. Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>

Add XUnit Formatting Output to Scorecard (#5048)

570cae3

docs/olm-integration: Fix misspelling (#5079)

5f6c16c

Signed-off-by: Sam Schneider <samuel.schneider@delhivery.com>

Fix downstream stamps test

6ad400d

jmrodri force-pushed the v1.10.1-rebase-master branch from 3965832 to 6ad400d Compare August 11, 2021 02:49

Skip pkgman test that uses docker

71ebeaf

Update dockerfiles to use latest build images

1d9aa99

jmrodri added 3 commits August 19, 2021 21:50

Use the correct kubectl

6db94e2

Remove dead code

7efd586

Patch to work around envtest issue & print correct k8s version

ee3c10e

openshift-ci bot removed the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label Aug 20, 2021

openshift-ci bot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Aug 20, 2021

Bug 1996567: Update OCP version in openshift plugin

d71cf4e

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Aug 25, 2021

openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label Aug 25, 2021

rashmigottipati reviewed Aug 26, 2021

View reviewed changes

rashmigottipati approved these changes Aug 26, 2021

View reviewed changes

openshift-ci bot assigned rashmigottipati Aug 26, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2021

openshift-merge-robot merged commit fbf0ea9 into openshift:master Aug 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1992405: Merge upstream tag v1.10.1 #141

Bug 1992405: Merge upstream tag v1.10.1 #141

jmrodri commented Aug 11, 2021

jmrodri commented Aug 11, 2021

jmrodri commented Aug 16, 2021

jmrodri commented Aug 17, 2021

jmrodri commented Aug 19, 2021

jmrodri commented Aug 19, 2021

jmrodri commented Aug 19, 2021

jmrodri commented Aug 20, 2021

openshift-ci bot commented Aug 20, 2021

emmajiafan commented Aug 25, 2021 •

edited

emmajiafan commented Aug 25, 2021

adellape commented Aug 25, 2021

rashmigottipati left a comment

rashmigottipati Aug 26, 2021 •

edited

rashmigottipati Aug 26, 2021

rashmigottipati Aug 26, 2021

rashmigottipati left a comment

openshift-ci bot commented Aug 26, 2021


		### Additions

		- (go/v3, ansible/v1, helm/v1) Added `containerPort` protocol field required for server-side apply in manifests. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))


		### Changes

		- (go/v3, ansible/v1, helm/v1) Increased default resource limits for controller manager. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))

	- (go/v3) Fixed a bug in `make test` caused by incorrect envtest asset setup. ([#4863](https://github.com/operator-framework/operator-sdk/pull/4863))
	- (go/v3) Fixed a bug in `make test` caused by incorrect envtest asset setup. ([#5117](https://github.com/operator-framework/operator-sdk/pull/5117))

Bug 1992405: Merge upstream tag v1.10.1 #141

Bug 1992405: Merge upstream tag v1.10.1 #141

Conversation

jmrodri commented Aug 11, 2021

jmrodri commented Aug 11, 2021

jmrodri commented Aug 16, 2021

jmrodri commented Aug 17, 2021

jmrodri commented Aug 19, 2021

jmrodri commented Aug 19, 2021

jmrodri commented Aug 19, 2021

jmrodri commented Aug 20, 2021

openshift-ci bot commented Aug 20, 2021

emmajiafan commented Aug 25, 2021 • edited

emmajiafan commented Aug 25, 2021

adellape commented Aug 25, 2021

rashmigottipati left a comment

Choose a reason for hiding this comment

rashmigottipati Aug 26, 2021 • edited

Choose a reason for hiding this comment

rashmigottipati Aug 26, 2021

Choose a reason for hiding this comment

rashmigottipati Aug 26, 2021

Choose a reason for hiding this comment

rashmigottipati left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Aug 26, 2021

emmajiafan commented Aug 25, 2021 •

edited

rashmigottipati Aug 26, 2021 •

edited