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.

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

🐛 ClusterClass: drop support for nullable #5780

Merged
merged 1 commit into from
Dec 2, 2021
Merged

🐛 ClusterClass: drop support for nullable #5780

merged 1 commit into from
Dec 2, 2021

Conversation

sbueringer
Copy link
Member

Signed-off-by: Stefan Büringer buringerst@vmware.com

What this PR does / why we need it:
More context on the issue.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5776

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 2, 2021
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 2, 2021
sbueringer
sbueringer commented Dec 2, 2021
View reviewed changes
internal/topology/variables/cluster_variable_defaulting.go
@@ -83,9 +83,6 @@ func defaultClusterVariable(clusterVariable *clusterv1.ClusterVariable, clusterC

var value interface{}
// If the schema has a default value, default it.
// NOTE: This is essentially the same which the structural schema defaulting
// lib would do, except that it wouldn't default nullable values.
// As we want to also default nullable variables we have to do it ourselves.
if apiExtensionsSchema.Default != nil {
Copy link
Member Author

Choose a reason for hiding this comment

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

Let's keep the simple defaulting for this PR. The new full implementation is part of: #5779 (including object/array support)

sbueringer
sbueringer commented Dec 2, 2021
View reviewed changes
internal/topology/variables/clusterclass_variable_validation.go
@@ -132,8 +132,6 @@ func validateSchema(schema *clusterv1.JSONSchemaProps, variableName string, fldP
switch {
case len(apiExtensionsSchema.Type) == 0:
return field.ErrorList{field.Required(fldPath.Child("type"), "openAPIV3Schema.type cannot be empty")}
Copy link
Member Author

Choose a reason for hiding this comment

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

As we don't want to point to nullable anymore, it's good enough if type == "null" is handled by the next case.

@sbueringer
Copy link
Member Author

Diff is fine, Nullable was never released.

@sbueringer sbueringer mentioned this pull request Dec 2, 2021
Merged
@sbueringer
ClusterClass: drop support for nullable
a84739a 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
Copy link
Member Author

/retest

flaky unrelated test

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Dec 2, 2021 •
edited

@sbueringer: 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
pull-cluster-api-apidiff-main a84739a link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

vincepri
vincepri approved these changes Dec 2, 2021
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 2, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2021
@k8s-ci-robot k8s-ci-robot merged commit 62b41b2 into kubernetes-sigs:main Dec 2, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Dec 2, 2021
@sbueringer sbueringer deleted the pr-drop-support-for-nullable branch December 3, 2021 07:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vincepri vincepri vincepri approved these changes

@enxebre enxebre Awaiting requested review from enxebre

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@vincepri vincepri

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", 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
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.

ClusterClass patches/variables: JSON null value does not work as expected with kubectl client-side apply
3 participants
@sbueringer @k8s-ci-robot @vincepri