-
Notifications
You must be signed in to change notification settings - Fork 303
🐛Remove the CEL validation on VSphereMachineTemplate.spec.network #3621
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
Merged
k8s-ci-robot
merged 2 commits into
kubernetes-sigs:main
from
DanielXiao:fix-cel-dryrun-error
Sep 1, 2025
+277
−27
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| Copyright 2024 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // Package util contains utils to compare objects. | ||
| package util | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/google/go-cmp/cmp" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // Diff uses cmp.Diff to compare x and y. | ||
| // If cmp.Diff panics, Equal returns an error. | ||
| func Diff(x any, y any) (equal bool, diff string, matchErr error) { | ||
| defer func() { | ||
| if r := recover(); r != nil { | ||
| equal = false | ||
| if err, ok := r.(error); ok { | ||
| matchErr = errors.Wrapf(err, "error diffing objects") | ||
| return | ||
| } | ||
|
|
||
| if errMsg, ok := r.(string); ok { | ||
| matchErr = errors.Errorf("error diffing objects: %s", errMsg) | ||
| return | ||
| } | ||
|
|
||
| matchErr = errors.Errorf("error diffing objects: panic of unknown type %T", r) | ||
| } | ||
| }() | ||
|
|
||
| diff = cmp.Diff(x, y) | ||
|
|
||
| if diff != "" { | ||
| // Replace non-breaking space (NBSP) through a regular space. | ||
| // This prevents output like this: "\u00a0\u00a0int(\n-\u00a0\t1,\n+\u00a0\t2,\n\u00a0\u00a0)\n" | ||
| diff = strings.ReplaceAll(diff, "\u00a0", " ") | ||
| // Replace \t through " " because it's easier to read in log output | ||
| diff = strings.ReplaceAll(diff, "\t", " ") | ||
| diff = strings.TrimSpace(diff) | ||
| } | ||
|
|
||
| return diff == "", diff, nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| Copyright 2024 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
| clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2" | ||
| ) | ||
|
|
||
| func TestDiff(t *testing.T) { | ||
| type test struct { | ||
| name string | ||
| x, y interface{} | ||
| wantEqual bool | ||
| wantDiff string | ||
| wantError string | ||
| } | ||
|
|
||
| tests := []test{ | ||
| { | ||
| name: "Equal integers, no diff", | ||
| x: 1, | ||
| y: 1, | ||
| wantEqual: true, | ||
| }, | ||
| { | ||
| name: "Different integers, diff", | ||
| x: 1, | ||
| y: 2, | ||
| wantEqual: false, | ||
| wantDiff: `int( | ||
| - 1, | ||
| + 2, | ||
| )`, | ||
| }, | ||
| { | ||
| name: "Different labels, diff", | ||
| x: map[string]string{ | ||
| clusterv1.ClusterNameLabel: "cluster-1", | ||
| clusterv1.ClusterTopologyOwnedLabel: "", | ||
| }, | ||
| y: map[string]string{ | ||
| clusterv1.ClusterNameLabel: "cluster-2", | ||
| }, | ||
| wantEqual: false, | ||
| wantDiff: `map[string]string{ | ||
| - "cluster.x-k8s.io/cluster-name": "cluster-1", | ||
| + "cluster.x-k8s.io/cluster-name": "cluster-2", | ||
| - "topology.cluster.x-k8s.io/owned": "", | ||
| }`, | ||
| }, | ||
| { | ||
| name: "Diff unexported fields, error", | ||
| x: struct{ a, b, c int }{1, 2, 3}, | ||
| y: struct{ a, b, c int }{1, 2, 4}, | ||
| wantError: `error diffing objects: cannot handle unexported field at root.a: | ||
| "sigs.k8s.io/cluster-api-provider-vsphere/pkg/util".(struct { a int; b int; c int }) | ||
| consider using a custom Comparer; if you control the implementation of type, you can also consider using an Exporter, AllowUnexported, or cmpopts.IgnoreUnexported`, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| gotEqual, gotDiff, err := Diff(tt.x, tt.y) | ||
|
|
||
| if tt.wantError != "" { | ||
| g.Expect(err.Error()).To(BeComparableTo(tt.wantError)) | ||
| } else { | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
|
|
||
| g.Expect(gotEqual).To(Equal(tt.wantEqual)) | ||
| g.Expect(gotDiff).To(BeComparableTo(tt.wantDiff)) | ||
| } | ||
| }) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.