Skip to content

Commit dffd3a8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #30960 from tengqm/fix-examples
Fix examples
2 parents 2521d09 + 5f8e58a commit dffd3a8

File tree

5 files changed

+444
-682
lines changed

5 files changed

+444
-682
lines changed

‎content/en/examples/examples_test.go

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
160160
AllowPodAffinityNamespaceSelector: true,
161161
}
162162

163-
pspValidationOptions := policy_validation.PodSecurityPolicyValidationOptions{
164-
AllowEphemeralVolumeType: true,
165-
}
166-
167163
// Enable CustomPodDNS for testing
168164
// feature.DefaultFeatureGate.Set("CustomPodDNS=true")
169165
switch t := obj.(type) {
@@ -283,11 +279,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
283279
if t.Namespace == "" {
284280
t.Namespace = api.NamespaceDefault
285281
}
286-
gv := schema.GroupVersion{
287-
Group: networking.GroupName,
288-
Version: legacyscheme.Scheme.PrioritizedVersionsForGroup(networking.GroupName)[0].Version,
289-
}
290-
errors = networking_validation.ValidateIngressCreate(t, gv)
282+
errors = networking_validation.ValidateIngressCreate(t)
291283
case *networking.IngressClass:
292284
/*
293285
if t.Namespace == "" {
@@ -301,7 +293,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
301293
errors = networking_validation.ValidateIngressClass(t)
302294

303295
case *policy.PodSecurityPolicy:
304-
errors = policy_validation.ValidatePodSecurityPolicy(t, pspValidationOptions)
296+
errors = policy_validation.ValidatePodSecurityPolicy(t)
305297
case *apps.ReplicaSet:
306298
if t.Namespace == "" {
307299
t.Namespace = api.NamespaceDefault
@@ -405,7 +397,7 @@ func TestExampleObjectSchemas(t *testing.T) {
405397
},
406398
"admin/dns": {
407399
"busybox": {&api.Pod{}},
408-
"dns-horizontal-autoscaler": {&apps.Deployment{}},
400+
"dns-horizontal-autoscaler": {&api.ServiceAccount{}, &rbac.ClusterRole{}, &rbac.ClusterRoleBinding{}, &apps.Deployment{}},
409401
"dnsutils": {&api.Pod{}},
410402
},
411403
"admin/logging": {
@@ -453,7 +445,7 @@ func TestExampleObjectSchemas(t *testing.T) {
453445
},
454446
"admin/sched": {
455447
"clusterrole": {&rbac.ClusterRole{}},
456-
"my-scheduler": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &rbac.ClusterRoleBinding{}, &apps.Deployment{}},
448+
"my-scheduler": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &rbac.ClusterRoleBinding{}, &api.ConfigMap{}, &apps.Deployment{}},
457449
"pod1": {&api.Pod{}},
458450
"pod2": {&api.Pod{}},
459451
"pod3": {&api.Pod{}},
@@ -592,6 +584,7 @@ func TestExampleObjectSchemas(t *testing.T) {
592584
},
593585
"pods/probe": {
594586
"exec-liveness": {&api.Pod{}},
587+
"grpc-liveness": {&api.Pod{}},
595588
"http-liveness": {&api.Pod{}},
596589
"pod-with-http-healthcheck": {&api.Pod{}},
597590
"pod-with-tcp-socket-healthcheck": {&api.Pod{}},
@@ -620,11 +613,15 @@ func TestExampleObjectSchemas(t *testing.T) {
620613
"security-context-4": {&api.Pod{}},
621614
},
622615
"pods/storage": {
623-
"projected": {&api.Pod{}},
624-
"pv-claim": {&api.PersistentVolumeClaim{}},
625-
"pv-pod": {&api.Pod{}},
626-
"pv-volume": {&api.PersistentVolume{}},
627-
"redis": {&api.Pod{}},
616+
"projected": {&api.Pod{}},
617+
"projected-secret-downwardapi-configmap": {&api.Pod{}},
618+
"projected-secrets-nondefault-permission-mode": {&api.Pod{}},
619+
"projected-service-account-token": {&api.Pod{}},
620+
"pv-claim": {&api.PersistentVolumeClaim{}},
621+
"pv-duplicate": {&api.Pod{}},
622+
"pv-pod": {&api.Pod{}},
623+
"pv-volume": {&api.PersistentVolume{}},
624+
"redis": {&api.Pod{}},
628625
},
629626
"policy": {
630627
"baseline-psp": {&policy.PodSecurityPolicy{}},

‎content/en/examples/pods/storage/projected-service-account-token.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ spec:
1010
- name: token-vol
1111
mountPath: "/service-account"
1212
readOnly: true
13+
serviceAccountName: default
1314
volumes:
1415
- name: token-vol
1516
projected:

‎content/en/examples/pods/storage/pv-duplicate.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ spec:
88
- name: test
99
image: nginx
1010
volumeMounts:
11-
- name: site-data
11+
# a mount for site-data
12+
- name: config
1213
mountPath: /usr/share/nginx/html
1314
subPath: html
15+
# another mount for nginx config
1416
- name: config
1517
mountPath: /etc/nginx/nginx.conf
1618
subPath: nginx.conf
1719
volumes:
1820
- name: config
1921
persistentVolumeClaim:
20-
claimName: test-nfs-claim
22+
claimName: test-nfs-claim

‎go.mod

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

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/google/go-cmp v0.5.6 // indirect
7-
k8s.io/apimachinery v0.22.0
6+
k8s.io/apimachinery v0.23.0
87
k8s.io/kubernetes v0.0.0
98
)
109

10+
require (
11+
cloud.google.com/go v0.97.0 // indirect
12+
github.com/beorn7/perks v1.0.1 // indirect
13+
github.com/blang/semver v3.5.1+incompatible // indirect
14+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
15+
github.com/coreos/go-semver v0.3.0 // indirect
16+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
17+
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
18+
github.com/davecgh/go-spew v1.1.1 // indirect
19+
github.com/docker/distribution v2.7.1+incompatible // indirect
20+
github.com/felixge/httpsnoop v1.0.1 // indirect
21+
github.com/go-logr/logr v1.2.0 // indirect
22+
github.com/gogo/protobuf v1.3.2 // indirect
23+
github.com/golang/protobuf v1.5.2 // indirect
24+
github.com/google/go-cmp v0.5.6 // indirect
25+
github.com/google/gofuzz v1.1.0 // indirect
26+
github.com/google/uuid v1.1.2 // indirect
27+
github.com/googleapis/gnostic v0.5.5 // indirect
28+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
29+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
30+
github.com/json-iterator/go v1.1.12 // indirect
31+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
32+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
33+
github.com/modern-go/reflect2 v1.0.2 // indirect
34+
github.com/opencontainers/go-digest v1.0.0 // indirect
35+
github.com/opencontainers/runc v1.0.2 // indirect
36+
github.com/pkg/errors v0.9.1 // indirect
37+
github.com/prometheus/client_golang v1.11.0 // indirect
38+
github.com/prometheus/client_model v0.2.0 // indirect
39+
github.com/prometheus/common v0.28.0 // indirect
40+
github.com/prometheus/procfs v0.6.0 // indirect
41+
github.com/robfig/cron/v3 v3.0.1 // indirect
42+
github.com/spf13/pflag v1.0.5 // indirect
43+
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
44+
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
45+
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
46+
go.opentelemetry.io/contrib v0.20.0 // indirect
47+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
48+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
49+
go.opentelemetry.io/otel v0.20.0 // indirect
50+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
51+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
52+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
53+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
54+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
55+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
56+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
57+
go.uber.org/atomic v1.7.0 // indirect
58+
go.uber.org/multierr v1.6.0 // indirect
59+
go.uber.org/zap v1.19.0 // indirect
60+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
61+
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
62+
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect
63+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
64+
golang.org/x/text v0.3.7 // indirect
65+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
66+
google.golang.org/appengine v1.6.7 // indirect
67+
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c // indirect
68+
google.golang.org/grpc v1.40.0 // indirect
69+
google.golang.org/protobuf v1.27.1 // indirect
70+
gopkg.in/inf.v0 v0.9.1 // indirect
71+
gopkg.in/yaml.v2 v2.4.0 // indirect
72+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
73+
k8s.io/api v0.23.0 // indirect
74+
k8s.io/apiserver v0.23.0 // indirect
75+
k8s.io/client-go v0.23.0 // indirect
76+
k8s.io/component-base v0.23.0 // indirect
77+
k8s.io/component-helpers v0.23.0 // indirect
78+
k8s.io/klog/v2 v2.30.0 // indirect
79+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
80+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
81+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect
82+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
83+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
84+
sigs.k8s.io/yaml v1.2.0 // indirect
85+
)
86+
1187
replace (
12-
k8s.io/api => k8s.io/api v0.22.0
13-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0
14-
k8s.io/apimachinery => k8s.io/apimachinery v0.22.0
15-
k8s.io/apiserver => k8s.io/apiserver v0.22.0
16-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.0
17-
k8s.io/client-go => k8s.io/client-go v0.22.0
18-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.0
19-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0
20-
k8s.io/code-generator => k8s.io/code-generator v0.22.0
21-
k8s.io/component-base => k8s.io/component-base v0.22.0
22-
k8s.io/component-helpers => k8s.io/component-helpers v0.22.0
23-
k8s.io/controller-manager => k8s.io/controller-manager v0.22.0
24-
k8s.io/cri-api => k8s.io/cri-api v0.22.0
25-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.0
26-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.0
27-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.0
28-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.0
29-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.0
30-
k8s.io/kubectl => k8s.io/kubectl v0.22.0
31-
k8s.io/kubelet => k8s.io/kubelet v0.22.0
88+
k8s.io/api => k8s.io/api v0.23.0
89+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0
90+
k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
91+
k8s.io/apiserver => k8s.io/apiserver v0.23.0
92+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0
93+
k8s.io/client-go => k8s.io/client-go v0.23.0
94+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0
95+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0
96+
k8s.io/code-generator => k8s.io/code-generator v0.23.0
97+
k8s.io/component-base => k8s.io/component-base v0.23.0
98+
k8s.io/component-helpers => k8s.io/component-helpers v0.23.0
99+
k8s.io/controller-manager => k8s.io/controller-manager v0.23.0
100+
k8s.io/cri-api => k8s.io/cri-api v0.23.0
101+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0
102+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0
103+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0
104+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0
105+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0
106+
k8s.io/kubectl => k8s.io/kubectl v0.23.0
107+
k8s.io/kubelet => k8s.io/kubelet v0.23.0
32108
k8s.io/kubernetes => ../kubernetes
33-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.0
34-
k8s.io/metrics => k8s.io/metrics v0.22.0
35-
k8s.io/mount-utils => k8s.io/mount-utils v0.22.0
36-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.0
37-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0
38-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.22.0
39-
k8s.io/sample-controller => k8s.io/sample-controller v0.22.0
109+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0
110+
k8s.io/metrics => k8s.io/metrics v0.23.0
111+
k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
112+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0
113+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0
114+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.0
115+
k8s.io/sample-controller => k8s.io/sample-controller v0.23.0
40116
)

0 commit comments

Comments
 (0)