sync zh/ en/ (#19918)

This commit is contained in:
行颠
2020-03-28 19:57:52 +08:00
committed by GitHub
parent 59cd0289fe
commit 2a8ad5e658
38 changed files with 1059 additions and 934 deletions
@@ -1,69 +1,69 @@
# This is an example of how to setup cloud-controller-manger as a Daemonset in your cluster. # This is an example of how to setup cloud-controller-manger as a Daemonset in your cluster.
# It assumes that your masters can run pods and has the role node-role.kubernetes.io/master # It assumes that your masters can run pods and has the role node-role.kubernetes.io/master
# Note that this Daemonset will not work straight out of the box for your cloud, this is # Note that this Daemonset will not work straight out of the box for your cloud, this is
# meant to be a guideline. # meant to be a guideline.
--- ---
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: cloud-controller-manager name: cloud-controller-manager
namespace: kube-system namespace: kube-system
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: system:cloud-controller-manager name: system:cloud-controller-manager
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: cluster-admin name: cluster-admin
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: cloud-controller-manager name: cloud-controller-manager
namespace: kube-system namespace: kube-system
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
labels: labels:
k8s-app: cloud-controller-manager k8s-app: cloud-controller-manager
name: cloud-controller-manager name: cloud-controller-manager
namespace: kube-system namespace: kube-system
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: cloud-controller-manager k8s-app: cloud-controller-manager
template: template:
metadata: metadata:
labels: labels:
k8s-app: cloud-controller-manager k8s-app: cloud-controller-manager
spec: spec:
serviceAccountName: cloud-controller-manager serviceAccountName: cloud-controller-manager
containers: containers:
- name: cloud-controller-manager - name: cloud-controller-manager
# for in-tree providers we use k8s.gcr.io/cloud-controller-manager # for in-tree providers we use k8s.gcr.io/cloud-controller-manager
# this can be replaced with any other image for out-of-tree providers # this can be replaced with any other image for out-of-tree providers
image: k8s.gcr.io/cloud-controller-manager:v1.8.0 image: k8s.gcr.io/cloud-controller-manager:v1.8.0
command: command:
- /usr/local/bin/cloud-controller-manager - /usr/local/bin/cloud-controller-manager
- --cloud-provider=[YOUR_CLOUD_PROVIDER] # Add your own cloud provider here! - --cloud-provider=[YOUR_CLOUD_PROVIDER] # Add your own cloud provider here!
- --leader-elect=true - --leader-elect=true
- --use-service-account-credentials - --use-service-account-credentials
# these flags will vary for every cloud provider # these flags will vary for every cloud provider
- --allocate-node-cidrs=true - --allocate-node-cidrs=true
- --configure-cloud-routes=true - --configure-cloud-routes=true
- --cluster-cidr=172.17.0.0/16 - --cluster-cidr=172.17.0.0/16
tolerations: tolerations:
# this is required so CCM can bootstrap itself # this is required so CCM can bootstrap itself
- key: node.cloudprovider.kubernetes.io/uninitialized - key: node.cloudprovider.kubernetes.io/uninitialized
value: "true" value: "true"
effect: NoSchedule effect: NoSchedule
# this is to have the daemonset runnable on master nodes # this is to have the daemonset runnable on master nodes
# the taint may vary depending on your cluster setup # the taint may vary depending on your cluster setup
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
effect: NoSchedule effect: NoSchedule
# this is to restrict CCM to only run on master nodes # this is to restrict CCM to only run on master nodes
# the node selector may vary depending on your cluster setup # the node selector may vary depending on your cluster setup
nodeSelector: nodeSelector:
node-role.kubernetes.io/master: "" node-role.kubernetes.io/master: ""
@@ -1,33 +1,33 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: dns-autoscaler name: dns-autoscaler
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: dns-autoscaler k8s-app: dns-autoscaler
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: dns-autoscaler k8s-app: dns-autoscaler
template: template:
metadata: metadata:
labels: labels:
k8s-app: dns-autoscaler k8s-app: dns-autoscaler
spec: spec:
containers: containers:
- name: autoscaler - name: autoscaler
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.6.0 image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.6.0
resources: resources:
requests: requests:
cpu: 20m cpu: 20m
memory: 10Mi memory: 10Mi
command: command:
- /cluster-proportional-autoscaler - /cluster-proportional-autoscaler
- --namespace=kube-system - --namespace=kube-system
- --configmap=dns-autoscaler - --configmap=dns-autoscaler
- --target=<SCALE_TARGET> - --target=<SCALE_TARGET>
# When cluster is using large nodes(with more cores), "coresPerReplica" should dominate. # When cluster is using large nodes(with more cores), "coresPerReplica" should dominate.
# If using small nodes, "nodesPerReplica" should dominate. # If using small nodes, "nodesPerReplica" should dominate.
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"min":1}} - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"min":1}}
- --logtostderr=true - --logtostderr=true
- --v=2 - --v=2
+14 -14
View File
@@ -1,14 +1,14 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: dnsutils name: dnsutils
namespace: default namespace: default
spec: spec:
containers: containers:
- name: dnsutils - name: dnsutils
image: gcr.io/kubernetes-e2e-test-images/dnsutils:1.3 image: gcr.io/kubernetes-e2e-test-images/dnsutils:1.3
command: command:
- sleep - sleep
- "3600" - "3600"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
restartPolicy: Always restartPolicy: Always
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"kind": "Namespace",
"apiVersion": "v1", "apiVersion": "v1",
"kind": "Namespace",
"metadata": { "metadata": {
"name": "development", "name": "development",
"labels": { "labels": {
@@ -1,6 +1,6 @@
{ {
"kind": "Namespace",
"apiVersion": "v1", "apiVersion": "v1",
"kind": "Namespace",
"metadata": { "metadata": {
"name": "production", "name": "production",
"labels": { "labels": {
@@ -13,4 +13,3 @@ spec:
requests: requests:
memory: "700Mi" memory: "700Mi"
cpu: "400m" cpu: "400m"
@@ -13,4 +13,3 @@ spec:
requests: requests:
memory: "600Mi" memory: "600Mi"
cpu: "400m" cpu: "400m"
@@ -1,67 +1,67 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: my-scheduler name: my-scheduler
namespace: kube-system namespace: kube-system
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: my-scheduler-as-kube-scheduler name: my-scheduler-as-kube-scheduler
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: my-scheduler name: my-scheduler
namespace: kube-system namespace: kube-system
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
name: system:kube-scheduler name: system:kube-scheduler
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
component: scheduler component: scheduler
tier: control-plane tier: control-plane
name: my-scheduler name: my-scheduler
namespace: kube-system namespace: kube-system
spec: spec:
selector: selector:
matchLabels: matchLabels:
component: scheduler component: scheduler
tier: control-plane tier: control-plane
replicas: 1 replicas: 1
template: template:
metadata: metadata:
labels: labels:
component: scheduler component: scheduler
tier: control-plane tier: control-plane
version: second version: second
spec: spec:
serviceAccountName: my-scheduler serviceAccountName: my-scheduler
containers: containers:
- command: - command:
- /usr/local/bin/kube-scheduler - /usr/local/bin/kube-scheduler
- --address=0.0.0.0 - --address=0.0.0.0
- --leader-elect=false - --leader-elect=false
- --scheduler-name=my-scheduler - --scheduler-name=my-scheduler
image: gcr.io/my-gcp-project/my-kube-scheduler:1.0 image: gcr.io/my-gcp-project/my-kube-scheduler:1.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz
port: 10251 port: 10251
initialDelaySeconds: 15 initialDelaySeconds: 15
name: kube-second-scheduler name: kube-second-scheduler
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /healthz path: /healthz
port: 10251 port: 10251
resources: resources:
requests: requests:
cpu: '0.1' cpu: '0.1'
securityContext: securityContext:
privileged: false privileged: false
volumeMounts: [] volumeMounts: []
hostNetwork: false hostNetwork: false
hostPID: false hostPID: false
volumes: [] volumes: []
@@ -0,0 +1,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: snowflake
name: snowflake
spec:
replicas: 2
selector:
matchLabels:
app: snowflake
template:
metadata:
labels:
app: snowflake
spec:
containers:
- image: k8s.gcr.io/serve_hostname
imagePullPolicy: Always
name: snowflake
@@ -1,5 +1,5 @@
# Specify BROKER_URL and QUEUE when running # Specify BROKER_URL and QUEUE when running
FROM ubuntu:14.04 FROM ubuntu:18.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y curl ca-certificates amqp-tools python \ apt-get install -y curl ca-certificates amqp-tools python \
@@ -3,5 +3,5 @@
# Just prints standard out and sleeps for 10 seconds. # Just prints standard out and sleeps for 10 seconds.
import sys import sys
import time import time
print("Processing " + sys.stdin.lines()) print("Processing " + sys.stdin.readlines()[0])
time.sleep(10) time.sleep(10)
@@ -111,7 +111,7 @@ class RedisWQ(object):
# If we crash here, then the GC code will try to move the value, but it will # If we crash here, then the GC code will try to move the value, but it will
# not be here, which is fine. So this does not need to be a transaction. # not be here, which is fine. So this does not need to be a transaction.
itemkey = self._itemkey(value) itemkey = self._itemkey(value)
self._db.delete(self._lease_key_prefix + itemkey, self._session) self._db.delete(self._lease_key_prefix + itemkey)
# TODO: add functions to clean up all keys associated with "name" when # TODO: add functions to clean up all keys associated with "name" when
# processing is complete. # processing is complete.
@@ -12,9 +12,9 @@ q = rediswq.RedisWQ(name="job2", host="redis")
print("Worker with sessionID: " + q.sessionID()) print("Worker with sessionID: " + q.sessionID())
print("Initial queue state: empty=" + str(q.empty())) print("Initial queue state: empty=" + str(q.empty()))
while not q.empty(): while not q.empty():
item = q.lease(lease_secs=10, block=True, timeout=2) item = q.lease(lease_secs=10, block=True, timeout=2)
if item is not None: if item is not None:
itemstr = item.decode("utf=8") itemstr = item.decode("utf-8")
print("Working on " + itemstr) print("Working on " + itemstr)
time.sleep(10) # Put your actual work here instead of sleep. time.sleep(10) # Put your actual work here instead of sleep.
q.complete(item) q.complete(item)
@@ -0,0 +1,39 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: php-apache
spec:
selector:
matchLabels:
run: php-apache
replicas: 1
template:
metadata:
labels:
run: php-apache
spec:
containers:
- name: php-apache
image: k8s.gcr.io/hpa-example
ports:
- containerPort: 80
resources:
limits:
cpu: 500m
requests:
cpu: 200m
---
apiVersion: v1
kind: Service
metadata:
name: php-apache
labels:
run: php-apache
spec:
ports:
- port: 80
selector:
run: php-apache
+44 -44
View File
@@ -1,44 +1,44 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-elasticsearch name: fluentd-elasticsearch
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-logging k8s-app: fluentd-logging
spec: spec:
selector: selector:
matchLabels: matchLabels:
name: fluentd-elasticsearch name: fluentd-elasticsearch
template: template:
metadata: metadata:
labels: labels:
name: fluentd-elasticsearch name: fluentd-elasticsearch
spec: spec:
tolerations: tolerations:
# this toleration is to have the daemonset runnable on master nodes # this toleration is to have the daemonset runnable on master nodes
# remove it if your masters can't run pods # remove it if your masters can't run pods
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
effect: NoSchedule effect: NoSchedule
containers: containers:
- name: fluentd-elasticsearch - name: fluentd-elasticsearch
image: quay.io/fluentd_elasticsearch/fluentd:v2.5.2 image: quay.io/fluentd_elasticsearch/fluentd:v2.5.2
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 200Mi memory: 200Mi
volumeMounts: volumeMounts:
- name: varlog - name: varlog
mountPath: /var/log mountPath: /var/log
- name: varlibdockercontainers - name: varlibdockercontainers
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers
readOnly: true readOnly: true
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
volumes: volumes:
- name: varlog - name: varlog
hostPath: hostPath:
path: /var/log path: /var/log
- name: varlibdockercontainers - name: varlibdockercontainers
hostPath: hostPath:
path: /var/lib/docker/containers path: /var/lib/docker/containers
+21 -21
View File
@@ -1,21 +1,21 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: ReplicaSet kind: ReplicaSet
metadata: metadata:
name: frontend name: frontend
labels: labels:
app: guestbook app: guestbook
tier: frontend tier: frontend
spec: spec:
# modify replicas according to your case # modify replicas according to your case
replicas: 3 replicas: 3
selector: selector:
matchLabels: matchLabels:
tier: frontend tier: frontend
template: template:
metadata: metadata:
labels: labels:
tier: frontend tier: frontend
spec: spec:
containers: containers:
- name: php-redis - name: php-redis
image: gcr.io/google_samples/gb-frontend:v3 image: gcr.io/google_samples/gb-frontend:v3
@@ -1,21 +1,21 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
labels: labels:
app: nginx app: nginx
spec: spec:
replicas: 3 replicas: 3
selector: selector:
matchLabels: matchLabels:
app: nginx app: nginx
template: template:
metadata: metadata:
labels: labels:
app: nginx app: nginx
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: nginx:1.14.2 image: nginx:1.14.2
ports: ports:
- containerPort: 80 - containerPort: 80
@@ -1,16 +1,16 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: my-nginx name: my-nginx
spec: spec:
replicas: 5 replicas: 5
template: template:
metadata: metadata:
labels: labels:
app: nginx app: nginx
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: nginx:1.14.2 image: nginx:1.14.2
ports: ports:
- containerPort: 80 - containerPort: 80
@@ -1,21 +1,21 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: my-nginx-v4 name: my-nginx-v4
spec: spec:
replicas: 5 replicas: 5
selector: selector:
app: nginx app: nginx
deployment: v4 deployment: v4
template: template:
metadata: metadata:
labels: labels:
app: nginx app: nginx
deployment: v4 deployment: v4
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: nginx:1.16.1 image: nginx:1.16.1
args: ["nginx", "-T"] args: ["nginx", "-T"]
ports: ports:
- containerPort: 80 - containerPort: 80
@@ -1,379 +1,379 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
data: data:
containers.input.conf: |- containers.input.conf: |-
# This configuration file for Fluentd is used # This configuration file for Fluentd is used
# to watch changes to Docker log files that live in the # to watch changes to Docker log files that live in the
# directory /var/lib/docker/containers/ and are symbolically # directory /var/lib/docker/containers/ and are symbolically
# linked to from the /var/log/containers directory using names that capture the # linked to from the /var/log/containers directory using names that capture the
# pod name and container name. These logs are then submitted to # pod name and container name. These logs are then submitted to
# Google Cloud Logging which assumes the installation of the cloud-logging plug-in. # Google Cloud Logging which assumes the installation of the cloud-logging plug-in.
# #
# Example # Example
# ======= # =======
# A line in the Docker log file might look like this JSON: # A line in the Docker log file might look like this JSON:
# #
# {"log":"2014/09/25 21:15:03 Got request with path wombat\\n", # {"log":"2014/09/25 21:15:03 Got request with path wombat\\n",
# "stream":"stderr", # "stream":"stderr",
# "time":"2014-09-25T21:15:03.499185026Z"} # "time":"2014-09-25T21:15:03.499185026Z"}
# #
# The record reformer is used to write the tag to focus on the pod name # The record reformer is used to write the tag to focus on the pod name
# and the Kubernetes container name. For example a Docker container's logs # and the Kubernetes container name. For example a Docker container's logs
# might be in the directory: # might be in the directory:
# /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b # /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b
# and in the file: # and in the file:
# 997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log # 997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log
# where 997599971ee6... is the Docker ID of the running container. # where 997599971ee6... is the Docker ID of the running container.
# The Kubernetes kubelet makes a symbolic link to this file on the host machine # The Kubernetes kubelet makes a symbolic link to this file on the host machine
# in the /var/log/containers directory which includes the pod name and the Kubernetes # in the /var/log/containers directory which includes the pod name and the Kubernetes
# container name: # container name:
# synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log # synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
# -> # ->
# /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log # /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log
# The /var/log directory on the host is mapped to the /var/log directory in the container # The /var/log directory on the host is mapped to the /var/log directory in the container
# running this instance of Fluentd and we end up collecting the file: # running this instance of Fluentd and we end up collecting the file:
# /var/log/containers/synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log # /var/log/containers/synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
# This results in the tag: # This results in the tag:
# var.log.containers.synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log # var.log.containers.synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
# The record reformer is used is discard the var.log.containers prefix and # The record reformer is used is discard the var.log.containers prefix and
# the Docker container ID suffix and "kubernetes." is pre-pended giving the tag: # the Docker container ID suffix and "kubernetes." is pre-pended giving the tag:
# kubernetes.synthetic-logger-0.25lps-pod_default-synth-lgr # kubernetes.synthetic-logger-0.25lps-pod_default-synth-lgr
# Tag is then parsed by google_cloud plugin and translated to the metadata, # Tag is then parsed by google_cloud plugin and translated to the metadata,
# visible in the log viewer # visible in the log viewer
# Example: # Example:
# {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"} # {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"}
<source> <source>
type tail type tail
format json format json
time_key time time_key time
path /var/log/containers/*.log path /var/log/containers/*.log
pos_file /var/log/gcp-containers.log.pos pos_file /var/log/gcp-containers.log.pos
time_format %Y-%m-%dT%H:%M:%S.%N%Z time_format %Y-%m-%dT%H:%M:%S.%N%Z
tag reform.* tag reform.*
read_from_head true read_from_head true
</source> </source>
<filter reform.**> <filter reform.**>
type parser type parser
format /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<log>.*)/ format /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<log>.*)/
reserve_data true reserve_data true
suppress_parse_error_log true suppress_parse_error_log true
key_name log key_name log
</filter> </filter>
<match reform.**> <match reform.**>
type record_reformer type record_reformer
enable_ruby true enable_ruby true
tag raw.kubernetes.${tag_suffix[4].split('-')[0..-2].join('-')} tag raw.kubernetes.${tag_suffix[4].split('-')[0..-2].join('-')}
</match> </match>
# Detect exceptions in the log output and forward them as one log entry. # Detect exceptions in the log output and forward them as one log entry.
<match raw.kubernetes.**> <match raw.kubernetes.**>
@type copy @type copy
<store> <store>
@type prometheus @type prometheus
<metric> <metric>
type counter type counter
name logging_line_count name logging_line_count
desc Total number of lines generated by application containers desc Total number of lines generated by application containers
<labels> <labels>
tag ${tag} tag ${tag}
</labels> </labels>
</metric> </metric>
</store> </store>
<store> <store>
@type detect_exceptions @type detect_exceptions
remove_tag_prefix raw remove_tag_prefix raw
message log message log
stream stream stream stream
multiline_flush_interval 5 multiline_flush_interval 5
max_bytes 500000 max_bytes 500000
max_lines 1000 max_lines 1000
</store> </store>
</match> </match>
system.input.conf: |- system.input.conf: |-
# Example: # Example:
# Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script # Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
<source> <source>
type tail type tail
format syslog format syslog
path /var/log/startupscript.log path /var/log/startupscript.log
pos_file /var/log/gcp-startupscript.log.pos pos_file /var/log/gcp-startupscript.log.pos
tag startupscript tag startupscript
</source> </source>
# Examples: # Examples:
# time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json" # time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json"
# time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404 # time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404
<source> <source>
type tail type tail
format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/ format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
path /var/log/docker.log path /var/log/docker.log
pos_file /var/log/gcp-docker.log.pos pos_file /var/log/gcp-docker.log.pos
tag docker tag docker
</source> </source>
# Example: # Example:
# 2016/02/04 06:52:38 filePurge: successfully removed file /var/etcd/data/member/wal/00000000000006d0-00000000010a23d1.wal # 2016/02/04 06:52:38 filePurge: successfully removed file /var/etcd/data/member/wal/00000000000006d0-00000000010a23d1.wal
<source> <source>
type tail type tail
# Not parsing this, because it doesn't have anything particularly useful to # Not parsing this, because it doesn't have anything particularly useful to
# parse out of it (like severities). # parse out of it (like severities).
format none format none
path /var/log/etcd.log path /var/log/etcd.log
pos_file /var/log/gcp-etcd.log.pos pos_file /var/log/gcp-etcd.log.pos
tag etcd tag etcd
</source> </source>
# Multi-line parsing is required for all the kube logs because very large log # Multi-line parsing is required for all the kube logs because very large log
# statements, such as those that include entire object bodies, get split into # statements, such as those that include entire object bodies, get split into
# multiple lines by glog. # multiple lines by glog.
# Example: # Example:
# I0204 07:32:30.020537 3368 server.go:1048] POST /stats/container/: (13.972191ms) 200 [[Go-http-client/1.1] 10.244.1.3:40537] # I0204 07:32:30.020537 3368 server.go:1048] POST /stats/container/: (13.972191ms) 200 [[Go-http-client/1.1] 10.244.1.3:40537]
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/kubelet.log path /var/log/kubelet.log
pos_file /var/log/gcp-kubelet.log.pos pos_file /var/log/gcp-kubelet.log.pos
tag kubelet tag kubelet
</source> </source>
# Example: # Example:
# I1118 21:26:53.975789 6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed # I1118 21:26:53.975789 6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/kube-proxy.log path /var/log/kube-proxy.log
pos_file /var/log/gcp-kube-proxy.log.pos pos_file /var/log/gcp-kube-proxy.log.pos
tag kube-proxy tag kube-proxy
</source> </source>
# Example: # Example:
# I0204 07:00:19.604280 5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266] # I0204 07:00:19.604280 5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266]
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/kube-apiserver.log path /var/log/kube-apiserver.log
pos_file /var/log/gcp-kube-apiserver.log.pos pos_file /var/log/gcp-kube-apiserver.log.pos
tag kube-apiserver tag kube-apiserver
</source> </source>
# Example: # Example:
# 2017-02-09T00:15:57.992775796Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" ip="104.132.1.72" method="GET" user="kubecfg" as="<self>" asgroups="<lookup>" namespace="default" uri="/api/v1/namespaces/default/pods" # 2017-02-09T00:15:57.992775796Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" ip="104.132.1.72" method="GET" user="kubecfg" as="<self>" asgroups="<lookup>" namespace="default" uri="/api/v1/namespaces/default/pods"
# 2017-02-09T00:15:57.993528822Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" response="200" # 2017-02-09T00:15:57.993528822Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" response="200"
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\S+\s+AUDIT:/ format_firstline /^\S+\s+AUDIT:/
# Fields must be explicitly captured by name to be parsed into the record. # Fields must be explicitly captured by name to be parsed into the record.
# Fields may not always be present, and order may change, so this just looks # Fields may not always be present, and order may change, so this just looks
# for a list of key="\"quoted\" value" pairs separated by spaces. # for a list of key="\"quoted\" value" pairs separated by spaces.
# Unknown fields are ignored. # Unknown fields are ignored.
# Note: We can't separate query/response lines as format1/format2 because # Note: We can't separate query/response lines as format1/format2 because
# they don't always come one after the other for a given query. # they don't always come one after the other for a given query.
# TODO: Maybe add a JSON output mode to audit log so we can get rid of this? # TODO: Maybe add a JSON output mode to audit log so we can get rid of this?
format1 /^(?<time>\S+) AUDIT:(?: (?:id="(?<id>(?:[^"\\]|\\.)*)"|ip="(?<ip>(?:[^"\\]|\\.)*)"|method="(?<method>(?:[^"\\]|\\.)*)"|user="(?<user>(?:[^"\\]|\\.)*)"|groups="(?<groups>(?:[^"\\]|\\.)*)"|as="(?<as>(?:[^"\\]|\\.)*)"|asgroups="(?<asgroups>(?:[^"\\]|\\.)*)"|namespace="(?<namespace>(?:[^"\\]|\\.)*)"|uri="(?<uri>(?:[^"\\]|\\.)*)"|response="(?<response>(?:[^"\\]|\\.)*)"|\w+="(?:[^"\\]|\\.)*"))*/ format1 /^(?<time>\S+) AUDIT:(?: (?:id="(?<id>(?:[^"\\]|\\.)*)"|ip="(?<ip>(?:[^"\\]|\\.)*)"|method="(?<method>(?:[^"\\]|\\.)*)"|user="(?<user>(?:[^"\\]|\\.)*)"|groups="(?<groups>(?:[^"\\]|\\.)*)"|as="(?<as>(?:[^"\\]|\\.)*)"|asgroups="(?<asgroups>(?:[^"\\]|\\.)*)"|namespace="(?<namespace>(?:[^"\\]|\\.)*)"|uri="(?<uri>(?:[^"\\]|\\.)*)"|response="(?<response>(?:[^"\\]|\\.)*)"|\w+="(?:[^"\\]|\\.)*"))*/
time_format %FT%T.%L%Z time_format %FT%T.%L%Z
path /var/log/kube-apiserver-audit.log path /var/log/kube-apiserver-audit.log
pos_file /var/log/gcp-kube-apiserver-audit.log.pos pos_file /var/log/gcp-kube-apiserver-audit.log.pos
tag kube-apiserver-audit tag kube-apiserver-audit
</source> </source>
# Example: # Example:
# I0204 06:55:31.872680 5 servicecontroller.go:277] LB already exists and doesn't need update for service kube-system/kubernetes-dashboard # I0204 06:55:31.872680 5 servicecontroller.go:277] LB already exists and doesn't need update for service kube-system/kubernetes-dashboard
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/kube-controller-manager.log path /var/log/kube-controller-manager.log
pos_file /var/log/gcp-kube-controller-manager.log.pos pos_file /var/log/gcp-kube-controller-manager.log.pos
tag kube-controller-manager tag kube-controller-manager
</source> </source>
# Example: # Example:
# W0204 06:49:18.239674 7 reflector.go:245] pkg/scheduler/factory/factory.go:193: watch of *api.Service ended with: 401: The event in requested index is outdated and cleared (the requested history has been cleared [2578313/2577886]) [2579312] # W0204 06:49:18.239674 7 reflector.go:245] pkg/scheduler/factory/factory.go:193: watch of *api.Service ended with: 401: The event in requested index is outdated and cleared (the requested history has been cleared [2578313/2577886]) [2579312]
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/kube-scheduler.log path /var/log/kube-scheduler.log
pos_file /var/log/gcp-kube-scheduler.log.pos pos_file /var/log/gcp-kube-scheduler.log.pos
tag kube-scheduler tag kube-scheduler
</source> </source>
# Example: # Example:
# I1104 10:36:20.242766 5 rescheduler.go:73] Running Rescheduler # I1104 10:36:20.242766 5 rescheduler.go:73] Running Rescheduler
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/rescheduler.log path /var/log/rescheduler.log
pos_file /var/log/gcp-rescheduler.log.pos pos_file /var/log/gcp-rescheduler.log.pos
tag rescheduler tag rescheduler
</source> </source>
# Example: # Example:
# I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf # I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/glbc.log path /var/log/glbc.log
pos_file /var/log/gcp-glbc.log.pos pos_file /var/log/gcp-glbc.log.pos
tag glbc tag glbc
</source> </source>
# Example: # Example:
# I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf # I0603 15:31:05.793605 6 cluster_manager.go:230] Reading config from path /etc/gce.conf
<source> <source>
type tail type tail
format multiline format multiline
multiline_flush_interval 5s multiline_flush_interval 5s
format_firstline /^\w\d{4}/ format_firstline /^\w\d{4}/
format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/ format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
time_format %m%d %H:%M:%S.%N time_format %m%d %H:%M:%S.%N
path /var/log/cluster-autoscaler.log path /var/log/cluster-autoscaler.log
pos_file /var/log/gcp-cluster-autoscaler.log.pos pos_file /var/log/gcp-cluster-autoscaler.log.pos
tag cluster-autoscaler tag cluster-autoscaler
</source> </source>
# Logs from systemd-journal for interesting services. # Logs from systemd-journal for interesting services.
<source> <source>
type systemd type systemd
filters [{ "_SYSTEMD_UNIT": "docker.service" }] filters [{ "_SYSTEMD_UNIT": "docker.service" }]
pos_file /var/log/gcp-journald-docker.pos pos_file /var/log/gcp-journald-docker.pos
read_from_head true read_from_head true
tag docker tag docker
</source> </source>
<source> <source>
type systemd type systemd
filters [{ "_SYSTEMD_UNIT": "kubelet.service" }] filters [{ "_SYSTEMD_UNIT": "kubelet.service" }]
pos_file /var/log/gcp-journald-kubelet.pos pos_file /var/log/gcp-journald-kubelet.pos
read_from_head true read_from_head true
tag kubelet tag kubelet
</source> </source>
monitoring.conf: |- monitoring.conf: |-
# Prometheus monitoring # Prometheus monitoring
<source> <source>
@type prometheus @type prometheus
port 80 port 80
</source> </source>
<source> <source>
@type prometheus_monitor @type prometheus_monitor
</source> </source>
output.conf: |- output.conf: |-
# We use 2 output stanzas - one to handle the container logs and one to handle # We use 2 output stanzas - one to handle the container logs and one to handle
# the node daemon logs, the latter of which explicitly sends its logs to the # the node daemon logs, the latter of which explicitly sends its logs to the
# compute.googleapis.com service rather than container.googleapis.com to keep # compute.googleapis.com service rather than container.googleapis.com to keep
# them separate since most users don't care about the node logs. # them separate since most users don't care about the node logs.
<match kubernetes.**> <match kubernetes.**>
@type copy @type copy
<store> <store>
@type google_cloud @type google_cloud
# Set the buffer type to file to improve the reliability and reduce the memory consumption # Set the buffer type to file to improve the reliability and reduce the memory consumption
buffer_type file buffer_type file
buffer_path /var/log/fluentd-buffers/kubernetes.containers.buffer buffer_path /var/log/fluentd-buffers/kubernetes.containers.buffer
# Set queue_full action to block because we want to pause gracefully # Set queue_full action to block because we want to pause gracefully
# in case of the off-the-limits load instead of throwing an exception # in case of the off-the-limits load instead of throwing an exception
buffer_queue_full_action block buffer_queue_full_action block
# Set the chunk limit conservatively to avoid exceeding the GCL limit # Set the chunk limit conservatively to avoid exceeding the GCL limit
# of 10MiB per write request. # of 10MiB per write request.
buffer_chunk_limit 2M buffer_chunk_limit 2M
# Cap the combined memory usage of this buffer and the one below to # Cap the combined memory usage of this buffer and the one below to
# 2MiB/chunk * (6 + 2) chunks = 16 MiB # 2MiB/chunk * (6 + 2) chunks = 16 MiB
buffer_queue_limit 6 buffer_queue_limit 6
# Never wait more than 5 seconds before flushing logs in the non-error case. # Never wait more than 5 seconds before flushing logs in the non-error case.
flush_interval 5s flush_interval 5s
# Never wait longer than 30 seconds between retries. # Never wait longer than 30 seconds between retries.
max_retry_wait 30 max_retry_wait 30
# Disable the limit on the number of retries (retry forever). # Disable the limit on the number of retries (retry forever).
disable_retry_limit disable_retry_limit
# Use multiple threads for processing. # Use multiple threads for processing.
num_threads 2 num_threads 2
</store> </store>
<store> <store>
@type prometheus @type prometheus
<metric> <metric>
type counter type counter
name logging_entry_count name logging_entry_count
desc Total number of log entries generated by either an application container or a system component desc Total number of log entries generated by either an application container or a system component
<labels> <labels>
tag ${tag} tag ${tag}
component container component container
</labels> </labels>
</metric> </metric>
</store> </store>
</match> </match>
# Keep a smaller buffer here since these logs are less important than the user's # Keep a smaller buffer here since these logs are less important than the user's
# container logs. # container logs.
<match **> <match **>
@type copy @type copy
<store> <store>
@type google_cloud @type google_cloud
detect_subservice false detect_subservice false
buffer_type file buffer_type file
buffer_path /var/log/fluentd-buffers/kubernetes.system.buffer buffer_path /var/log/fluentd-buffers/kubernetes.system.buffer
buffer_queue_full_action block buffer_queue_full_action block
buffer_chunk_limit 2M buffer_chunk_limit 2M
buffer_queue_limit 2 buffer_queue_limit 2
flush_interval 5s flush_interval 5s
max_retry_wait 30 max_retry_wait 30
disable_retry_limit disable_retry_limit
num_threads 2 num_threads 2
</store> </store>
<store> <store>
@type prometheus @type prometheus
<metric> <metric>
type counter type counter
name logging_entry_count name logging_entry_count
desc Total number of log entries generated by either an application container or a system component desc Total number of log entries generated by either an application container or a system component
<labels> <labels>
tag ${tag} tag ${tag}
component system component system
</labels> </labels>
</metric> </metric>
</store> </store>
</match> </match>
metadata: metadata:
name: fluentd-gcp-config name: fluentd-gcp-config
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
+3 -13
View File
@@ -34,8 +34,6 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/apis/admissionregistration"
ar_validation "k8s.io/kubernetes/pkg/apis/admissionregistration/validation"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
apps_validation "k8s.io/kubernetes/pkg/apis/apps/validation" apps_validation "k8s.io/kubernetes/pkg/apis/apps/validation"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
@@ -434,12 +432,6 @@ func TestExampleObjectSchemas(t *testing.T) {
"node-problem-detector-configmap": {&apps.DaemonSet{}}, "node-problem-detector-configmap": {&apps.DaemonSet{}},
"termination": {&api.Pod{}}, "termination": {&api.Pod{}},
}, },
"federation": {
"policy-engine-deployment": {&apps.Deployment{}},
"policy-engine-service": {&api.Service{}},
"replicaset-example-policy": {&apps.ReplicaSet{}},
"scheduling-policy-admission": {&api.ConfigMap{}},
},
"podpreset": { "podpreset": {
"allow-db": {&settings.PodPreset{}}, "allow-db": {&settings.PodPreset{}},
"allow-db-merged": {&api.Pod{}}, "allow-db-merged": {&api.Pod{}},
@@ -525,9 +517,9 @@ func TestExampleObjectSchemas(t *testing.T) {
"redis": {&api.Pod{}}, "redis": {&api.Pod{}},
}, },
"policy": { "policy": {
"privileged-psp": {&policy.PodSecurityPolicy{}}, "privileged-psp": {&policy.PodSecurityPolicy{}},
"restricted-psp": {&policy.PodSecurityPolicy{}}, "restricted-psp": {&policy.PodSecurityPolicy{}},
"example-psp": {&policy.PodSecurityPolicy{}}, "example-psp": {&policy.PodSecurityPolicy{}},
"zookeeper-pod-disruption-budget-maxunavailable": {&policy.PodDisruptionBudget{}}, "zookeeper-pod-disruption-budget-maxunavailable": {&policy.PodDisruptionBudget{}},
"zookeeper-pod-disruption-budget-minunavailable": {&policy.PodDisruptionBudget{}}, "zookeeper-pod-disruption-budget-minunavailable": {&policy.PodDisruptionBudget{}},
}, },
@@ -569,8 +561,6 @@ func TestExampleObjectSchemas(t *testing.T) {
capabilities.SetForTests(capabilities.Capabilities{ capabilities.SetForTests(capabilities.Capabilities{
AllowPrivileged: true, AllowPrivileged: true,
}) })
// PodShareProcessNamespace needed for example share-process-namespace.yaml
utilfeature.DefaultFeatureGate.Set("PodShareProcessNamespace=true")
for dir, expected := range cases { for dir, expected := range cases {
tested := 0 tested := 0
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:6.14.2 FROM node:6.14.2
EXPOSE 8080 EXPOSE 8080
COPY server.js . COPY server.js .
CMD node server.js CMD [ "node", "server.js" ]
@@ -1,31 +1,31 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: website name: website
labels: labels:
app: website app: website
role: frontend role: frontend
annotations: annotations:
podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version" podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version"
spec: spec:
containers: containers:
- name: website - name: website
image: nginx image: nginx
volumeMounts: volumeMounts:
- mountPath: /cache - mountPath: /cache
name: cache-volume name: cache-volume
ports: ports:
- containerPort: 80 - containerPort: 80
env: env:
- name: DB_PORT - name: DB_PORT
value: "6379" value: "6379"
- name: duplicate_key - name: duplicate_key
value: FROM_ENV value: FROM_ENV
- name: expansion - name: expansion
value: $(REPLACE_ME) value: $(REPLACE_ME)
envFrom: envFrom:
- configMapRef: - configMapRef:
name: etcd-env-config name: etcd-env-config
volumes: volumes:
- name: cache-volume - name: cache-volume
emptyDir: {} emptyDir: {}
+24 -24
View File
@@ -1,24 +1,24 @@
apiVersion: settings.k8s.io/v1alpha1 apiVersion: settings.k8s.io/v1alpha1
kind: PodPreset kind: PodPreset
metadata: metadata:
name: allow-database name: allow-database
spec: spec:
selector: selector:
matchLabels: matchLabels:
role: frontend role: frontend
env: env:
- name: DB_PORT - name: DB_PORT
value: "6379" value: "6379"
- name: duplicate_key - name: duplicate_key
value: FROM_ENV value: FROM_ENV
- name: expansion - name: expansion
value: $(REPLACE_ME) value: $(REPLACE_ME)
envFrom: envFrom:
- configMapRef: - configMapRef:
name: etcd-env-config name: etcd-env-config
volumeMounts: volumeMounts:
- mountPath: /cache - mountPath: /cache
name: cache-volume name: cache-volume
volumes: volumes:
- name: cache-volume - name: cache-volume
emptyDir: {} emptyDir: {}
@@ -0,0 +1,15 @@
apiVersion: v1
kind: Pod
metadata:
name: nginx
labels:
env: test
spec:
containers:
- name: nginx
image: nginx
imagePullPolicy: IfNotPresent
tolerations:
- key: "example-key"
operator: "Exists"
effect: "NoSchedule"
+48 -48
View File
@@ -1,48 +1,48 @@
apiVersion: policy/v1beta1 apiVersion: policy/v1beta1
kind: PodSecurityPolicy kind: PodSecurityPolicy
metadata: metadata:
name: restricted name: restricted
annotations: annotations:
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default' seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default'
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default'
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default'
spec: spec:
privileged: false privileged: false
# Required to prevent escalations to root. # Required to prevent escalations to root.
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
# This is redundant with non-root + disallow privilege escalation, # This is redundant with non-root + disallow privilege escalation,
# but we can provide it for defense in depth. # but we can provide it for defense in depth.
requiredDropCapabilities: requiredDropCapabilities:
- ALL - ALL
# Allow core volume types. # Allow core volume types.
volumes: volumes:
- 'configMap' - 'configMap'
- 'emptyDir' - 'emptyDir'
- 'projected' - 'projected'
- 'secret' - 'secret'
- 'downwardAPI' - 'downwardAPI'
# Assume that persistentVolumes set up by the cluster admin are safe to use. # Assume that persistentVolumes set up by the cluster admin are safe to use.
- 'persistentVolumeClaim' - 'persistentVolumeClaim'
hostNetwork: false hostNetwork: false
hostIPC: false hostIPC: false
hostPID: false hostPID: false
runAsUser: runAsUser:
# Require the container to run without root privileges. # Require the container to run without root privileges.
rule: 'MustRunAsNonRoot' rule: 'MustRunAsNonRoot'
seLinux: seLinux:
# This policy assumes the nodes are using AppArmor rather than SELinux. # This policy assumes the nodes are using AppArmor rather than SELinux.
rule: 'RunAsAny' rule: 'RunAsAny'
supplementalGroups: supplementalGroups:
rule: 'MustRunAs' rule: 'MustRunAs'
ranges: ranges:
# Forbid adding the root group. # Forbid adding the root group.
- min: 1 - min: 1
max: 65535 max: 65535
fsGroup: fsGroup:
rule: 'MustRunAs' rule: 'MustRunAs'
ranges: ranges:
# Forbid adding the root group. # Forbid adding the root group.
- min: 1 - min: 1
max: 65535 max: 65535
readOnlyRootFilesystem: false readOnlyRootFilesystem: false
@@ -1,12 +1,12 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: hello name: hello
spec: spec:
selector: selector:
app: hello app: hello
tier: backend tier: backend
ports: ports:
- protocol: TCP - protocol: TCP
port: 80 port: 80
targetPort: http targetPort: http
@@ -1,9 +1,9 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: test-ingress name: test-ingress
spec: spec:
backend: backend:
serviceName: testsvc serviceName: testsvc
servicePort: 80 servicePort: 80
@@ -0,0 +1,11 @@
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-all-egress
spec:
podSelector: {}
egress:
- {}
policyTypes:
- Egress
@@ -0,0 +1,11 @@
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-all-ingress
spec:
podSelector: {}
ingress:
- {}
policyTypes:
- Ingress
@@ -0,0 +1,10 @@
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: default-deny-all
spec:
podSelector: {}
policyTypes:
- Ingress
- Egress
@@ -0,0 +1,9 @@
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: default-deny-egress
spec:
podSelector: {}
policyTypes:
- Egress
@@ -0,0 +1,9 @@
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: default-deny-ingress
spec:
podSelector: {}
policyTypes:
- Ingress
@@ -0,0 +1,13 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: access-nginx
spec:
podSelector:
matchLabels:
app: nginx
ingress:
- from:
- podSelector:
matchLabels:
access: "true"
@@ -1,51 +1,51 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: my-nginx name: my-nginx
labels: labels:
run: my-nginx run: my-nginx
spec: spec:
type: NodePort type: NodePort
ports: ports:
- port: 8080 - port: 8080
targetPort: 80 targetPort: 80
protocol: TCP protocol: TCP
name: http name: http
- port: 443 - port: 443
protocol: TCP protocol: TCP
name: https name: https
selector: selector:
run: my-nginx run: my-nginx
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: my-nginx name: my-nginx
spec: spec:
selector: selector:
matchLabels: matchLabels:
run: my-nginx run: my-nginx
replicas: 1 replicas: 1
template: template:
metadata: metadata:
labels: labels:
run: my-nginx run: my-nginx
spec: spec:
volumes: volumes:
- name: secret-volume - name: secret-volume
secret: secret:
secretName: nginxsecret secretName: nginxsecret
- name: configmap-volume - name: configmap-volume
configMap: configMap:
name: nginxconfigmap name: nginxconfigmap
containers: containers:
- name: nginxhttps - name: nginxhttps
image: bprashanth/nginxhttps:1.0 image: bprashanth/nginxhttps:1.0
ports: ports:
- containerPort: 443 - containerPort: 443
- containerPort: 80 - containerPort: 80
volumeMounts: volumeMounts:
- mountPath: /etc/nginx/ssl - mountPath: /etc/nginx/ssl
name: secret-volume name: secret-volume
- mountPath: /etc/nginx/conf.d - mountPath: /etc/nginx/conf.d
name: configmap-volume name: configmap-volume
+20 -20
View File
@@ -1,20 +1,20 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: my-empty-dir-pod name: my-empty-dir-pod
spec: spec:
containers: containers:
- image: microsoft/windowsservercore:1709 - image: microsoft/windowsservercore:1709
name: my-empty-dir-pod name: my-empty-dir-pod
volumeMounts: volumeMounts:
- mountPath: /cache - mountPath: /cache
name: cache-volume name: cache-volume
- mountPath: C:/scratch - mountPath: C:/scratch
name: scratch-volume name: scratch-volume
volumes: volumes:
- name: cache-volume - name: cache-volume
emptyDir: {} emptyDir: {}
- name: scratch-volume - name: scratch-volume
emptyDir: {} emptyDir: {}
nodeSelector: nodeSelector:
beta.kubernetes.io/os: windows beta.kubernetes.io/os: windows
@@ -1,17 +1,17 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: run-as-username-container-demo name: run-as-username-container-demo
spec: spec:
securityContext: securityContext:
windowsOptions: windowsOptions:
runAsUserName: "ContainerUser" runAsUserName: "ContainerUser"
containers: containers:
- name: run-as-username-demo - name: run-as-username-demo
image: mcr.microsoft.com/windows/servercore:ltsc2019 image: mcr.microsoft.com/windows/servercore:ltsc2019
command: ["ping", "-t", "localhost"] command: ["ping", "-t", "localhost"]
securityContext: securityContext:
windowsOptions: windowsOptions:
runAsUserName: "ContainerAdministrator" runAsUserName: "ContainerAdministrator"
nodeSelector: nodeSelector:
kubernetes.io/os: windows kubernetes.io/os: windows
@@ -1,14 +1,14 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: run-as-username-pod-demo name: run-as-username-pod-demo
spec: spec:
securityContext: securityContext:
windowsOptions: windowsOptions:
runAsUserName: "ContainerUser" runAsUserName: "ContainerUser"
containers: containers:
- name: run-as-username-demo - name: run-as-username-demo
image: mcr.microsoft.com/windows/servercore:ltsc2019 image: mcr.microsoft.com/windows/servercore:ltsc2019
command: ["ping", "-t", "localhost"] command: ["ping", "-t", "localhost"]
nodeSelector: nodeSelector:
kubernetes.io/os: windows kubernetes.io/os: windows