Skip to content

Commit 14f2970

Browse files
tengqmtengqm
committed
Fix examples test for v1.31
This PR updates the test case for manifest examples. The test case is there to ensure all example manifests can pass the API validation for v1.31.
1 parent b50478e commit 14f2970

File tree

3 files changed

+230
-242
lines changed

3 files changed

+230
-242
lines changed

‎content/en/examples/examples_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ func getCodecForObject(obj runtime.Object) (runtime.Codec, error) {
156156

157157
func validateObject(obj runtime.Object) (errors field.ErrorList) {
158158
podValidationOptions := validation.PodValidationOptions{
159+
AllowImageVolumeSource: true,
159160
AllowInvalidPodDeletionCost: false,
160161
AllowIndivisibleHugePagesValues: true,
161162
}
@@ -169,8 +170,6 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
169170
AllowInvalidLabelValueInSelector: false,
170171
}
171172

172-
// Enable CustomPodDNS for testing
173-
// feature.DefaultFeatureGate.Set("CustomPodDNS=true")
174173
switch t := obj.(type) {
175174
case *admissionregistration.ValidatingWebhookConfiguration:
176175
errors = admreg_validation.ValidateValidatingWebhookConfiguration(t)
@@ -602,6 +601,7 @@ func TestExampleObjectSchemas(t *testing.T) {
602601
},
603602
"pods": {
604603
"commands": {&api.Pod{}},
604+
"image-volumes": {&api.Pod{}},
605605
"init-containers": {&api.Pod{}},
606606
"lifecycle-events": {&api.Pod{}},
607607
"pod-configmap-env-var-valueFrom": {&api.Pod{}},
@@ -676,6 +676,8 @@ func TestExampleObjectSchemas(t *testing.T) {
676676
"security-context-2": {&api.Pod{}},
677677
"security-context-3": {&api.Pod{}},
678678
"security-context-4": {&api.Pod{}},
679+
"security-context-5": {&api.Pod{}},
680+
"security-context-6": {&api.Pod{}},
679681
},
680682
"pods/storage": {
681683
"projected": {&api.Pod{}},

‎go.mod

Lines changed: 81 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3,139 +3,138 @@ module k8s.io/website
33
go 1.22.0
44

55
require (
6-
k8s.io/apimachinery v0.30.0
6+
k8s.io/apimachinery v0.31.0
77
k8s.io/kubernetes v0.0.0
88
)
99

1010
require (
1111
github.com/NYTimes/gziphandler v1.1.1 // indirect
12-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
12+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
1313
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
1414
github.com/beorn7/perks v1.0.1 // indirect
1515
github.com/blang/semver/v4 v4.0.0 // indirect
16-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
17-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
16+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
17+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1818
github.com/coreos/go-semver v0.3.1 // indirect
1919
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
20-
github.com/davecgh/go-spew v1.1.1 // indirect
20+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2121
github.com/distribution/reference v0.5.0 // indirect
2222
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
23-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
24-
github.com/felixge/httpsnoop v1.0.3 // indirect
23+
github.com/felixge/httpsnoop v1.0.4 // indirect
2524
github.com/fsnotify/fsnotify v1.7.0 // indirect
26-
github.com/go-logr/logr v1.4.1 // indirect
25+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
26+
github.com/go-logr/logr v1.4.2 // indirect
2727
github.com/go-logr/stdr v1.2.2 // indirect
2828
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2929
github.com/go-openapi/jsonreference v0.20.2 // indirect
30-
github.com/go-openapi/swag v0.22.3 // indirect
30+
github.com/go-openapi/swag v0.22.4 // indirect
3131
github.com/gogo/protobuf v1.3.2 // indirect
3232
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3333
github.com/golang/protobuf v1.5.4 // indirect
34-
github.com/google/cel-go v0.17.8 // indirect
34+
github.com/google/cel-go v0.20.1 // indirect
3535
github.com/google/gnostic-models v0.6.8 // indirect
3636
github.com/google/go-cmp v0.6.0 // indirect
3737
github.com/google/gofuzz v1.2.0 // indirect
38-
github.com/google/uuid v1.3.0 // indirect
38+
github.com/google/uuid v1.6.0 // indirect
3939
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
40-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
40+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
4141
github.com/imdario/mergo v0.3.6 // indirect
4242
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4343
github.com/josharian/intern v1.0.0 // indirect
4444
github.com/json-iterator/go v1.1.12 // indirect
4545
github.com/mailru/easyjson v0.7.7 // indirect
46-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4746
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4847
github.com/modern-go/reflect2 v1.0.2 // indirect
4948
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5049
github.com/opencontainers/go-digest v1.0.0 // indirect
5150
github.com/pkg/errors v0.9.1 // indirect
52-
github.com/prometheus/client_golang v1.16.0 // indirect
53-
github.com/prometheus/client_model v0.4.0 // indirect
54-
github.com/prometheus/common v0.44.0 // indirect
55-
github.com/prometheus/procfs v0.10.1 // indirect
51+
github.com/prometheus/client_golang v1.19.1 // indirect
52+
github.com/prometheus/client_model v0.6.1 // indirect
53+
github.com/prometheus/common v0.55.0 // indirect
54+
github.com/prometheus/procfs v0.15.1 // indirect
5655
github.com/robfig/cron/v3 v3.0.1 // indirect
57-
github.com/spf13/cobra v1.7.0 // indirect
56+
github.com/spf13/cobra v1.8.1 // indirect
5857
github.com/spf13/pflag v1.0.5 // indirect
5958
github.com/stoewer/go-strcase v1.2.0 // indirect
60-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
61-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
62-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
63-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
64-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
65-
go.opentelemetry.io/otel v1.19.0 // indirect
66-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
67-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
68-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
69-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
70-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
71-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
59+
github.com/x448/float16 v0.8.4 // indirect
60+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
61+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
62+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
63+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
64+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
65+
go.opentelemetry.io/otel v1.28.0 // indirect
66+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
67+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
68+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
69+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
70+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
71+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7272
go.uber.org/multierr v1.11.0 // indirect
7373
go.uber.org/zap v1.26.0 // indirect
74-
golang.org/x/crypto v0.21.0 // indirect
75-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
76-
golang.org/x/net v0.23.0 // indirect
77-
golang.org/x/oauth2 v0.10.0 // indirect
78-
golang.org/x/sync v0.6.0 // indirect
79-
golang.org/x/sys v0.18.0 // indirect
80-
golang.org/x/term v0.18.0 // indirect
81-
golang.org/x/text v0.14.0 // indirect
74+
golang.org/x/crypto v0.24.0 // indirect
75+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
76+
golang.org/x/net v0.26.0 // indirect
77+
golang.org/x/oauth2 v0.21.0 // indirect
78+
golang.org/x/sync v0.7.0 // indirect
79+
golang.org/x/sys v0.21.0 // indirect
80+
golang.org/x/term v0.21.0 // indirect
81+
golang.org/x/text v0.16.0 // indirect
8282
golang.org/x/time v0.3.0 // indirect
83-
google.golang.org/appengine v1.6.7 // indirect
84-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
85-
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
86-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
87-
google.golang.org/grpc v1.58.3 // indirect
88-
google.golang.org/protobuf v1.33.0 // indirect
83+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
84+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
85+
google.golang.org/grpc v1.65.0 // indirect
86+
google.golang.org/protobuf v1.34.2 // indirect
87+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8988
gopkg.in/inf.v0 v0.9.1 // indirect
9089
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
9190
gopkg.in/yaml.v2 v2.4.0 // indirect
9291
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/api v0.30.0 // indirect
92+
k8s.io/api v0.31.0 // indirect
9493
k8s.io/apiextensions-apiserver v0.0.0 // indirect
95-
k8s.io/apiserver v0.30.0 // indirect
96-
k8s.io/client-go v0.30.0 // indirect
94+
k8s.io/apiserver v0.31.0 // indirect
95+
k8s.io/client-go v0.31.0 // indirect
9796
k8s.io/cloud-provider v0.0.0 // indirect
98-
k8s.io/component-base v0.30.0 // indirect
99-
k8s.io/component-helpers v0.30.0 // indirect
100-
k8s.io/controller-manager v0.30.0 // indirect
101-
k8s.io/klog/v2 v2.120.1 // indirect
102-
k8s.io/kms v0.30.0 // indirect
97+
k8s.io/component-base v0.31.0 // indirect
98+
k8s.io/component-helpers v0.31.0 // indirect
99+
k8s.io/controller-manager v0.31.0 // indirect
100+
k8s.io/klog/v2 v2.130.1 // indirect
101+
k8s.io/kms v0.31.0 // indirect
103102
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
104103
k8s.io/kubelet v0.0.0 // indirect
105-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
106-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
104+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
105+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
107106
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
108107
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
109-
sigs.k8s.io/yaml v1.3.0 // indirect
108+
sigs.k8s.io/yaml v1.4.0 // indirect
110109
)
111110

112111
replace (
113-
k8s.io/api => k8s.io/api v0.30.0
114-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0
115-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0
116-
k8s.io/apiserver => k8s.io/apiserver v0.30.0
117-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0
118-
k8s.io/client-go => k8s.io/client-go v0.30.0
119-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0
120-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
121-
k8s.io/code-generator => k8s.io/code-generator v0.30.0
122-
k8s.io/component-base => k8s.io/component-base v0.30.0
123-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.0
124-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.0
125-
k8s.io/cri-api => k8s.io/cri-api v0.30.0
126-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0
127-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
128-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
129-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
130-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
131-
k8s.io/kubectl => k8s.io/kubectl v0.30.0
132-
k8s.io/kubelet => k8s.io/kubelet v0.30.0
112+
k8s.io/api => k8s.io/api v0.31.0
113+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
114+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
115+
k8s.io/apiserver => k8s.io/apiserver v0.31.0
116+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
117+
k8s.io/client-go => k8s.io/client-go v0.31.0
118+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
119+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
120+
k8s.io/code-generator => k8s.io/code-generator v0.31.0
121+
k8s.io/component-base => k8s.io/component-base v0.31.0
122+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
123+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
124+
k8s.io/cri-api => k8s.io/cri-api v0.31.0
125+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
126+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
127+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
128+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
129+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
130+
k8s.io/kubectl => k8s.io/kubectl v0.31.0
131+
k8s.io/kubelet => k8s.io/kubelet v0.31.0
133132
k8s.io/kubernetes => ../kubernetes
134-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
135-
k8s.io/metrics => k8s.io/metrics v0.30.0
136-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0
137-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0
138-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
139-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.0
140-
k8s.io/sample-controller => k8s.io/sample-controller v0.30.0
133+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0
134+
k8s.io/metrics => k8s.io/metrics v0.31.0
135+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.0
136+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
137+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
138+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0
139+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.0
141140
)

0 commit comments

Comments
 (0)