Bug 2045878: v1.16.0 rebase master #203

fabianvf · 2022-01-25T18:47:29Z

Description of the change:

Motivation for the change:

Checklist

If the pull request includes user-facing changes, extra documentation is required:

Add a new changelog fragment in changelog/fragments (see changelog/fragments/00-template.yaml)
Add or update relevant sections of the docs website in website/content/en/docs

* bump kb with the latest changes/fixes - v3.2.0

* bump operator-frawork-api Signed-off-by: Camila Macedo <cmacedo@redhat.com> * add changelog Signed-off-by: Camila Macedo <cmacedo@redhat.com> * Update changelog/fragments/bump-operator-frameworkapi.yaml Co-authored-by: Austin Macdonald <austin@redhat.com> * Update changelog/fragments/bump-operator-frameworkapi.yaml Co-authored-by: Austin Macdonald <austin@redhat.com> * Update changelog/fragments/bump-operator-frameworkapi.yaml Co-authored-by: Austin Macdonald <austin@redhat.com> Co-authored-by: Austin Macdonald <austin@redhat.com>

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

This order seems easier to understand at least to a non-native-speaker. Signed-off-by: Marcin Owsiany <porridge@redhat.com>

…r (#5414) Signed-off-by: Camila Macedo <cmacedo@redhat.com>

…(#5407) * feat: add the deprecated APIs optional checker, , to the suite operatorframework Signed-off-by: Camila Macedo <cmacedo@redhat.com> * Update changelog/fragments/suite.yaml Co-authored-by: Varsha <varshaprasad96@gmail.com> Co-authored-by: Varsha <varshaprasad96@gmail.com>

* doc: add best practices for multi-tenancy solutions Signed-off-by: Camila Macedo <cmacedo@redhat.com> Co-authored-by: Jesus Rodriguez <jmrodri@gmail.com> Co-authored-by: Alexander Greene <agreene@redhat.com> Co-authored-by: Frederic Giloux <fgiloux@redhat.com> Co-authored-by: Daniel Messer <dmesser@redhat.com> Co-authored-by: Ben Parees <bparees@users.noreply.github.com>

* add new good practices validator * fin nit typo issue in the fragment

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

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

* Upgrade OPM version used Signed-off-by: Thierry Wasylczenko <thierry.wasylczenko@gmail.com> * Upgrade OPM version to v1.18 and update 00-template.yaml Signed-off-by: Thierry Wasylczenko <thierry.wasylczenko@gmail.com> * Use correct OPM version with 3 parts Signed-off-by: Thierry Wasylczenko <thierry.wasylczenko@gmail.com> * Dedicated fragment for release notes Signed-off-by: Thierry Wasylczenko <thierry.wasylczenko@gmail.com> * [upgrade-opm-version] Using OPM 1.19.1 Signed-off-by: Thierry Wasylczenko <thierry.wasylczenko@gmail.com>

* Ignore CVEs 2021-3533 and 2021-3532 in base image The following CVEs are causing `pipenv check` step of image build to fail: https://nvd.nist.gov/vuln/detail/CVE-2021-3533 https://nvd.nist.gov/vuln/detail/CVE-2021-3532 Both of these CVEs are against Ansible 2.9. The Ansible team is aware of them, but they require deliberately insecure configuration from the user and the Ansible team considers them invalid CVEs. There are no plans for these to be fixed in the 2.9.z stream and will not cause a security problem with Ansible-based operators. Signed-off-by: austin <austin@redhat.com> * Rerun sanity tests in 2022 Signed-off-by: austin <austin@redhat.com>

* feat: add resource limits for ansible Signed-off-by: Camila Macedo <cmacedo@redhat.com> * nit suggestion abut changelog info

…work/ansible-operator-base:master-69ba8b0e9b375529ab47788bd0dbe4e3524ddc12 (#5467) * [master] image(ansible-operator): bump base to quay.io/operator-framework/ansible-operator-base:master-69ba8b0e9b375529ab47788bd0dbe4e3524ddc12 Signed-off-by: asmacdo <asmacdo@users.noreply.github.com> * [master] image(ansible-operator-2.11-preview): bump base to quay.io/operator-framework/ansible-operator-2.11-preview-base:master-69ba8b0e9b375529ab47788bd0dbe4e3524ddc12 (#5468) Signed-off-by: asmacdo <asmacdo@users.noreply.github.com> Co-authored-by: asmacdo <asmacdo@users.noreply.github.com> Co-authored-by: asmacdo <asmacdo@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

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

Signed-off-by: Ryan King <ryking@redhat.com>

Operator SDK v1.16.0 Merge executed via ./UPSTREAM-MERGE.sh v1.16.0 upstream master Overwritten conflicts: <NONE>

Signed-off-by: Fabian von Feilitzsch <fabian@fabianism.us>

… kubebuilder

jmrodri

ack

jmrodri · 2022-01-25T20:22:39Z

Makefile

@@ -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
 # version is moved to a separate repo and release process.
-export IMAGE_VERSION = v1.15.0
+export IMAGE_VERSION = v1.16.0


jmrodri · 2022-01-25T20:23:27Z

patches/03-setversion.patch

@@ -7,7 +7,7 @@ diff -up ./Makefile.setversion ./Makefile
 # Build-time variables to inject into binaries
 -export SIMPLE_VERSION = $(shell (test "$(shell git describe)" = "$(shell git describe --abbrev=0)" && echo $(shell git describe)) || echo $(shell git describe --abbrev=0)+git)
 -export GIT_VERSION = $(shell git describe --dirty --tags --always)
-+export SIMPLE_VERSION = v1.15.0-ocp
+export SIMPLE_VERSION = v1.16.0-ocp


jmrodri · 2022-01-25T20:23:38Z

patches/16-bug2041679-report-proper-k8s.patch

+ export GIT_VERSION = $(SIMPLE_VERSION)
+ export GIT_COMMIT = $(shell git rev-parse HEAD)
+-export K8S_VERSION = 1.21
+export K8S_VERSION = 1.22


openshift-ci · 2022-01-25T20:57:27Z

@fabianvf: This pull request references Bugzilla bug 2045878, which is valid.

3 validation(s) were run on this bug

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

Bug 2045878: v1.16.0 rebase master

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.

fabianvf · 2022-01-25T20:59:50Z

/retest

fabianvf · 2022-01-25T21:34:36Z

/retest

fabianvf · 2022-01-26T00:02:48Z

/retest

openshift-ci · 2022-01-26T00:55:57Z

@fabianvf: 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.

jmrodri

/lgtm

openshift-ci · 2022-01-26T18:10:09Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabianvf, 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~~ [fabianvf,jmrodri]

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

openshift-ci · 2022-01-26T18:10:22Z

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

openshift/ocp-release-operator-sdk#203

Bugzilla bug 2045878 has been moved to the MODIFIED state.

In response to this:

Bug 2045878: v1.16.0 rebase master

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.

camilamacedo86 and others added 21 commits November 18, 2021 17:31

bump kb with the latest changes/fixes (#5330)

67ac820

* bump kb with the latest changes/fixes - v3.2.0

Fix bug: 2.11 images should not use 2.9 pipfile (#5417)

b26427b

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

Reorder sentence (#5408)

d56d3d7

This order seems easier to understand at least to a non-native-speaker. Signed-off-by: Marcin Owsiany <porridge@redhat.com>

deprecation:Optional(stage: alpha) Community Operator bundle validato…

eca076d

…r (#5414) Signed-off-by: Camila Macedo <cmacedo@redhat.com>

add new good practices validator (#5448)

1d009d6

fix nit typo issue in the fragment (#5449)

570f67a

* add new good practices validator * fin nit typo issue in the fragment

fix nit layout and broken link (#5450)

620f780

Remove inactive maintainer (#5380)

849abfa

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

Update k8s docs link to 1.21 (#5458)

90dd941

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

change scorecard classname (#5456)

189bbf9

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

feat: add resource limits for ansible (#5274)

e62537c

* feat: add resource limits for ansible Signed-off-by: Camila Macedo <cmacedo@redhat.com> * nit suggestion abut changelog info

bump: bump operator-sdk.util to 0.3.1 (#5462)

1b499a6

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

bump of/api (#5484)

2b32ee3

docs: fix example repo link in custom test (#5489)

039173e

Signed-off-by: Ryan King <ryking@redhat.com>

Release v1.16.0 (#5490)

5600441

Signed-off-by: Ryan King <ryking@redhat.com>

openshift-ci bot requested review from asmacdo and joelanford January 25, 2022 18:48

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2022

jmrodri and others added 6 commits January 25, 2022 14:13

Merge upstream tag v1.16.0

47ef765

Operator SDK v1.16.0 Merge executed via ./UPSTREAM-MERGE.sh v1.16.0 upstream master Overwritten conflicts: <NONE>

Remove obsolete patches

dc88e7e

bump SDK version

c3c5be8

Bug 2041679: report the correct K8S version

02c91d2

Add hybrid-helm patch

f1df262

Signed-off-by: Fabian von Feilitzsch <fabian@fabianism.us>

Bump vendor

9bf710d

fabianvf force-pushed the v1.16.0-rebase-master branch from b85e415 to 9bf710d Compare January 25, 2022 20:19

jmrodri mentioned this pull request Jan 25, 2022

Bug 2041679: report the correct K8S version #202

Closed

2 tasks

Update helm-operator-plugins dependency to be compatible with current…

754c7c0

… kubebuilder

jmrodri reviewed Jan 25, 2022

View reviewed changes

fabianvf changed the title ~~V1.16.0 rebase master~~ Bug 2045878: v1.16.0 rebase master Jan 25, 2022

openshift-ci bot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent 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. labels Jan 25, 2022

Apply patches before running any tests

8dad7ac

jmrodri approved these changes Jan 26, 2022

View reviewed changes

openshift-ci bot assigned jmrodri Jan 26, 2022

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

openshift-merge-robot merged commit aaed29e into openshift:master Jan 26, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 2045878: v1.16.0 rebase master #203

Bug 2045878: v1.16.0 rebase master #203

fabianvf commented Jan 25, 2022

jmrodri left a comment

jmrodri Jan 25, 2022

jmrodri Jan 25, 2022

jmrodri Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

fabianvf commented Jan 25, 2022

fabianvf commented Jan 25, 2022

fabianvf commented Jan 26, 2022

openshift-ci bot commented Jan 26, 2022

jmrodri left a comment

openshift-ci bot commented Jan 26, 2022

openshift-ci bot commented Jan 26, 2022

Bug 2045878: v1.16.0 rebase master #203

Bug 2045878: v1.16.0 rebase master #203

Conversation

fabianvf commented Jan 25, 2022

jmrodri left a comment

Choose a reason for hiding this comment

jmrodri Jan 25, 2022

Choose a reason for hiding this comment

jmrodri Jan 25, 2022

Choose a reason for hiding this comment

jmrodri Jan 25, 2022

Choose a reason for hiding this comment

openshift-ci bot commented Jan 25, 2022

fabianvf commented Jan 25, 2022

fabianvf commented Jan 25, 2022

fabianvf commented Jan 26, 2022

openshift-ci bot commented Jan 26, 2022

jmrodri left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Jan 26, 2022

openshift-ci bot commented Jan 26, 2022