Skip to content

Commit 8be2f8c

Browse files
authored
Merge pull request kubernetes#86144 from tahsinrahman/dont-serialize-internal
Do not serialize internal types in ComponentConfig tests
2 parents b32725b + a858158 commit 8be2f8c

File tree

12 files changed

+138
-189
lines changed

12 files changed

+138
-189
lines changed

pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/__internal.yaml

Lines changed: 0 additions & 43 deletions
This file was deleted.

pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml

100755100644
File mode changed.

pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/before/__internal.yaml

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
apiVersion: kubeproxy.config.k8s.io/v1alpha1
2+
kind: KubeProxyConfiguration
File renamed without changes.

pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml

Whitespace-only changes.

pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml.after_roundtrip

Lines changed: 0 additions & 43 deletions
This file was deleted.

pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1Tov1alpha1/empty.yaml

Whitespace-only changes.

staging/src/k8s.io/component-base/config/testing/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ go_library(
1313
visibility = ["//visibility:public"],
1414
deps = [
1515
"//staging/src/k8s.io/apimachinery/pkg/api/apitesting/naming:go_default_library",
16+
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
1617
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
1718
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
1819
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
1920
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
20-
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
2121
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
2222
"//vendor/github.com/google/go-cmp/cmp:go_default_library",
2323
],

staging/src/k8s.io/component-base/config/testing/defaulting.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,31 @@ import (
2727

2828
// DefaultingTest run defaulting tests for given scheme
2929
func DefaultingTest(t *testing.T, scheme *runtime.Scheme, codecs serializer.CodecFactory) {
30-
tc := GetDefaultingTestCases(scheme)
31-
RunTestsOnYAMLData(t, scheme, tc, codecs)
30+
cases := GetDefaultingTestCases(t, scheme, codecs)
31+
RunTestsOnYAMLData(t, cases)
3232
}
3333

3434
// GetDefaultingTestCases returns defaulting testcases for given scheme
35-
func GetDefaultingTestCases(scheme *runtime.Scheme) []TestCase {
35+
func GetDefaultingTestCases(t *testing.T, scheme *runtime.Scheme, codecs serializer.CodecFactory) []TestCase {
3636
cases := []TestCase{}
3737
for gvk := range scheme.AllKnownTypes() {
38+
if gvk.Version == runtime.APIVersionInternal {
39+
continue
40+
}
3841
beforeDir := fmt.Sprintf("testdata/%s/before", gvk.Kind)
3942
afterDir := fmt.Sprintf("testdata/%s/after", gvk.Kind)
4043
filename := fmt.Sprintf("%s.yaml", gvk.Version)
4144

45+
codec, err := getCodecForGV(codecs, gvk.GroupVersion())
46+
if err != nil {
47+
t.Fatal(err)
48+
}
49+
4250
cases = append(cases, TestCase{
4351
name: fmt.Sprintf("default_%s", gvk.Version),
4452
in: filepath.Join(beforeDir, filename),
45-
inGVK: gvk,
4653
out: filepath.Join(afterDir, filename),
47-
outGV: gvk.GroupVersion(),
54+
codec: codec,
4855
})
4956
}
5057
return cases

0 commit comments

Comments
 (0)