diff --git a/cluster/addons/fluentd-elasticsearch/create-logging-namespace.yaml b/cluster/addons/fluentd-elasticsearch/create-logging-namespace.yaml new file mode 100644 index 00000000000..5321cb32754 --- /dev/null +++ b/cluster/addons/fluentd-elasticsearch/create-logging-namespace.yaml @@ -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 diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml index 7f947d7fda5..81bdfa555b0 100644 --- a/cluster/addons/fluentd-elasticsearch/es-service.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: elasticsearch-logging - namespace: kube-system + namespace: logging labels: k8s-app: elasticsearch-logging kubernetes.io/cluster-service: "true" diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index cec71ffebea..0849247188b 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: elasticsearch-logging - namespace: kube-system + namespace: logging labels: k8s-app: elasticsearch-logging addonmanager.kubernetes.io/mode: Reconcile @@ -28,7 +28,6 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - namespace: kube-system name: elasticsearch-logging labels: k8s-app: elasticsearch-logging @@ -36,7 +35,7 @@ metadata: subjects: - kind: ServiceAccount name: elasticsearch-logging - namespace: kube-system + namespace: logging apiGroup: "" roleRef: kind: ClusterRole @@ -48,10 +47,10 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: elasticsearch-logging - namespace: kube-system + namespace: logging labels: k8s-app: elasticsearch-logging - version: v7.4.3 + version: v7.4.4 addonmanager.kubernetes.io/mode: Reconcile spec: serviceName: elasticsearch-logging @@ -59,12 +58,12 @@ spec: selector: matchLabels: k8s-app: elasticsearch-logging - version: v7.4.3 + version: v7.4.4 template: metadata: labels: k8s-app: elasticsearch-logging - version: v7.4.3 + version: v7.4.4 spec: serviceAccountName: elasticsearch-logging containers: diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml index bae130ffa63..4836a141516 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml @@ -1,8 +1,8 @@ kind: ConfigMap apiVersion: v1 metadata: - name: fluentd-es-config-v0.2.0 - namespace: kube-system + name: fluentd-es-config-v0.2.1 + namespace: logging labels: addonmanager.kubernetes.io/mode: Reconcile data: diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 06a78cdc6d0..3af407f03dc 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: fluentd-es - namespace: kube-system + namespace: logging labels: k8s-app: fluentd-es addonmanager.kubernetes.io/mode: Reconcile @@ -35,7 +35,7 @@ metadata: subjects: - kind: ServiceAccount name: fluentd-es - namespace: kube-system + namespace: logging apiGroup: "" roleRef: kind: ClusterRole @@ -45,22 +45,22 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v3.1.0 - namespace: kube-system + name: fluentd-es-v3.1.1 + namespace: logging labels: k8s-app: fluentd-es - version: v3.1.0 + version: v3.1.1 addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v3.1.0 + version: v3.1.1 template: metadata: labels: k8s-app: fluentd-es - version: v3.1.0 + version: v3.1.1 spec: securityContext: seccompProfile: @@ -111,4 +111,4 @@ spec: path: /var/lib/docker/containers - name: config-volume configMap: - name: fluentd-es-config-v0.2.0 + name: fluentd-es-config-v0.2.1 diff --git a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml index 0d7a2818bc6..6a82f02b5ef 100644 --- a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml +++ b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kibana-logging - namespace: kube-system + namespace: logging labels: k8s-app: kibana-logging addonmanager.kubernetes.io/mode: Reconcile @@ -34,7 +34,7 @@ spec: - name: SERVER_NAME value: kibana-logging - 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 value: "false" ports: diff --git a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml index d241ef728de..25cc9b0a387 100644 --- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml +++ b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: kibana-logging - namespace: kube-system + namespace: logging labels: k8s-app: kibana-logging kubernetes.io/cluster-service: "true"