Skip to content

Commit 2edb736

Browse files
authored
Merge pull request #46285 from tengqm/fix-examples-test
Fix examples test
2 parents 8901aa5 + 5228bdb commit 2edb736

File tree

4 files changed

+111
-109
lines changed

4 files changed

+111
-109
lines changed

content/en/examples/controllers/job-success-policy.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
apiVersion: batch/v1
22
kind: Job
3+
metadata:
4+
name: job-success
35
spec:
46
parallelism: 10
57
completions: 10
@@ -23,3 +25,4 @@ spec:
2325
sys.exit(0)
2426
else:
2527
sys.exit(1)
28+
restartPolicy: Never

content/en/examples/examples_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,9 +565,11 @@ func TestExampleObjectSchemas(t *testing.T) {
565565
"example-no-conflict-with-limitrange-cpu": {&api.Pod{}},
566566
},
567567
"configmap": {
568-
"configmaps": {&api.ConfigMap{}, &api.ConfigMap{}},
569-
"configmap-multikeys": {&api.ConfigMap{}},
570-
"configure-pod": {&api.Pod{}},
568+
"configmaps": {&api.ConfigMap{}, &api.ConfigMap{}},
569+
"configmap-multikeys": {&api.ConfigMap{}},
570+
"configure-pod": {&api.Pod{}},
571+
"immutable-configmap": {&api.ConfigMap{}},
572+
"new-immutable-configmap": {&api.ConfigMap{}},
571573
},
572574
"controllers": {
573575
"daemonset": {&apps.DaemonSet{}},
@@ -582,6 +584,7 @@ func TestExampleObjectSchemas(t *testing.T) {
582584
"job-pod-failure-policy-example": {&batch.Job{}},
583585
"job-pod-failure-policy-failjob": {&batch.Job{}},
584586
"job-pod-failure-policy-ignore": {&batch.Job{}},
587+
"job-success-policy": {&batch.Job{}},
585588
"replicaset": {&apps.ReplicaSet{}},
586589
"replication": {&api.ReplicationController{}},
587590
"replication-nginx-1.14.2": {&api.ReplicationController{}},

go.mod

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

3-
go 1.21
3+
go 1.22.0
44

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

@@ -23,15 +23,15 @@ require (
2323
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2424
github.com/felixge/httpsnoop v1.0.3 // indirect
2525
github.com/fsnotify/fsnotify v1.7.0 // indirect
26-
github.com/go-logr/logr v1.3.0 // indirect
26+
github.com/go-logr/logr v1.4.1 // 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
3030
github.com/go-openapi/swag v0.22.3 // indirect
3131
github.com/gogo/protobuf v1.3.2 // indirect
3232
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
33-
github.com/golang/protobuf v1.5.3 // indirect
34-
github.com/google/cel-go v0.17.7 // indirect
33+
github.com/golang/protobuf v1.5.4 // indirect
34+
github.com/google/cel-go v0.17.8 // 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
@@ -71,71 +71,71 @@ require (
7171
go.opentelemetry.io/proto/otlp v1.0.0 // 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.16.0 // indirect
74+
golang.org/x/crypto v0.21.0 // indirect
7575
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
76-
golang.org/x/net v0.19.0 // indirect
76+
golang.org/x/net v0.23.0 // indirect
7777
golang.org/x/oauth2 v0.10.0 // indirect
78-
golang.org/x/sync v0.5.0 // indirect
79-
golang.org/x/sys v0.15.0 // indirect
80-
golang.org/x/term v0.15.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
8181
golang.org/x/text v0.14.0 // indirect
8282
golang.org/x/time v0.3.0 // indirect
8383
google.golang.org/appengine v1.6.7 // indirect
8484
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
8585
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
8686
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
8787
google.golang.org/grpc v1.58.3 // indirect
88-
google.golang.org/protobuf v1.31.0 // indirect
88+
google.golang.org/protobuf v1.33.0 // indirect
8989
gopkg.in/inf.v0 v0.9.1 // indirect
9090
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
9191
gopkg.in/yaml.v2 v2.4.0 // indirect
9292
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/api v0.29.0 // indirect
93+
k8s.io/api v0.30.0 // indirect
9494
k8s.io/apiextensions-apiserver v0.0.0 // indirect
95-
k8s.io/apiserver v0.29.0 // indirect
96-
k8s.io/client-go v0.29.0 // indirect
95+
k8s.io/apiserver v0.30.0 // indirect
96+
k8s.io/client-go v0.30.0 // indirect
9797
k8s.io/cloud-provider v0.0.0 // indirect
98-
k8s.io/component-base v0.29.0 // indirect
99-
k8s.io/component-helpers v0.29.0 // indirect
100-
k8s.io/controller-manager v0.29.0 // indirect
101-
k8s.io/klog/v2 v2.110.1 // indirect
102-
k8s.io/kms v0.29.0 // indirect
103-
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // 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
103+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
104104
k8s.io/kubelet v0.0.0 // indirect
105105
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
106-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
106+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
107107
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
108108
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
109109
sigs.k8s.io/yaml v1.3.0 // indirect
110110
)
111111

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

0 commit comments

Comments
 (0)