From 8ed0cba97b5dfd8617d257bc6bbf6521edd5a3ae Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 22 Sep 2020 06:32:58 -0700 Subject: [PATCH 1/5] Remove ill placed wait for issuer --- deploy/deploy.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 40e3121..1ee80fd 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -58,7 +58,6 @@ EOF helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml -f $DEPLOY_DIR/values-step-2.yaml > generated-values.yaml helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml wait_for kubectl get Issuer -n kube-system kubezero-local-ca-issuer 2>/dev/null 1>&2 - wait_for kubectl get ClusterIssuer letsencrypt-dns-prod 2>/dev/null 1>&2 kubectl wait --for=condition=Ready -n kube-system Issuer/kubezero-local-ca-issuer fi -- 2.40.1 From 0b50dbcfbee0f8f63c5712fa269bae554d66c35f Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 28 Sep 2020 04:45:39 -0700 Subject: [PATCH 2/5] Reenable fluentd ingest pipeline again --- charts/kubezero-logging/Chart.yaml | 2 +- charts/kubezero-logging/values.yaml | 3 +-- deploy/deploy.sh | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index 2b1da0d..28e04a1 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.3.6 +version: 0.3.7 appVersion: 1.2.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 3f0f51d..1ae05f1 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -128,8 +128,7 @@ fluentd: remove_keys id # KubeZero pipeline incl. GeoIP etc. - # Freaking ES jams under load and all is lost ... - # pipeline fluentd + pipeline fluentd host "#{ENV['OUTPUT_HOST']}" port "#{ENV['OUTPUT_PORT']}" diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 1ee80fd..2ac91f7 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -2,6 +2,7 @@ set -e DEPLOY_DIR=$( dirname $( realpath $0 )) +which yq || { echo "yq not found!"; exit 1; } # Waits for max 300s and retries function wait_for() { @@ -31,13 +32,15 @@ else _argo_date="$(date -u --iso-8601=seconds)" _argo_passwd="$($DEPLOY_DIR/argocd_password.py)" - cat <> values.yaml + cat < _argocd_values.yaml +argo-cd: configs: secret: # ArgoCD password: ${_argo_passwd%%:*} Please move to secure location ! argocdServerAdminPassword: "${_argo_passwd##*:}" argocdServerAdminPasswordMtime: "$_argo_date" EOF + yq merge -i --overwrite values.yaml _argocd_values.yaml && rm -f _argocd_values.yaml fi # Deploy initial argocd -- 2.40.1 From 6003765dc9d57aaadc62444b963c1a3720146f19 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 28 Sep 2020 04:54:47 -0700 Subject: [PATCH 3/5] Disable pipeline still cpu issues --- charts/kubezero-logging/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 1ae05f1..9750893 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -128,7 +128,7 @@ fluentd: remove_keys id # KubeZero pipeline incl. GeoIP etc. - pipeline fluentd + # pipeline fluentd host "#{ENV['OUTPUT_HOST']}" port "#{ENV['OUTPUT_PORT']}" -- 2.40.1 From 21c6b0ea58ef8f61605da15e614613d46cea3e10 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 1 Oct 2020 10:11:48 -0700 Subject: [PATCH 4/5] Fluentd tuning --- charts/kubezero-logging/Chart.yaml | 2 +- charts/kubezero-logging/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index 28e04a1..b6cf4a6 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.3.7 +version: 0.3.8 appVersion: 1.2.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 9750893..5a5bd41 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -108,6 +108,7 @@ fluentd: port 24224 bind 0.0.0.0 skip_invalid_event true + send_keepalive_packet true cert_path /mnt/fluentd-certs/tls.crt private_key_path /mnt/fluentd-certs/tls.key @@ -145,8 +146,8 @@ fluentd: request_timeout 15s suppress_type_name true - - @type file + + @type file_single path /var/log/fluentd-buffers/kubernetes.system.buffer flush_mode interval flush_thread_count 2 @@ -154,7 +155,6 @@ fluentd: flush_at_shutdown true retry_type exponential_backoff retry_timeout 60m - chunk_limit_size 16M overflow_action drop_oldest_chunk -- 2.40.1 From c6ae3d2461458be32de4d35d219e07e2f8c2410c Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 1 Oct 2020 10:14:04 -0700 Subject: [PATCH 5/5] Fluentd tuning --- charts/kubezero-logging/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 5a5bd41..47b21f3 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -108,7 +108,8 @@ fluentd: port 24224 bind 0.0.0.0 skip_invalid_event true - send_keepalive_packet true + # Only for TCP not TLS + # send_keepalive_packet true cert_path /mnt/fluentd-certs/tls.crt private_key_path /mnt/fluentd-certs/tls.key -- 2.40.1