Skip to content
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.

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

Adds IngressController CRD Validation & Generation #183

Merged
merged 1 commit into from
Apr 1, 2019

Conversation

danehans
Copy link
Contributor

@danehans danehans commented Mar 26, 2019

PR #185 is required before merging.

Previously, IngressController resource fields were not validated. Additionally, the associated CRD was manually managed. This commit adds:

  • OpenAPI v3 schema validation to the IngressController custom resource and partially fixes Bug 1683766.

  • Adds make crd and make verify-crd to generate and verify crd modification respectively.

Note: The schema is based on the currently vendored api definitions (853a7faf74b1c63a56e4010d39057559fa13271f) and not the latest from openshift/api.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 26, 2019
@danehans danehans changed the title Adds IngressController CRD validation Adds IngressController CRD Validation & Generation Mar 27, 2019
format: int32
type: integer
conditions:
description: 'conditions is a list of conditions and their status. Available
Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't see status.conditions when running oc get ingresscontrollers.operator.openshift.io/default -n openshift-ingress-operator -o yaml.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@lihongan status conditions are being implemented in PR #174, which is expected to merge very soon.

Copy link
Contributor

Choose a reason for hiding this comment

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

Get it, thank you @danehans

@danehans
Copy link
Contributor Author

/test e2e-aws

@ironcladlou
Copy link
Contributor

PR #185 is required before merging.

I think @Miciah at least (maybe also @pravisankar) prefers a single PR for the dep updates and the code which uses the new deps — if so, I'm happy to conform to the majority preference (and then #185 could be brought over into this PR). Up to you guys!

configures DNS zones. - False if any of those conditions are unsatisfied. *
DNSReady - True if the following conditions are met: * DNS is
managed. * DNS records have been successfully created. - False
if any of those conditions are unsatisfied.'
Copy link
Contributor

Choose a reason for hiding this comment

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

Are the line breaks really lost in this translation? 🤨

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I noticed the generated formatting of descriptions are a bit skewed from the source spec. We can potentially try to fix this upstream. It seems painful to make changes in the api docs to be more generator friendly or manually manage the diffs.

Makefile Show resolved Hide resolved
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 28, 2019
@danehans
Copy link
Contributor Author

/test unit

@danehans
Copy link
Contributor Author

/test e2e-aws-operator /test e2e-aws

@ironcladlou
Copy link
Contributor

/retest

@ironcladlou
Copy link
Contributor

Let's get this in to get a foundation established.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danehans, ironcladlou

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 1, 2019
@danehans
Copy link
Contributor Author

danehans commented Apr 1, 2019

@ironcladlou I created a branch in my repo and layered another commit on top of this one that adds more granular validation for the endpointPublishingStrategy and domain fields. Based on the feedback during today's standup, I decided to keep them separate. Let me know if you would like it rolled into this PR.

@openshift-merge-robot openshift-merge-robot merged commit 5bb4dd3 into openshift:master Apr 1, 2019
@danehans danehans deleted the bz_1683766 branch July 31, 2020 16:18
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants