Merge pull request #68004 from saravanan30erd/fluentd-es

isolate logging resources in separate namespace
This commit is contained in:
Kubernetes Prow Robot 2021-04-08 14:26:31 -07:00 committed by GitHub
commit d8f3794b83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 21 deletions

View File

@ -0,0 +1,8 @@
kind: Namespace
apiVersion: v1
metadata:
name: logging
labels:
k8s-app: logging
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile

View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: elasticsearch-logging name: elasticsearch-logging
namespace: kube-system namespace: logging
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"

View File

@ -3,7 +3,7 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: elasticsearch-logging name: elasticsearch-logging
namespace: kube-system namespace: logging
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
@ -28,7 +28,6 @@ rules:
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
namespace: kube-system
name: elasticsearch-logging name: elasticsearch-logging
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
@ -36,7 +35,7 @@ metadata:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: elasticsearch-logging name: elasticsearch-logging
namespace: kube-system namespace: logging
apiGroup: "" apiGroup: ""
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
@ -48,10 +47,10 @@ apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: elasticsearch-logging name: elasticsearch-logging
namespace: kube-system namespace: logging
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v7.4.3 version: v7.4.4
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
serviceName: elasticsearch-logging serviceName: elasticsearch-logging
@ -59,12 +58,12 @@ spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v7.4.3 version: v7.4.4
template: template:
metadata: metadata:
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v7.4.3 version: v7.4.4
spec: spec:
serviceAccountName: elasticsearch-logging serviceAccountName: elasticsearch-logging
containers: containers:

View File

@ -1,8 +1,8 @@
kind: ConfigMap kind: ConfigMap
apiVersion: v1 apiVersion: v1
metadata: metadata:
name: fluentd-es-config-v0.2.0 name: fluentd-es-config-v0.2.1
namespace: kube-system namespace: logging
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
data: data:

View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: fluentd-es name: fluentd-es
namespace: kube-system namespace: logging
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
@ -35,7 +35,7 @@ metadata:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: fluentd-es name: fluentd-es
namespace: kube-system namespace: logging
apiGroup: "" apiGroup: ""
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
@ -45,22 +45,22 @@ roleRef:
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-es-v3.1.0 name: fluentd-es-v3.1.1
namespace: kube-system namespace: logging
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v3.1.0 version: v3.1.1
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v3.1.0 version: v3.1.1
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v3.1.0 version: v3.1.1
spec: spec:
securityContext: securityContext:
seccompProfile: seccompProfile:
@ -111,4 +111,4 @@ spec:
path: /var/lib/docker/containers path: /var/lib/docker/containers
- name: config-volume - name: config-volume
configMap: configMap:
name: fluentd-es-config-v0.2.0 name: fluentd-es-config-v0.2.1

View File

@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: kibana-logging name: kibana-logging
namespace: kube-system namespace: logging
labels: labels:
k8s-app: kibana-logging k8s-app: kibana-logging
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
@ -34,7 +34,7 @@ spec:
- name: SERVER_NAME - name: SERVER_NAME
value: kibana-logging value: kibana-logging
- name: SERVER_BASEPATH - name: SERVER_BASEPATH
value: /api/v1/namespaces/kube-system/services/kibana-logging/proxy value: /api/v1/namespaces/logging/services/kibana-logging/proxy
- name: SERVER_REWRITEBASEPATH - name: SERVER_REWRITEBASEPATH
value: "false" value: "false"
ports: ports:

View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: kibana-logging name: kibana-logging
namespace: kube-system namespace: logging
labels: labels:
k8s-app: kibana-logging k8s-app: kibana-logging
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"