Merge upstream tag v1.2.0 #86

jmrodri · 2020-12-16T22:35:58Z

Merge upstream tag v1.2.0 

Operator SDK v1.2.0

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

Overwritten conflicts:
.gitignore
Makefile

…ly (#4023)

**Description of the change:** centralize the code to manage the prerequisites to install OLM and Prometheus which are equals for all e2e tests **Motivation for the change:** - maintainability - reusability - remove code duplications across the e2e tests

* Deployment first commit * Deployment tests for all functions * Deployment tests for all functions updates * Deployment tests for all functions

…uild/push (#4081)

**Description of the change:** - Upgrade kb commit from f7a3b65dd250 to c993a2a221fe - Upgrade controller-runtime version from `v0.6.2` to `v0.6.3`. More info: https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.6.3 **Motivation for the change:** - Address bugfixes done in Kubebuilder so far - Solve tech-debts - Keep the projects aligned.

Modify `olm-status-descriptor-test` to not check the presence of `status` field in CR, instead validate only if status-descriptors are present in owned CRDs.

* Service test * Service test refined * Update internal/olm/operator/registry/configmap/service_test.go Co-authored-by: Camila Macedo <cmacedo@redhat.com>

…4086) * .cncf-maintainers: auto-generate expanded maintainers file for CNCF maintainers list * cncf-maintainers: fail generation if alias is not found

…e target (#4090)

…found (#4089) Co-authored-by: Eric Stroczynski <estroczy@redhat.com>

… created APIs (#4105)

…ming to reduce flakes (#4118)

* update scorecard docs * update to mention kustomize files location Co-authored-by: jmccormick2001 <djm76262@gmail.com>

…125) Co-authored-by: jmccormick2001 <djm76262@gmail.com>

* Bump operator-framework/api to v0.3.18 * Bump operator-framework/api to v0.3.20

Co-authored-by: jmccormick2001 <djm76262@gmail.com>

…(#4136)

jmrodri · 2020-12-17T02:14:24Z

/hold

jmrodri · 2020-12-17T02:48:04Z

you can extract the operator-sdk binary from the sdk image built by the PR, for example,

docker create registry.build01.ci.openshift.org/ci-op-nkc3fx06/stable:operator-sdk # returns a SHA

# use the SHA from above to reference the container
docker cp 2270a139c02a5e3d43cc0be735622a5466267ad01d76fd0d0c938ce3c0fd3ff8:/user/local/bin/operator-sdk /tmp/operator-sdk

you will now have the operator-sdk binaries

estroz · 2020-12-17T04:03:06Z

images/ansible-operator/Dockerfile

+    ansible-runner==1.3.4 \
+    ansible-runner-http==1.0.0 \
+    openshift~=0.10.0 \
+    ansible~=2.9 \


I know we're just merging commit wholesale but this needs to be pinned to 2.9.15 (see operator-framework/operator-sdk#4321). We can either wait for v1.2.1 or v1.3. Thoughts @jmrodri?

/ping @asmacdo

Those aren't being used downstream. I probably need to compare the files on release/ansible

@estroz I've compared the 2. The downstream has its own dockerfiles https://github.com/openshift/ocp-release-operator-sdk/tree/master/release I usually just compare them to see if there's anything significant that needs to be brought over. The versions of ansible etc, are all controlled by the packages in the downstream repo which are up to date.

Cool, resolved.

emmajiafan · 2020-12-17T09:02:57Z

@jmrodri I check the operatorsdk version is :./operator-sdk version
operator-sdk version: "9762a774", commit: "9762a774472487cd72784cf0e591e6cf44fc09d4", kubernetes version: "v1.18.8", go version: "go1.15.5", GOOS: "linux", GOARCH: "amd64". It is not "ocp4.7" or "1.2.0". So is it the expected result?

estroz

/lgtm

Since we are now patching the Makefile with the correct version. We shouldn't be passing in a new version from the Dockerfiles.

jmrodri · 2020-12-17T22:06:38Z

/test ci/prow/images

openshift-ci-robot · 2020-12-17T22:06:53Z

@jmrodri: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

/test e2e-aws-ansible
/test e2e-aws-helm
/test images
/test sanity
/test unit

Use /test all to run all jobs.

In response to this:

/test ci/prow/images

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.

jmrodri · 2020-12-17T22:15:29Z

/test images

jmrodri · 2020-12-18T06:01:13Z

@emmajiafan not sure why the version isn't getting set. I updated the dockerfiles in this PR to set it directly. We could write a bug against it and address it later. I feel like this PR might be using cached images. Please try to test what you can

emmajiafan · 2020-12-18T13:51:10Z

@jmrodri Ok, will open a bug to trace it. And this pr merge a lot of codes ,so I will do a regression test about it and will cost about 2 days.

jmrodri · 2020-12-18T13:59:04Z

@emmajiafan that is expected. It's a full 1.2.0 release from upstream.

camilamacedo86 · 2020-12-21T11:50:51Z

/approve
/lgtm

emmajiafan · 2020-12-22T12:30:11Z

/lgtm
/approve

openshift-ci-robot · 2020-12-22T12:30:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, emmajiafan, estroz, jmrodri

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~~ [camilamacedo86,estroz,jmrodri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

jmrodri · 2021-01-04T14:56:51Z

/hold cancel

openshift-bot · 2021-01-04T15:17:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-04T15:30:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

camilamacedo86 and others added 30 commits October 19, 2020 10:00

post-release: update samples tag (#4050)

f06c8c0

Post release 1.1 (#4049)

718cc37

Makefile,*: cleanup and refactoring, support reproducible tests local…

e311086

…ly (#4023)

*: refactor Dockerfiles and Makefiles (#4069)

09c3aa1

fix incorrect build command in installation doc (#4075)

ed6575c

Add tests for deployment.go (#4052)

2e28869

* Deployment first commit * Deployment tests for all functions * Deployment tests for all functions updates * Deployment tests for all functions

docs/advanced-topics/scorecard: pin master links to a commit (#4076)

b7d5508

Makefile,release/Makefile: remove custom-scorecard-tests from image b…

4e332fa

…uild/push (#4081)

slight update to migration documentation (#3783)

3018140

fix: modify olm-status-descriptor-test in scorecard (#4009)

eeadf69

Modify `olm-status-descriptor-test` to not check the presence of `status` field in CR, instead validate only if status-descriptors are present in owned CRDs.

Add tests for service.go (#4026)

2250e52

* Service test * Service test refined * Update internal/olm/operator/registry/configmap/service_test.go Co-authored-by: Camila Macedo <cmacedo@redhat.com>

Auto-generate cncf maintainers file from OWNERS and OWNERS_ALIASES (#…

a98e777

…4086) * .cncf-maintainers: auto-generate expanded maintainers file for CNCF maintainers list * cncf-maintainers: fail generation if alias is not found

feat: replace ansible-memcached by molecule mock with samples (#4011)

a62133f

internal/plugins: Add kustomize as a prerequisite of Makefile's bundl…

33e37ef

…e target (#4090)

cleanup: delete catsrc and operatorgroup even if subscription is not …

decf479

…found (#4089) Co-authored-by: Eric Stroczynski <estroczy@redhat.com>

Remove suggestions if status is not present in CR (#4093)

0ccdc4e

internal/plugins/helm: scaffold finalizers subresource permission for…

ed052a9

… created APIs (#4105)

internal/scorecard/run_test.go: make parallel test more lenient on ti…

048d723

…ming to reduce flakes (#4118)

update scorecard docs (#4108)

2bc7f3f

* update scorecard docs * update to mention kustomize files location Co-authored-by: jmccormick2001 <djm76262@gmail.com>

update README link for travis from travis-ci.org to travis-ci.com (#4…

43e6b5d

…125) Co-authored-by: jmccormick2001 <djm76262@gmail.com>

Makefile: always build linux binaries when building for an image (#4121)

a4fea56

Removing .DS_Store (#4127)

282f2a5

images/scorecard-test-kuttl: re-add entrypoint script (#4126)

a6a8699

ci: use fixed image name when building docker images (#4133)

bede70b

Bump operator-framework/api to v0.3.20 (#4109)

299dad4

* Bump operator-framework/api to v0.3.18 * Bump operator-framework/api to v0.3.20

Revert doc on operator conditions (#4132)

7c708d0

bump kuttl version to 0.7.1 (#4138)

1faff90

Co-authored-by: jmccormick2001 <djm76262@gmail.com>

go/ansible/helm plugins: use rbac/v1 for metrics reader cluster role …

ca096b6

…(#4136)

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2020

estroz reviewed Dec 17, 2020

View reviewed changes

Add phony targets

9660afc

estroz approved these changes Dec 17, 2020

View reviewed changes

openshift-ci-robot assigned estroz Dec 17, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2020

Set version for operator-sdk binaries

e1e92b5

Since we are now patching the Makefile with the correct version. We shouldn't be passing in a new version from the Dockerfiles.

jmrodri force-pushed the v1.2.0-rebase-master branch from cdc6c02 to e1e92b5 Compare December 17, 2020 19:54

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2020

openshift-ci-robot assigned camilamacedo86 Dec 21, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2020

openshift-ci-robot assigned emmajiafan Dec 22, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 4, 2021

openshift-merge-robot merged commit 7cc6f20 into openshift:master Jan 4, 2021

jmrodri deleted the v1.2.0-rebase-master branch February 13, 2021 17:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream tag v1.2.0 #86

Merge upstream tag v1.2.0 #86

jmrodri commented Dec 16, 2020

jmrodri commented Dec 17, 2020

jmrodri commented Dec 17, 2020

estroz Dec 17, 2020

jmrodri Dec 17, 2020

jmrodri Dec 17, 2020

estroz Dec 17, 2020

emmajiafan commented Dec 17, 2020

estroz left a comment

jmrodri commented Dec 17, 2020

openshift-ci-robot commented Dec 17, 2020

jmrodri commented Dec 17, 2020

jmrodri commented Dec 18, 2020

emmajiafan commented Dec 18, 2020

jmrodri commented Dec 18, 2020

camilamacedo86 commented Dec 21, 2020

emmajiafan commented Dec 22, 2020 •

edited

openshift-ci-robot commented Dec 22, 2020

jmrodri commented Jan 4, 2021

openshift-bot commented Jan 4, 2021

openshift-bot commented Jan 4, 2021

Merge upstream tag v1.2.0 #86

Merge upstream tag v1.2.0 #86

Conversation

jmrodri commented Dec 16, 2020

jmrodri commented Dec 17, 2020

jmrodri commented Dec 17, 2020

estroz Dec 17, 2020

Choose a reason for hiding this comment

jmrodri Dec 17, 2020

Choose a reason for hiding this comment

jmrodri Dec 17, 2020

Choose a reason for hiding this comment

estroz Dec 17, 2020

Choose a reason for hiding this comment

emmajiafan commented Dec 17, 2020

estroz left a comment

Choose a reason for hiding this comment

jmrodri commented Dec 17, 2020

openshift-ci-robot commented Dec 17, 2020

jmrodri commented Dec 17, 2020

jmrodri commented Dec 18, 2020

emmajiafan commented Dec 18, 2020

jmrodri commented Dec 18, 2020

camilamacedo86 commented Dec 21, 2020

emmajiafan commented Dec 22, 2020 • edited

openshift-ci-robot commented Dec 22, 2020

jmrodri commented Jan 4, 2021

openshift-bot commented Jan 4, 2021

openshift-bot commented Jan 4, 2021

emmajiafan commented Dec 22, 2020 •

edited