Fix container images after sed, fix sysctl.

StamusNetworks · Mar 14, 2022 · 6ab8b45 · 6ab8b45
1 parent a9b2381
commit 6ab8b45
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/kubernetes/elasticsearch/elasticsearch-statefulset.yaml b/kubernetes/elasticsearch/elasticsearch-statefulset.yaml
@@ -47,7 +47,7 @@ spec:
         securityContext:
           runAsUser: 0
           privileged: true
-        image: "docker.elastic.co/elasticsearch.logging:7.16.3"
+        image: "docker.elastic.co/elasticsearch/elasticsearch:7.16.3"
         imagePullPolicy: "IfNotPresent"
         command: ["bash","-c"]
         args:
@@ -82,7 +82,7 @@ spec:
 
       containers:
       - name: elasticsearch
-        image: "docker.elastic.co/elasticsearch.logging:7.16.3"
+        image: "docker.elastic.co/elasticsearch/elasticsearch:7.16.3"
         env:
         - name: cluster.name
           value: elasticsearch.cluster.local

diff --git a/kubernetes/fluentd_fluent-bit/fluentd-deployment.yaml b/kubernetes/fluentd_fluent-bit/fluentd-deployment.yaml
@@ -20,19 +20,35 @@ spec:
         securityContext:
           runAsUser: 0
           privileged: true
-        image: "docker.elastic.co/elasticsearch.logging:7.16.3"
+        image: "docker.io/bitnami/minideb:buster"
         imagePullPolicy: "IfNotPresent"
         command: ["bash","-c"]
         args:
           - |
+            set -o errexit
+            set -o pipefail
+            set -o nounset
+
+            if ! [ -x "$(command -v sysctl)" ]; then
+              echo 'sysctl not installed. Installing it...'
+              distro=$(awk -F= '/^ID=/{print $2}' /etc/os-release | tr -d '"')
+              case $distro in
+                ol | centos)
+                  yum install -y procps
+                  rm -rf /var/cache/yum;;
+                ubuntu | debian)
+                  apt-get update -qq && apt-get install -y --no-install-recommends procps
+                  rm -rf /var/lib/apt/lists /var/cache/apt/archives;;
+              esac
+            fi
+
             sysctl -w fs.file-max=65536
-            sysctl -w fs.protected_hardlinks = 1
-            sysctl -w fs.protected_symlinks = 1
+            sysctl -w fs.protected_hardlinks=1
+            sysctl -w fs.protected_symlinks=1
 
       containers:
       - name: fluentd
         image: fluent/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-amd64-1.1
-        # image: jeroen-XPS-13-9370/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-amd64-1.1
 
         ports:
           - name: fluent-bit