Upstream rebase #23

dtfranz · 2023-06-06T17:52:57Z

Pulling in all missing commits from the upstream repo.

openshift-ci · 2023-06-06T17:53:04Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

dtfranz · 2023-06-06T17:56:26Z

/test all

dtfranz · 2023-06-06T18:01:04Z

/retest

We currently have a large amount of copy/pasted code in our various in-tree provisioners. We have three bundle provisioners: plain, registry, and helm. And we have two BD provisioners: plain and helm. A very large majority of the code in each of these provisioners is identical, and the only differences are in: - how the bundle content is validated and converted before storing - how the bundle content is validated and rendered into a helm chart before being applied to the cluster. This PR introduces a few interfaces to capture these implementation-specific differences along with generic bundle and BD reconcilers that use these interfaces such that the copy/pasted code is now shared and DRY-ed up.

Signed-off-by: akihikokuroda <akuroda@us.ibm.com>

Signed-off-by: Tony Jin <kavinjsir@gmail.com>

Explicitly specify localhost for some containers, otherwise docker.io ends up being used as the default repository.

This required going to k8s 1.26 APIs, and subsequent changes. Fix various lint errors due to that update.

Undo go-git update

Problem: The Kubernetes project is moving its images from the k8s.gcr.io registry to the registry.k8s.io registry and our project relies on one of the images being moved. More information can be found here: kubernetes/k8s.io#4780 Solution: Update the referenced image to point to the same image hosted at the new registry. Signed-off-by: Alexander Greene <greene.al1991@gmail.com>

Adds debug make target to rukpak. The debug target is essentially the same as the run target except that, once finished, it exposes a local port to allow for remote debugging in the rukpak core container. Signed-off-by: dtfranz <dfranz@redhat.com>

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

- new name is "configmaps" - updated unpacker to use a separate client/cache which is capable of watching all objects in the rukpak system namespace - added a webhook for bundles and configmaps to ensure expected invariants around bundle immutability are met.

…licate path detection Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Updates our github actions to bring the in-line with operator-controller and silence deprecation warnings. Signed-off-by: dtfranz <dfranz@redhat.com>

…rated manifests Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

The link to plain bundle spec was incorrect in plain provisioner documentation.

dtfranz · 2023-06-06T22:11:56Z

/test all

dtfranz · 2023-06-06T22:19:02Z

/test all

dtfranz · 2023-06-06T22:34:42Z

/test all

dtfranz · 2023-06-06T22:50:42Z

/test verify

dtfranz · 2023-06-29T17:28:16Z

/hold
Until we can test alongside the other OLM v1 PRs.

Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>

ncdc · 2023-07-03T15:08:38Z

/approve

openshift-ci · 2023-07-03T15:08:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtfranz, ncdc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~DOWNSTREAM_OWNERS~~ [ncdc]

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

ncdc · 2023-07-03T15:15:34Z

/test verify

kuiwang02 · 2023-07-04T06:18:41Z

@dtfranz @ncdc Hi, with the PR is merged, it just means the code is aligned with upstream, and does not mean the rukpak is in OCP load. Is it right? if it is right, we should other PR to let it in OCP load, so, could you please share me that PR?
thanks

by the way,
OLMv1 has rukpak, catalogd and operator-controller components. when they go into OCP load, I guess there are two kinds:
1, each component goes into OCP load separately. it means, for example, rukpak's manifest go into OCP load firstly, and we can install cluster with enabling TP, and then we can use rukpak directly even operator-controller does not go into OCP load.

2, three components go into OCP together (maybe one PR including all manifests of these three components).

which kind is used to add them into OCP load? thanks.

ncdc · 2023-07-05T13:17:43Z

Hi, with the PR is merged, it just means the code is aligned with upstream, and does not mean the rukpak is in OCP load. Is it right?

It would be in CI and nightly builds.

which kind is used to add them into OCP load?

We are adding a new second level operator called cluster-olm-operator that manages the lifecycle of rukpak, catalogd, and operator-controller. They are installed as a group, and you can't pick which ones you want.

ncdc · 2023-07-05T14:51:55Z

/test verify

grokspawn · 2023-07-05T15:14:21Z

/lgtm

ncdc · 2023-07-05T15:26:18Z

/hold

kuiwang02 · 2023-07-06T01:00:07Z

Hi, with the PR is merged, it just means the code is aligned with upstream, and does not mean the rukpak is in OCP load. Is it right?

It would be in CI and nightly builds.

which kind is used to add them into OCP load?

We are adding a new second level operator called cluster-olm-operator that manages the lifecycle of rukpak, catalogd, and operator-controller. They are installed as a group, and you can't pick which ones you want.

@ncdc thanks.
so, if we want to install 4.14 cluster and enable TP to use olmv1, we need to use the OCP load which includes the cluster-olm-operator's manifest. is it correct understanding? thanks

and which repo or PR is handling the cluster-olm-operator? thanks.

by the way, just reminder again, there is existing TP feature platform operator which also has rukpak, so please try to avoid conflicts when adding cluster-olm-operator because it also include rukpak. thanks

ncdc · 2023-07-06T13:10:19Z

so, if we want to install 4.14 cluster and enable TP to use olmv1, we need to use the OCP load which includes the cluster-olm-operator's manifest. is it correct understanding? thanks

Yes

and which repo or PR is handling the cluster-olm-operator? thanks.

openshift/cluster-olm-operator#18 adds rukpak to cluster-olm-operator and adds cluster-olm-operator to the OCP release payload

by the way, just reminder again, there is existing TP feature platform operator which also has rukpak, so please try to avoid conflicts when adding cluster-olm-operator because it also include rukpak. thanks

openshift/platform-operators#86 removes rukpak from platform-operators

…pace takes precedence if set Signed-off-by: Joe Lanford <joe.lanford@gmail.com> (cherry picked from commit 43ab9fe) Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>

openshift-ci · 2023-07-06T15:41:25Z

@dtfranz: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

ncdc · 2023-07-06T17:28:04Z

/unhold
/lgtm

kuiwang02 · 2023-07-07T00:22:35Z

openshift/platform-operators#86

thanks a lot!

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 6, 2023

joelanford and others added 19 commits June 6, 2023 11:18

add resources to watch list

a9f3909

Signed-off-by: akihikokuroda <akuroda@us.ibm.com>

local git repository for e2e test

df9aae6

Signed-off-by: akihikokuroda <akuroda@us.ibm.com>

relocate test tools

5075f0c

Signed-off-by: akihikokuroda <akuroda@us.ibm.com>

set bundle deployment controller name correctly

22d1c46

style: introduce gosec linter

42e7382

Signed-off-by: Tony Jin <kavinjsir@gmail.com>

Fix e2e: Force localhost for some containers

bcae4aa

Explicitly specify localhost for some containers, otherwise docker.io ends up being used as the default repository.

Bump helm to v3.11.1 to address CVE-2023-25165

04ffa9b

This required going to k8s 1.26 APIs, and subsequent changes. Fix various lint errors due to that update.

squash! Bump helm to v3.11.1 to address CVE-2023-25165

5f2c6d5

Undo go-git update

Remote debug make target

3d528fe

Adds debug make target to rukpak. The debug target is essentially the same as the run target except that, once finished, it exposes a local port to allow for remote debugging in the rukpak core container. Signed-off-by: dtfranz <dfranz@redhat.com>

use multi-arch alpine image for git test server

39b6786

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

moved more configmaps source validation to webhooks, fixed bug in dup…

9293130

…licate path detection Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Rukpak Actions Updates

83e7c17

Updates our github actions to bring the in-line with operator-controller and silence deprecation warnings. Signed-off-by: dtfranz <dfranz@redhat.com>

bump to controller-gen v0.11.4 to remove creation timestamp from gene…

91d7612

…rated manifests Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

version: use go1.18+ embedded build info

b87a2a6

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

use map to map modified boolean to dirty/clean, fix license header

e519417

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Fix a link to plain bundle spec.

abf668c

The link to plain bundle spec was incorrect in plain provisioner documentation.

dtfranz force-pushed the upstream-rebase branch from 7ab0f99 to abf668c Compare June 6, 2023 21:51

dtfranz force-pushed the upstream-rebase branch from 719cb0c to 15bd1fc Compare June 6, 2023 22:50

dtfranz force-pushed the upstream-rebase branch from 15bd1fc to a1254d8 Compare June 6, 2023 23:05

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 29, 2023

dtfranz changed the title ~~Upstream rebase~~ WIP: Upstream rebase Jun 29, 2023

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 29, 2023

ncdc mentioned this pull request Jun 30, 2023

Updating ose-olm-rukpak images to be consistent with ART #22

Closed

UPSTREAM: <carry>: use go1.20 to build

a16de78

Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 3, 2023

ncdc changed the title ~~WIP: Upstream rebase~~ Upstream rebase Jul 5, 2023

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 5, 2023

openshift-ci bot assigned grokspawn Jul 5, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 5, 2023

UPSTREAM: 650: detect in-cluster namespace by default, --system-names…

4b1a5d6

…pace takes precedence if set Signed-off-by: Joe Lanford <joe.lanford@gmail.com> (cherry picked from commit 43ab9fe) Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 6, 2023

openshift-ci bot assigned ncdc Jul 6, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2023

openshift-merge-robot merged commit ef1e907 into openshift:main Jul 6, 2023

Upstream rebase #23

Upstream rebase #23

Uh oh!

Conversation

dtfranz commented Jun 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jun 6, 2023

Uh oh!

dtfranz commented Jun 6, 2023

Uh oh!

dtfranz commented Jun 6, 2023

Uh oh!

dtfranz commented Jun 6, 2023

Uh oh!

dtfranz commented Jun 6, 2023

Uh oh!

dtfranz commented Jun 6, 2023

Uh oh!

dtfranz commented Jun 6, 2023

Uh oh!

dtfranz commented Jun 29, 2023

Uh oh!

ncdc commented Jul 3, 2023

Uh oh!

openshift-ci bot commented Jul 3, 2023

Uh oh!

ncdc commented Jul 3, 2023

Uh oh!

kuiwang02 commented Jul 4, 2023

Uh oh!

ncdc commented Jul 5, 2023

Uh oh!

ncdc commented Jul 5, 2023

Uh oh!

grokspawn commented Jul 5, 2023

Uh oh!

ncdc commented Jul 5, 2023

Uh oh!

kuiwang02 commented Jul 6, 2023

Uh oh!

ncdc commented Jul 6, 2023

Uh oh!

openshift-ci bot commented Jul 6, 2023

Uh oh!

ncdc commented Jul 6, 2023

Uh oh!

kuiwang02 commented Jul 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

dtfranz commented Jun 6, 2023 •

edited

Loading