From f8f2dd76cafd1d2f024a7f9c8ec065099d862636 Mon Sep 17 00:00:00 2001 From: saravanan palanisamy Date: Sat, 13 Mar 2021 13:42:32 +0400 Subject: [PATCH 1/3] isolate logging resources in separate namespace --- .../fluentd-elasticsearch/create-logging-namespace.yaml | 8 ++++++++ cluster/addons/fluentd-elasticsearch/es-service.yaml | 2 +- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 8 ++++---- .../fluentd-elasticsearch/fluentd-es-configmap.yaml | 2 +- cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 6 +++--- .../addons/fluentd-elasticsearch/kibana-deployment.yaml | 4 ++-- cluster/addons/fluentd-elasticsearch/kibana-service.yaml | 2 +- 7 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 cluster/addons/fluentd-elasticsearch/create-logging-namespace.yaml 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..67bf0a7e887 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,7 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - namespace: kube-system + namespace: logging name: elasticsearch-logging labels: k8s-app: elasticsearch-logging @@ -36,7 +36,7 @@ metadata: subjects: - kind: ServiceAccount name: elasticsearch-logging - namespace: kube-system + namespace: logging apiGroup: "" roleRef: kind: ClusterRole @@ -48,7 +48,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: elasticsearch-logging - namespace: kube-system + namespace: logging labels: k8s-app: elasticsearch-logging version: v7.4.3 diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml index bae130ffa63..ad4dd6eddfd 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml @@ -2,7 +2,7 @@ kind: ConfigMap apiVersion: v1 metadata: name: fluentd-es-config-v0.2.0 - namespace: kube-system + 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..29ca1057260 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 @@ -46,7 +46,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: fluentd-es-v3.1.0 - namespace: kube-system + namespace: logging labels: k8s-app: fluentd-es version: v3.1.0 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" From f0a95b80b301fec9c7268cf7203520d017a943ec Mon Sep 17 00:00:00 2001 From: saravanan palanisamy Date: Tue, 16 Mar 2021 09:39:14 +0400 Subject: [PATCH 2/3] update version for addon fluentd ES --- .../addons/fluentd-elasticsearch/es-statefulset.yaml | 6 +++--- .../fluentd-elasticsearch/fluentd-es-configmap.yaml | 2 +- .../addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index 67bf0a7e887..d64e8fe6ef0 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -51,7 +51,7 @@ metadata: 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 +59,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 ad4dd6eddfd..4836a141516 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml @@ -1,7 +1,7 @@ kind: ConfigMap apiVersion: v1 metadata: - name: fluentd-es-config-v0.2.0 + name: fluentd-es-config-v0.2.1 namespace: logging labels: addonmanager.kubernetes.io/mode: Reconcile diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 29ca1057260..3af407f03dc 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -45,22 +45,22 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v3.1.0 + 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 From b9696ae4558e2378df8d26cd28bf3f50a4926c5f Mon Sep 17 00:00:00 2001 From: saravanan palanisamy Date: Fri, 19 Mar 2021 12:08:14 +0400 Subject: [PATCH 3/3] remove namespace for clusterRoleBinding object - fluentd-es addon --- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index d64e8fe6ef0..0849247188b 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -28,7 +28,6 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - namespace: logging name: elasticsearch-logging labels: k8s-app: elasticsearch-logging