Skip to content

Commit c401c0c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #49201 from tengqm/update-examples-test
Update test cases for examples
2 parents 386e913 + 5a2f3ff commit c401c0c

File tree

3 files changed

+179
-180
lines changed

3 files changed

+179
-180
lines changed

‎content/en/examples/examples_test.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ 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,
160159
AllowInvalidPodDeletionCost: false,
161160
AllowIndivisibleHugePagesValues: true,
162161
}
@@ -567,6 +566,7 @@ func TestExampleObjectSchemas(t *testing.T) {
567566
"configmaps": {&api.ConfigMap{}, &api.ConfigMap{}},
568567
"configmap-multikeys": {&api.ConfigMap{}},
569568
"configure-pod": {&api.Pod{}},
569+
"env-configmap": {&api.Pod{}},
570570
"immutable-configmap": {&api.ConfigMap{}},
571571
"new-immutable-configmap": {&api.ConfigMap{}},
572572
},
@@ -592,6 +592,7 @@ func TestExampleObjectSchemas(t *testing.T) {
592592
},
593593
"debug": {
594594
"counter-pod": {&api.Pod{}},
595+
"counter-pod-err": {&api.Pod{}},
595596
"event-exporter": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &apps.Deployment{}},
596597
"fluentd-gcp-configmap": {&api.ConfigMap{}},
597598
"fluentd-gcp-ds": {&apps.DaemonSet{}},
@@ -662,13 +663,16 @@ func TestExampleObjectSchemas(t *testing.T) {
662663
"qos-pod-5": {&api.Pod{}},
663664
},
664665
"pods/resource": {
665-
"cpu-request-limit": {&api.Pod{}},
666-
"cpu-request-limit-2": {&api.Pod{}},
667-
"extended-resource-pod": {&api.Pod{}},
668-
"extended-resource-pod-2": {&api.Pod{}},
669-
"memory-request-limit": {&api.Pod{}},
670-
"memory-request-limit-2": {&api.Pod{}},
671-
"memory-request-limit-3": {&api.Pod{}},
666+
"cpu-request-limit": {&api.Pod{}},
667+
"cpu-request-limit-2": {&api.Pod{}},
668+
"extended-resource-pod": {&api.Pod{}},
669+
"extended-resource-pod-2": {&api.Pod{}},
670+
"memory-request-limit": {&api.Pod{}},
671+
"memory-request-limit-2": {&api.Pod{}},
672+
"memory-request-limit-3": {&api.Pod{}},
673+
"pod-level-cpu-request-limit": {&api.Pod{}},
674+
"pod-level-memory-request-limit": {&api.Pod{}},
675+
"pod-level-resources": {&api.Pod{}},
672676
},
673677
"pods/security": {
674678
"hello-apparmor": {&api.Pod{}},
@@ -789,7 +793,7 @@ func TestExampleObjectSchemas(t *testing.T) {
789793
"restricted-psp": true,
790794
},
791795
}
792-
capabilities.SetForTests(capabilities.Capabilities{
796+
capabilities.Initialize(capabilities.Capabilities{
793797
AllowPrivileged: true,
794798
})
795799

‎go.mod

Lines changed: 66 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
module k8s.io/website
22

3-
go 1.22
3+
go 1.23.0
4+
5+
toolchain go1.23.3
46

57
require (
6-
k8s.io/apimachinery v0.31.0
8+
k8s.io/apimachinery v0.32.0
79
k8s.io/kubernetes v0.0.0
810
)
911

1012
require (
13+
cel.dev/expr v0.18.0 // indirect
1114
github.com/NYTimes/gziphandler v1.1.1 // indirect
1215
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
1316
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -18,27 +21,26 @@ require (
1821
github.com/coreos/go-semver v0.3.1 // indirect
1922
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2023
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
21-
github.com/distribution/reference v0.5.0 // indirect
24+
github.com/distribution/reference v0.6.0 // indirect
2225
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2326
github.com/felixge/httpsnoop v1.0.4 // indirect
2427
github.com/fsnotify/fsnotify v1.7.0 // indirect
2528
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2629
github.com/go-logr/logr v1.4.2 // indirect
2730
github.com/go-logr/stdr v1.2.2 // indirect
28-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
31+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2932
github.com/go-openapi/jsonreference v0.20.2 // indirect
30-
github.com/go-openapi/swag v0.22.4 // indirect
33+
github.com/go-openapi/swag v0.23.0 // indirect
3134
github.com/gogo/protobuf v1.3.2 // indirect
32-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3335
github.com/golang/protobuf v1.5.4 // indirect
34-
github.com/google/cel-go v0.20.1 // indirect
36+
github.com/google/btree v1.0.1 // indirect
37+
github.com/google/cel-go v0.22.0 // indirect
3538
github.com/google/gnostic-models v0.6.8 // indirect
3639
github.com/google/go-cmp v0.6.0 // indirect
3740
github.com/google/gofuzz v1.2.0 // indirect
3841
github.com/google/uuid v1.6.0 // indirect
3942
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
4043
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
41-
github.com/imdario/mergo v0.3.6 // indirect
4244
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4345
github.com/josharian/intern v1.0.0 // indirect
4446
github.com/json-iterator/go v1.1.12 // indirect
@@ -55,11 +57,11 @@ require (
5557
github.com/robfig/cron/v3 v3.0.1 // indirect
5658
github.com/spf13/cobra v1.8.1 // indirect
5759
github.com/spf13/pflag v1.0.5 // indirect
58-
github.com/stoewer/go-strcase v1.2.0 // indirect
60+
github.com/stoewer/go-strcase v1.3.0 // indirect
5961
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
62+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
63+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
64+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
6365
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
6466
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
6567
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -70,71 +72,70 @@ require (
7072
go.opentelemetry.io/otel/trace v1.28.0 // indirect
7173
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7274
go.uber.org/multierr v1.11.0 // indirect
73-
go.uber.org/zap v1.26.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
82-
golang.org/x/time v0.3.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
75+
go.uber.org/zap v1.27.0 // indirect
76+
golang.org/x/crypto v0.28.0 // indirect
77+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
78+
golang.org/x/net v0.30.0 // indirect
79+
golang.org/x/oauth2 v0.23.0 // indirect
80+
golang.org/x/sync v0.8.0 // indirect
81+
golang.org/x/sys v0.26.0 // indirect
82+
golang.org/x/term v0.25.0 // indirect
83+
golang.org/x/text v0.19.0 // indirect
84+
golang.org/x/time v0.7.0 // indirect
85+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
86+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
8587
google.golang.org/grpc v1.65.0 // indirect
86-
google.golang.org/protobuf v1.34.2 // indirect
88+
google.golang.org/protobuf v1.35.1 // indirect
8789
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8890
gopkg.in/inf.v0 v0.9.1 // indirect
8991
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
90-
gopkg.in/yaml.v2 v2.4.0 // indirect
9192
gopkg.in/yaml.v3 v3.0.1 // indirect
92-
k8s.io/api v0.31.0 // indirect
93+
k8s.io/api v0.32.0 // indirect
9394
k8s.io/apiextensions-apiserver v0.0.0 // indirect
94-
k8s.io/apiserver v0.31.0 // indirect
95-
k8s.io/client-go v0.31.0 // indirect
95+
k8s.io/apiserver v0.32.0 // indirect
96+
k8s.io/client-go v0.32.0 // indirect
9697
k8s.io/cloud-provider v0.0.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
98+
k8s.io/component-base v0.32.0 // indirect
99+
k8s.io/component-helpers v0.32.0 // indirect
100+
k8s.io/controller-manager v0.32.0 // indirect
100101
k8s.io/klog/v2 v2.130.1 // indirect
101-
k8s.io/kms v0.31.0 // indirect
102-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
102+
k8s.io/kms v0.32.0 // indirect
103+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
103104
k8s.io/kubelet v0.0.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
106-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
107-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
105+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
106+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
107+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
108+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
108109
sigs.k8s.io/yaml v1.4.0 // indirect
109110
)
110111

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

0 commit comments

Comments
 (0)