Skip to content

Migrate console extensions CRDs from console-operator#95

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
benjaminapetersen:console/extensions
Oct 2, 2019
Merged

Migrate console extensions CRDs from console-operator#95
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
benjaminapetersen:console/extensions

Conversation

@benjaminapetersen
Copy link
Copy Markdown
Contributor

@benjaminapetersen benjaminapetersen commented Sep 30, 2019

See openshift/console-operator#302 for associated removal PR. These files have existed in the console-operator, but should live here.

This is not a 1:1, however, due to update-codegen-crds modifying the files.

@spadgett @rhamilto @jhadvig fyi.

The codegen command overwrites these files based on what is in openshift/api, so what we previously had documented may no longer be here (if it was also not in openshift/api)

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 30, 2019
Copy link
Copy Markdown
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

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

Was speaking to @mfojtik regarding this migration and was told that these CRDs probably should stay in the console-operator repo, since cluster-config-operator should contain CRDs that are installed during the bootstrap/installation

cc'ing @mfojtik

@sttts
Copy link
Copy Markdown
Contributor

sttts commented Oct 1, 2019

Was speaking to @mfojtik regarding this migration and was told that these CRDs probably should stay in the console-operator repo, since cluster-config-operator should contain CRDs that are installed during the bootstrap/installation

Bootstrapping and installation is not the point here. All resources which are needed by other operators (especially those which come first in the installation order), must go to this repo. I understood that this is the case for the console types: kube-apiserver operator might want to install an extension for the console. It can only do that if the CRD is already installed in the system.

@mfojtik
Copy link
Copy Markdown
Contributor

mfojtik commented Oct 1, 2019

Agree with @sttts. I thought these are just console specific CRD's to support extensions.

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 1, 2019
@sttts
Copy link
Copy Markdown
Contributor

sttts commented Oct 1, 2019

Needs a rebase and CRD regeneration (we moved to 1.16).

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

10 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 1, 2019
Comment thread manifests/0000_10_config-operator_01_consoleclidownload.crd.yaml
Comment thread manifests/0000_10_config-operator_01_consolelink.crd.yaml
Comment thread manifests/0000_10_config-operator_01_consolenotification.crd.yaml
@benjaminapetersen
Copy link
Copy Markdown
Contributor Author

benjaminapetersen commented Oct 1, 2019

Rebased & regeneration checks out. Should be good to go.
@sttts

@benjaminapetersen
Copy link
Copy Markdown
Contributor Author

Bump for approval again, then I can move along the removal from console-operator here.

@benjaminapetersen
Copy link
Copy Markdown
Contributor Author

Ah, I see another rebase needed, fixing quick.

HTML
properties:
href:
description: href is the absolute secure URL for the link (must
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you can use pattern: "<regex>" to restrict the value.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This I need to fix as it has been part of the historical API. We have been using:

pattern: '^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$'

Just need to figure out how to get this in openshift/api to generate.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok this should be resolved via https://github.com/openshift/api/pull/457/files#r331225859 on our next regeneration.

description: description is the description of the CLI download (can
include markdown).
type: string
displayName:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can this be empty?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It's a required field, so it should not be empty.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Are we allowed to change this now? API has been in for a release already.

description: href is the absolute secure URL for the link (must
use https)
type: string
text:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can this be empty?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Perhaps we assumed required would validate that it is not empty. I'm guessing present but empty is allowed without regex, given your questions. We should update.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Are we allowed to change this now? API has been in for a release already.

RegExp constructor. If not specified, links will be displayed for
all the namespaces.
type: string
text:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can this be empty?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Same, don't know if we can change it at this point.

description: ConsoleExternalLogLinkSpec is the desired log link configuration.
The log link will appear on the logs tab of the pod details page.
properties:
hrefTemplate:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

use pattern to restrict it to https

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 2, 2019
@@ -0,0 +1,87 @@
apiVersion: apiextensions.k8s.io/v1beta1
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Rebase, and I have to say I like the output of this much better. It's limited to the fields that specifically matter to the custom resource.

@sttts
Copy link
Copy Markdown
Contributor

sttts commented Oct 2, 2019

Validation as follow-up.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 2, 2019
@openshift-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminapetersen, mfojtik, sttts

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-merge-robot openshift-merge-robot merged commit 9fffc56 into openshift:master Oct 2, 2019
@benjaminapetersen benjaminapetersen deleted the console/extensions branch October 2, 2019 17:57
@spadgett
Copy link
Copy Markdown
Member

spadgett commented Oct 2, 2019

Looks like we had a mismatch between openshift/api and what was in the CRD:

https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_console/2822/pull-ci-openshift-console-master-e2e-aws-console/9623/artifacts/e2e-aws-console/gui_test_screenshots/9f3d29397d207d3c8bddfb64ad2c5ecd.png

Link text is now required, when it wasn't before. (Breaking the console merge queue)

@spadgett
Copy link
Copy Markdown
Member

spadgett commented Oct 2, 2019

Console queue fixed by openshift/console#2888

@deads2k
Copy link
Copy Markdown
Contributor

deads2k commented Oct 16, 2019

See openshift/console-operator#302 for associated removal PR. These files have existed in the console-operator, but should live here.

This is not a 1:1, however, due to update-codegen-crds modifying the files.

@spadgett @rhamilto @jhadvig fyi.

The codegen command overwrites these files based on what is in openshift/api, so what we previously had documented may no longer be here (if it was also not in openshift/api)

This should not have landed in this repo. This is not about cross dependencies, this is about bootstrapping a cluster. This is not a dumping ground for, "hey something else might/does use this".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants