Skip to content

*: Update the POC implementation and vendor the PlatformOperators CRD #26

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 12 commits into from
Sep 1, 2022
Merged

*: Update the POC implementation and vendor the PlatformOperators CRD #26

openshift-merge-robot merged 12 commits into from
Sep 1, 2022

Conversation

@timflannagan
Copy link
Contributor

@timflannagan timflannagan commented Aug 31, 2022 •
edited
Loading

This updates the current POC codebase, and attempts to introduce the PlatformOperators CRD from the openshift/api repository now that openshift/api#1234 has merged.

These changes introduce a tools.go file to the repository, which only specifies the github.com/openshfit/api/platform/v1alpha1 package that includes the PlatformOperators CRD. Updates the manifests Makefile target to ensure we're copying that CRD into our root manifests directory.

The root Dockerfile doesn't need any changes here as we already run COPY manifests /manifests so we already get this CRD resource for free. I validated this assumption locally:

bash-4.4$ ls /manifests/
0000_50_cluster-platform-operator-manager_00-namespace.yaml			0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml  0000_50_cluster-platform-operator-manager_03_rbac.yaml
0000_50_cluster-platform-operator-manager_00-platformoperator.crd.yaml		0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml	    0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml
0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml	0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml		    0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml
0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml		0000_50_cluster-platform-operator-manager_02-metricsservice.yaml	    0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml
0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml			0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml	    0000_50_cluster-platform-operator-manager_06-deployment.yaml
0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml		0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml
bash-4.4$

Other misc. changes include updating the controller implementations to ensure it can run properly on cluster. I tried to keep these changes as minimal as possible to avoid stepping on the implementations in #17 and the in-flight CPOM controller implementation. This PR can be a pre-requisite for both of those high-level implementations.

This is also a pre-requisite to #23.

@timflannagan
go.*,vendor: Bump k8s.io dependencies to the v0.25.0 tag
677495d 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
Update the vendor directory to include the PlatformOperators CRD
921c4f0 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
api: Rename platformoperator_types.go -> types.go
7ba64c5 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
api: Remove the PlatformOperator-related structures
17016aa 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
*: Update package imports paths to use the vendored o/api path
41e946a 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
Update golangci-lint configuration for new import paths
73bbd20 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
config,Makefile: Remove the kustomize configuration for the in-tree P…
57e32c7 
…latformOperator API

Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
Makefile,manifests: Copy the PlatformOperator CRD from the vendored o…
a774cad 
…penshift/api dependency

Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
api,controllers: Consolidate the status condition types
0d35719 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
Dockerfile: Fix the manager executable location
deabede 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
internal/applier: Fix the rukpak unique provisioner IDs
af66875 
Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
internal/sourcer: Only support sourcing catalog content from the redh…
372c592 
…at-operators source

Signed-off-by: timflannagan <timflannagan@gmail.com>
@openshift-ci openshift-ci bot requested review from exdx and tylerslaton August 31, 2022 21:42
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan

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 Aug 31, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2022

@timflannagan: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e 372c592 link false /test e2e

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.

@tylerslaton
Copy link
Contributor

tylerslaton commented Sep 1, 2022

/lgtm

@timflannagan
Copy link
Contributor Author

timflannagan commented Sep 1, 2022

Still in the bootstrapping phase leading up to #23. Manually adding the required labels again.

/label px-approved
/label qe-approved
/label docs-approved

@openshift-ci openshift-ci bot added px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR docs-approved Signifies that Docs has signed off on this PR labels Sep 1, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2022
@openshift-merge-robot openshift-merge-robot merged commit 7e70183 into openshift:main Sep 1, 2022
@timflannagan timflannagan deleted the vendor/update-platformoperators-crd branch September 1, 2022 15:17
@timflannagan timflannagan mentioned this pull request Sep 6, 2022
Merged
wking added a commit to wking/platform-operators that referenced this pull request Oct 26, 2023
@wking
config/default/kustomization: Drop WEBHOOK section
575db96 
Catching up with 57e32c7 (config,Makefile: Remove the kustomize
configuration for the in-tree PlatformOperator API, 2022-08-31, openshift#26),
which removedthe referenced file:

  $ git log --stat=300 | grep 'commit \|crd/kustomization.yaml' | grep -B1 crd/kustomization.yaml | head -n2
  commit 57e32c7
   config/crd/kustomization.yaml                                 |  21 ---------------------

or possibly it was 719b41a (Revert "Revert "Merge rukpak updates
into main"", 2023-07-07, openshift#88):

  $ git log --stat=300 | grep 'commit \|webhook' | grep -B1 webhook | head -n2
  commit 719b41a
   config/rukpak/apis/webhooks/kustomization.yml                                             |   27 -

but in any case, I don't see a config/webhook directory or a
manager_webhook_patch.yaml patch that this component could be calling
in.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@exdx exdx Awaiting requested review from exdx

@tylerslaton tylerslaton Awaiting requested review from tylerslaton

Assignees

@tylerslaton tylerslaton

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@timflannagan @tylerslaton @openshift-merge-robot