Skip to content

Add rukpak #18

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 14 commits into from
Jul 6, 2023
Merged

Add rukpak #18

openshift-merge-robot merged 14 commits into from
Jul 6, 2023

Conversation

@dtfranz
Copy link
Contributor

@dtfranz dtfranz commented Jun 29, 2023

Adds rukpak static and deployment controllers, as well as the manifests.

Co-authored by: @ncdc @joelanford

joelanford and others added 2 commits June 29, 2023 14:21
@joelanford @dtfranz
add rukpak
00f5c0b 
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
@dtfranz
Update manifests with latest from operator-framework-rukpak repo
01596c8 
Signed-off-by: dtfranz <dfranz@redhat.com>
@openshift-ci 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
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 29, 2023

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 @ncdc
Add RUKPAK_IMAGE for replacement in manifests
fbc3dab 
Co-authored-by: Andy Goldstein <andy.goldstein@redhat.com>
Signed-off-by: dtfranz <dfranz@redhat.com>
joelanford
joelanford reviewed Jun 29, 2023
View reviewed changes
manifests/0000_51_olm_06_deployment.yaml
- name: OPERATOR_CONTROLLER_IMAGE
value: quay.io/openshift/origin-olm-operator-controller:latest
- name: RUKPAK_IMAGE
value: quay.io/openshift/origin-olm-rukpak:latest
Copy link
Member

@joelanford joelanford Jun 29, 2023

Choose a reason for hiding this comment

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

We also need to add an image reference for this image in this file: https://github.com/openshift/cluster-olm-operator/blob/main/manifests/image-references.pending

Copy link
Contributor

@ncdc ncdc Jun 30, 2023

Choose a reason for hiding this comment

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

I have that in my PR #16. We can discuss the order and split up

@joelanford
Copy link
Member

joelanford commented Jun 29, 2023

We also need to add the names of all clusterroles and roles that are in the rukpak manifests to this list:

cluster-olm-operator/manifests/0000_51_olm_02_operator_clusterrole.yaml

Lines 161 to 169 in dfc350a

resourceNames:
- catalogd-manager-role
- catalogd-metrics-reader
- catalogd-proxy-role
- catalogd-leader-election-role
- operator-controller-manager-role
- operator-controller-metrics-reader
- operator-controller-proxy-role
- operator-controller-leader-election-role

joelanford
joelanford reviewed Jun 30, 2023
View reviewed changes
manifests/0000_51_olm_02_operator_clusterrole.yaml
Comment on lines +170 to +173
- bundle-reader
- bundle-uploader
- core-admin
- helm-provisioner-admin
Copy link
Member

@joelanford joelanford Jun 30, 2023

Choose a reason for hiding this comment

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

Fine for now, but in upstream, we should make sure these (and all rukpak install objects) are all prefixed with rukpak- IMO.

dtfranz and others added 3 commits June 30, 2023 13:20
@dtfranz
Add rbac for validatingwebhooks to operator clusterrole
a401f6f 
Signed-off-by: dtfranz <dfranz@redhat.com>
@ncdc
Include in payload for CVO
5864e4a 
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@ncdc
Copy manifests into image
c367105 
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
This was referenced Jul 3, 2023
Closed
Closed
ncdc added 5 commits July 3, 2023 14:40
@ncdc
Bump openshift/api
43307ad 
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@ncdc
Copy olms CRD into image
2d35de3 
Copy the olms CRD from openshift/api into the image so the
ClusterVersionOperator will install it. Otherwise, installation will
fail because it won't be able to apply the singleton olms instance.

Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@ncdc
Tolerate node-role.kubernetes.io/master:NoSchedule
62b5a92 
We previously only had a toleration for
node-role.kubernetes.io/control-plane, but at least in test 4.14 builds
on AWS, we're seeing a taint for node-role.kubernetes.io/master.

Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@ncdc
More deployment manifest tweaking
ac6958c 
Remove toleration on node-role.kubernetes.io/control-plane.

Change node selector to node-role.kubernetes.io/master to match what is
currently used in 4.14.

Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@ncdc
Switch back to upstream openshift/client-go
0340271 
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@ncdc ncdc marked this pull request as ready for review July 5, 2023 18:05
@openshift-ci 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 openshift-ci bot requested review from grokspawn and joelanford July 5, 2023 18:12
@ncdc ncdc mentioned this pull request Jul 6, 2023
Merged
ncdc added 2 commits July 6, 2023 10:41
@ncdc
Update catalogd manifests
bbd6508 
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@ncdc
Update operator-controller assets
23d0b41 
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 6, 2023

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

@joelanford
Copy link
Member

joelanford commented Jul 6, 2023

/approve
/lgtm

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

openshift-ci bot commented Jul 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 6, 2023
@openshift-merge-robot openshift-merge-robot merged commit 630af19 into openshift:main Jul 6, 2023
@ncdc ncdc mentioned this pull request Jul 7, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@grokspawn grokspawn Awaiting requested review from grokspawn

@joelanford joelanford Awaiting requested review from joelanford

1 more reviewer

@ncdc ncdc ncdc left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@joelanford joelanford

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dtfranz @joelanford @ncdc @openshift-merge-robot