Skip to content

Commit 0b4fc27

Browse files
authored
Merge pull request #47999 from mengjiao-liu/sync-example-access-zh-cn
[zh-cn] Resync access and admin related examples files
2 parents 4e9ebea + 1338b4c commit 0b4fc27

6 files changed

+36
-19
lines changed

content/zh-cn/examples/access/deployment-replicas-policy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: admissionregistration.k8s.io/v1alpha1
1+
apiVersion: admissionregistration.k8s.io/v1
22
kind: ValidatingAdmissionPolicy
33
metadata:
44
name: "deploy-replica-policy.example.com"

content/zh-cn/examples/access/image-matches-namespace-environment.policy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# 例如,如果命名空间的标签为 {"environment": "staging"},则所有容器镜像必须是
44
# staging.example.com/* 或根本不包含 “example.com”,除非 Deployment 有
55
# {"exempt": "true"} 标签。
6-
apiVersion: admissionregistration.k8s.io/v1beta1
6+
apiVersion: admissionregistration.k8s.io/v1
77
kind: ValidatingAdmissionPolicy
88
metadata:
99
name: "image-matches-namespace-environment.policy.example.com"

content/zh-cn/examples/access/validating-admission-policy-audit-annotation.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: admissionregistration.k8s.io/v1alpha1
1+
apiVersion: admissionregistration.k8s.io/v1
22
kind: ValidatingAdmissionPolicy
33
metadata:
44
name: "demo-policy.example.com"
@@ -11,6 +11,8 @@ spec:
1111
operations: ["CREATE", "UPDATE"]
1212
resources: ["deployments"]
1313
validations:
14-
- key: "high-replica-count"
15-
expression: "object.spec.replicas > 50"
14+
- expression: "object.spec.replicas > 50"
1615
messageExpression: "'Deployment spec.replicas set to ' + string(object.spec.replicas)"
16+
auditAnnotations:
17+
- key: "high-replica-count"
18+
valueExpression: "'Deployment spec.replicas set to ' + string(object.spec.replicas)"

content/zh-cn/examples/access/validating-admission-policy-match-conditions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: admissionregistration.k8s.io/v1alpha1
1+
apiVersion: admissionregistration.k8s.io/v1
22
kind: ValidatingAdmissionPolicy
33
metadata:
44
name: "demo-policy.example.com"

content/zh-cn/examples/admin/resource/limit-range-pod-3.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ spec:
66
containers:
77
- name: busybox-cnt01
88
image: busybox:1.28
9+
command: ["sleep", "3600"]
910
resources:
1011
limits:
1112
memory: "300Mi"

content/zh-cn/examples/admin/sched/my-scheduler.yaml

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,33 @@ roleRef:
1717
name: system:kube-scheduler
1818
apiGroup: rbac.authorization.k8s.io
1919
---
20+
apiVersion: rbac.authorization.k8s.io/v1
21+
kind: ClusterRoleBinding
22+
metadata:
23+
name: my-scheduler-as-volume-scheduler
24+
subjects:
25+
- kind: ServiceAccount
26+
name: my-scheduler
27+
namespace: kube-system
28+
roleRef:
29+
kind: ClusterRole
30+
name: system:volume-scheduler
31+
apiGroup: rbac.authorization.k8s.io
32+
---
33+
apiVersion: rbac.authorization.k8s.io/v1
34+
kind: RoleBinding
35+
metadata:
36+
name: my-scheduler-extension-apiserver-authentication-reader
37+
namespace: kube-system
38+
roleRef:
39+
kind: Role
40+
name: extension-apiserver-authentication-reader
41+
apiGroup: rbac.authorization.k8s.io
42+
subjects:
43+
- kind: ServiceAccount
44+
name: my-scheduler
45+
namespace: kube-system
46+
---
2047
apiVersion: v1
2148
kind: ConfigMap
2249
metadata:
@@ -31,19 +58,6 @@ data:
3158
leaderElection:
3259
leaderElect: false
3360
---
34-
apiVersion: rbac.authorization.k8s.io/v1
35-
kind: ClusterRoleBinding
36-
metadata:
37-
name: my-scheduler-as-volume-scheduler
38-
subjects:
39-
- kind: ServiceAccount
40-
name: my-scheduler
41-
namespace: kube-system
42-
roleRef:
43-
kind: ClusterRole
44-
name: system:volume-scheduler
45-
apiGroup: rbac.authorization.k8s.io
46-
---
4761
apiVersion: apps/v1
4862
kind: Deployment
4963
metadata:

0 commit comments

Comments
 (0)