From 524d0c67e0658a06c8a19f8771c9ba909eebc570 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 13:03:08 +0100 Subject: [PATCH 001/129] bao audit enable file file_path=stdout --- .gitignore | 1 + template/stacks/ref-implementation/openbao/values.yaml | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e9f885c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.history diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 0ff72cf..767db5a 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -13,5 +13,6 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt rm /tmp/init.txt + bao audit enable file file_path=stdout ui: enabled: true -- 2.45.2 From bc90465579a2072e4f4d54c1310def1d4db20ab5 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 13:15:19 +0100 Subject: [PATCH 002/129] echos for testing --- template/stacks/ref-implementation/openbao/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 767db5a..f4320c4 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -13,6 +13,7 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt rm /tmp/init.txt - bao audit enable file file_path=stdout + echo "usealed 👍" + echo bao audit enable file file_path=stdout ui: enabled: true -- 2.45.2 From 5518e9e2d709c1f30c7b3ee89823d41535b4d411 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 13:24:44 +0100 Subject: [PATCH 003/129] echo deleted --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index f4320c4..e7392c5 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -14,6 +14,6 @@ server: echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt rm /tmp/init.txt echo "usealed 👍" - echo bao audit enable file file_path=stdout + bao audit enable file file_path=stdout ui: enabled: true -- 2.45.2 From 3dd9b7a544c357f926235dcafdaad9ea90f209ed Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 13:52:29 +0100 Subject: [PATCH 004/129] rm /tmp/init.txt moved a few lines down --- template/stacks/ref-implementation/openbao/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e7392c5..5d00cd1 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -12,8 +12,10 @@ server: echo $(grep "Unseal Key 3:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key3.txt echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt - rm /tmp/init.txt echo "usealed 👍" + bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') + echo "logged in 🥷" bao audit enable file file_path=stdout + rm /tmp/init.txt ui: enabled: true -- 2.45.2 From a4502f2ecb8a98dbd62f177e74e9eb313a72851c Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 14:01:45 +0100 Subject: [PATCH 005/129] provisional solution for the shipping done --- template/stacks/ref-implementation/openbao/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 5d00cd1..fd12825 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -12,9 +12,7 @@ server: echo $(grep "Unseal Key 3:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key3.txt echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt - echo "usealed 👍" bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - echo "logged in 🥷" bao audit enable file file_path=stdout rm /tmp/init.txt ui: -- 2.45.2 From 83e1215d7da8c97135d8fcbfd384958287c8cc6a Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 15:09:06 +0100 Subject: [PATCH 006/129] adding a side-car logging container for openbao --- .idea/workspace.xml | 94 +++++++++++++++++++ .../stacks/ref-implementation/openbao.yaml | 8 +- .../openbao/logging-values.yaml | 30 ++++++ 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml create mode 100644 template/stacks/ref-implementation/openbao/logging-values.yaml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..61985ee --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1741874334984 + + + + + + + true + + \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index ffc2923..f41598b 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -23,7 +23,13 @@ spec: targetRevision: HEAD helm: valueFiles: - - $values/stacks/ref-implementation/openbao/values.yaml + - $values/stacks/ref-implementation/openbao/values.yaml + - repoURL: https://github.com/grafana/alloy.git + path: charts/openbao + targetRevision: HEAD + helm: + valueFiles: + - $values/stacks/ref-implementation/openbao/logging-values.yaml - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/ref-implementation/openbao/logging-values.yaml b/template/stacks/ref-implementation/openbao/logging-values.yaml new file mode 100644 index 0000000..5eecd5a --- /dev/null +++ b/template/stacks/ref-implementation/openbao/logging-values.yaml @@ -0,0 +1,30 @@ +alloy: + create: false + name: alloy-config + key: config.alloy + + uiPathPrefix: "/alloy" + + configMap: + content: |- + + logging { + level = "info" + format = "logfmt" + } + + loki.write "local_loki" { + endpoint { + url = "http://loki-loki-distributed-gateway/loki/api/v1/push" + } + } + + local.file_match "applogs" { + path_targets = [{"__path__" = "/tmp/alloy/*"}] + sync_period = "2s" + } + + loki.source.file "local_files" { + targets = local.file_match.applogs.targets + forward_to = [loki.write.local_loki.receiver] + } -- 2.45.2 From 48a28127ce2d8ba457147d82ec77b6468ee6d3da Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 15:14:39 +0100 Subject: [PATCH 007/129] testing --- template/stacks/ref-implementation/openbao.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index f41598b..965ff68 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -18,12 +18,12 @@ spec: name: in-cluster namespace: openbao sources: - - repoURL: https://github.com/openbao/openbao-helm.git - path: charts/openbao - targetRevision: HEAD - helm: - valueFiles: - - $values/stacks/ref-implementation/openbao/values.yaml + # - repoURL: https://github.com/openbao/openbao-helm.git + # path: charts/openbao + # targetRevision: HEAD + # helm: + # valueFiles: + # - $values/stacks/ref-implementation/openbao/values.yaml - repoURL: https://github.com/grafana/alloy.git path: charts/openbao targetRevision: HEAD -- 2.45.2 From de8dc94e2838c5a960227f5ee25da85e48d4b895 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 15:16:02 +0100 Subject: [PATCH 008/129] operations/helm/charts/alloy path fixed --- template/stacks/ref-implementation/openbao.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index 965ff68..799001b 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -18,15 +18,15 @@ spec: name: in-cluster namespace: openbao sources: - # - repoURL: https://github.com/openbao/openbao-helm.git - # path: charts/openbao - # targetRevision: HEAD - # helm: - # valueFiles: - # - $values/stacks/ref-implementation/openbao/values.yaml - - repoURL: https://github.com/grafana/alloy.git + - repoURL: https://github.com/openbao/openbao-helm.git path: charts/openbao targetRevision: HEAD + helm: + valueFiles: + - $values/stacks/ref-implementation/openbao/values.yaml + - repoURL: https://github.com/grafana/alloy.git + path: operations/helm/charts/alloy + targetRevision: HEAD helm: valueFiles: - $values/stacks/ref-implementation/openbao/logging-values.yaml -- 2.45.2 From 29d4ca9fe69c1a93f2c6d9972efe5aadb3ba2ce1 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 13 Mar 2025 15:50:17 +0100 Subject: [PATCH 009/129] removing alloy as a separate pod in the same namespace --- .../stacks/ref-implementation/openbao.yaml | 6 ---- .../openbao/logging-values.yaml | 30 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 template/stacks/ref-implementation/openbao/logging-values.yaml diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index 799001b..8e286d9 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -24,12 +24,6 @@ spec: helm: valueFiles: - $values/stacks/ref-implementation/openbao/values.yaml - - repoURL: https://github.com/grafana/alloy.git - path: operations/helm/charts/alloy - targetRevision: HEAD - helm: - valueFiles: - - $values/stacks/ref-implementation/openbao/logging-values.yaml - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/ref-implementation/openbao/logging-values.yaml b/template/stacks/ref-implementation/openbao/logging-values.yaml deleted file mode 100644 index 5eecd5a..0000000 --- a/template/stacks/ref-implementation/openbao/logging-values.yaml +++ /dev/null @@ -1,30 +0,0 @@ -alloy: - create: false - name: alloy-config - key: config.alloy - - uiPathPrefix: "/alloy" - - configMap: - content: |- - - logging { - level = "info" - format = "logfmt" - } - - loki.write "local_loki" { - endpoint { - url = "http://loki-loki-distributed-gateway/loki/api/v1/push" - } - } - - local.file_match "applogs" { - path_targets = [{"__path__" = "/tmp/alloy/*"}] - sync_period = "2s" - } - - loki.source.file "local_files" { - targets = local.file_match.applogs.targets - forward_to = [loki.write.local_loki.receiver] - } -- 2.45.2 From e2ad485759774414d02defb3e1d69f604b968b64 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 12:55:46 +0100 Subject: [PATCH 010/129] sidecar container added --- .../stacks/ref-implementation/openbao.yaml | 35 +++++++++++++++++++ .../ref-implementation/openbao/values.yaml | 19 +++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index 8e286d9..24bbd6f 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -32,3 +32,38 @@ spec: kind: MutatingWebhookConfiguration jqPathExpressions: - .webhooks[]?.clientConfig.caBundle + +--- + +apiVersion: v1 +kind: ConfigMap +metadata: + name: sidecar-container-alloy-config +data: + config.yaml: | + logging { + level = "info" + format = "logfmt" + } + + loki.write "local_loki" { + endpoint { + url = "http://loki-loki-distributed-gateway/loki/api/v1/push" + } + } + + discovery.kubernetes "pod" { + role = "pod" + } + + discovery.relabel "openbao_pod_logs" { + targets = discovery.kubernetes.pod.targets + + rule { + source_labels = ["__meta_kubernetes_pod_name"] + action = "keep" + regex = "openbao-0" + } + + forward_to = [loki.write.local_loki.receiver] + } diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index fd12825..3b2a205 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,4 +1,21 @@ server: + extraContainers: + - name: grafana-alloy + image: grafana/alloy:latest + ports: + - containerPort: 12345 + volumeMounts: + - name: sidecar-container-alloy-config + mountPath: /etc/alloy + subPath: config.yaml + args: + - --config.file=/etc/alloy/config.yaml + + extraVolumes: + - name: sidecar-container-alloy-config + configMap: + name: sidecar-container-alloy-config + postStart: - sh - -c @@ -16,4 +33,4 @@ server: bao audit enable file file_path=stdout rm /tmp/init.txt ui: - enabled: true + enabled: true \ No newline at end of file -- 2.45.2 From f1d940561d03129280e41a609d8bf137ef31ac5e Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 13:15:47 +0100 Subject: [PATCH 011/129] adjustment of openbao.ymal --- template/stacks/ref-implementation/openbao.yaml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index 24bbd6f..d65c7d5 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -52,18 +52,3 @@ data: } } - discovery.kubernetes "pod" { - role = "pod" - } - - discovery.relabel "openbao_pod_logs" { - targets = discovery.kubernetes.pod.targets - - rule { - source_labels = ["__meta_kubernetes_pod_name"] - action = "keep" - regex = "openbao-0" - } - - forward_to = [loki.write.local_loki.receiver] - } -- 2.45.2 From 4b553dd2587a4c8ff610c64a058f4b580d68b21f Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 13:31:43 +0100 Subject: [PATCH 012/129] config map separately --- .../stacks/ref-implementation/openbao.yaml | 20 ------------ .../sidecar-container-alloy-configmap.yaml | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 template/stacks/ref-implementation/openbao/sidecar-container-alloy-configmap.yaml diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index d65c7d5..8e286d9 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -32,23 +32,3 @@ spec: kind: MutatingWebhookConfiguration jqPathExpressions: - .webhooks[]?.clientConfig.caBundle - ---- - -apiVersion: v1 -kind: ConfigMap -metadata: - name: sidecar-container-alloy-config -data: - config.yaml: | - logging { - level = "info" - format = "logfmt" - } - - loki.write "local_loki" { - endpoint { - url = "http://loki-loki-distributed-gateway/loki/api/v1/push" - } - } - diff --git a/template/stacks/ref-implementation/openbao/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao/sidecar-container-alloy-configmap.yaml new file mode 100644 index 0000000..9a62c3f --- /dev/null +++ b/template/stacks/ref-implementation/openbao/sidecar-container-alloy-configmap.yaml @@ -0,0 +1,32 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: sidecar-container-alloy-config +data: + config.yaml: | + logging { + level = "info" + format = "logfmt" + } + + loki.write "local_loki" { + endpoint { + url = "http://loki-loki-distributed-gateway/loki/api/v1/push" + } + } + + discovery.kubernetes "pod" { + role = "pod" + } + + discovery.relabel "openbao_pod_logs" { + targets = discovery.kubernetes.pod.targets + + rule { + source_labels = ["__meta_kubernetes_pod_name"] + action = "keep" + regex = "openbao-0" + } + + forward_to = [loki.write.local_loki.receiver] + } \ No newline at end of file -- 2.45.2 From 3eec895f67c3179895b34471bfdfc70407b5f7e0 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 13:46:53 +0100 Subject: [PATCH 013/129] test --- .../ref-implementation/openbao/values.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 3b2a205..33d6820 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,20 +1,20 @@ server: - extraContainers: - - name: grafana-alloy - image: grafana/alloy:latest - ports: - - containerPort: 12345 - volumeMounts: - - name: sidecar-container-alloy-config - mountPath: /etc/alloy - subPath: config.yaml - args: - - --config.file=/etc/alloy/config.yaml + # extraContainers: + # - name: grafana-alloy + # image: grafana/alloy:latest + # ports: + # - containerPort: 12345 + # volumeMounts: + # - name: sidecar-container-alloy-config + # mountPath: /etc/alloy + # subPath: config.yaml + # args: + # - --config.file=/etc/alloy/config.yaml - extraVolumes: - - name: sidecar-container-alloy-config - configMap: - name: sidecar-container-alloy-config + # extraVolumes: + # - name: sidecar-container-alloy-config + # configMap: + # name: sidecar-container-alloy-config postStart: - sh -- 2.45.2 From f873cd8aefdb5b3dc2c045365ca30292dfefb023 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:00:05 +0100 Subject: [PATCH 014/129] new directory for the configmap --- .../openbao-alloy-configmap.yaml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 template/stacks/ref-implementation/openbao-alloy-configmap.yaml diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap.yaml new file mode 100644 index 0000000..4c904e5 --- /dev/null +++ b/template/stacks/ref-implementation/openbao-alloy-configmap.yaml @@ -0,0 +1,29 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: openbao-alloy-configmap + namespace: argocd + labels: + env: dev + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder + targetRevision: HEAD + path: "stacks/ref.implementation/openabo/sidecar-container-alloy-configmap" + destination: + server: "https://kubernetes.default.svc" + namespace: openbao + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: + selfHeal: true + retry: + limit: -1 + backoff: + duration: 15s + factor: 1 + maxDuration: 15s -- 2.45.2 From 28904376475b7dc092070c93ceae557e3d3287c3 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:07:43 +0100 Subject: [PATCH 015/129] ref-implementation/openbao/sidecar-container-alloy-configmap --- template/stacks/ref-implementation/openbao-alloy-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap.yaml index 4c904e5..3c8cc4c 100644 --- a/template/stacks/ref-implementation/openbao-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-alloy-configmap.yaml @@ -12,7 +12,7 @@ spec: source: repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD - path: "stacks/ref.implementation/openabo/sidecar-container-alloy-configmap" + path: "stacks/ref-implementation/openbao/sidecar-container-alloy-configmap" destination: server: "https://kubernetes.default.svc" namespace: openbao -- 2.45.2 From deaed1bdccc23964b4b63c44e0ca44ffcd7e77c5 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:12:18 +0100 Subject: [PATCH 016/129] path: "stacks/ref-implementation/openbao-alloy-configmap" --- template/stacks/ref-implementation/openbao-alloy-configmap.yaml | 2 +- .../sidecar-container-alloy-configmap.yaml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename template/stacks/ref-implementation/{openbao => openbao-alloy-configmap}/sidecar-container-alloy-configmap.yaml (100%) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap.yaml index 3c8cc4c..9daa56a 100644 --- a/template/stacks/ref-implementation/openbao-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-alloy-configmap.yaml @@ -12,7 +12,7 @@ spec: source: repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD - path: "stacks/ref-implementation/openbao/sidecar-container-alloy-configmap" + path: "stacks/ref-implementation/openbao-alloy-configmap" destination: server: "https://kubernetes.default.svc" namespace: openbao diff --git a/template/stacks/ref-implementation/openbao/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml similarity index 100% rename from template/stacks/ref-implementation/openbao/sidecar-container-alloy-configmap.yaml rename to template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml -- 2.45.2 From 7b77d870c6598d1e167368f73744d0e5389e9006 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:17:13 +0100 Subject: [PATCH 017/129] extraVolumes: - name: sidecar-container-alloy-config configMap: name: sidecar-container-alloy-config --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 33d6820..35b2a20 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -11,10 +11,10 @@ server: # args: # - --config.file=/etc/alloy/config.yaml - # extraVolumes: - # - name: sidecar-container-alloy-config - # configMap: - # name: sidecar-container-alloy-config + extraVolumes: + - name: sidecar-container-alloy-config + configMap: + name: sidecar-container-alloy-config postStart: - sh -- 2.45.2 From f0632db48be729f0925459cd46877a6ba99bf266 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:23:11 +0100 Subject: [PATCH 018/129] extraContainers: - name: grafana-alloy image: grafana/alloy:latest ports: - containerPort: 12345 volumeMounts: - name: sidecar-container-alloy-config mountPath: /etc/alloy subPath: config.yaml args: - --config.file=/etc/alloy/config.yaml --- .../ref-implementation/openbao/values.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 35b2a20..0c77c5f 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,20 +1,20 @@ server: - # extraContainers: - # - name: grafana-alloy - # image: grafana/alloy:latest - # ports: - # - containerPort: 12345 - # volumeMounts: - # - name: sidecar-container-alloy-config - # mountPath: /etc/alloy - # subPath: config.yaml - # args: - # - --config.file=/etc/alloy/config.yaml + extraContainers: + - name: grafana-alloy + image: grafana/alloy:latest + ports: + - containerPort: 12345 + volumeMounts: + - name: sidecar-container-alloy-config + mountPath: /etc/alloy + subPath: config.yaml + args: + - --config.file=/etc/alloy/config.yaml - extraVolumes: - - name: sidecar-container-alloy-config - configMap: - name: sidecar-container-alloy-config + # extraVolumes: + # - name: sidecar-container-alloy-config + # configMap: + # name: sidecar-container-alloy-config postStart: - sh -- 2.45.2 From be1c3cee7a75438439a04ddf47793c03589e54f1 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:31:26 +0100 Subject: [PATCH 019/129] test --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 0c77c5f..5a9c951 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -11,10 +11,10 @@ server: args: - --config.file=/etc/alloy/config.yaml - # extraVolumes: - # - name: sidecar-container-alloy-config - # configMap: - # name: sidecar-container-alloy-config + extraVolumes: + - name: sidecar-container-alloy-config + configMap: + name: sidecar-container-alloy-config postStart: - sh -- 2.45.2 From 4e673f674d2a97ae813144b7117eaae9b222a18b Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:37:58 +0100 Subject: [PATCH 020/129] extraVolumes deprecated --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 5a9c951..519ac1c 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -11,7 +11,7 @@ server: args: - --config.file=/etc/alloy/config.yaml - extraVolumes: + volumes: - name: sidecar-container-alloy-config configMap: name: sidecar-container-alloy-config -- 2.45.2 From aeca6100f5234f1a2c8aefce643de8b2b54ee37a Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 14:49:33 +0100 Subject: [PATCH 021/129] /etc/alloy/config.yaml --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 519ac1c..3a55345 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -6,7 +6,7 @@ server: - containerPort: 12345 volumeMounts: - name: sidecar-container-alloy-config - mountPath: /etc/alloy + mountPath: /etc/alloy/config.yaml subPath: config.yaml args: - --config.file=/etc/alloy/config.yaml -- 2.45.2 From 27dc5966e9d3af637a2e11dc303760552a1e1ef8 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 15:05:10 +0100 Subject: [PATCH 022/129] # args: # - --config.file=/etc/alloy/config.yaml --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 3a55345..23fe45f 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -8,8 +8,8 @@ server: - name: sidecar-container-alloy-config mountPath: /etc/alloy/config.yaml subPath: config.yaml - args: - - --config.file=/etc/alloy/config.yaml + # args: + # - --config.file=/etc/alloy/config.yaml volumes: - name: sidecar-container-alloy-config -- 2.45.2 From 872c9dc8e539d44f3a8779ad666c7973ff2408dd Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 15:13:12 +0100 Subject: [PATCH 023/129] volumes: - name: alloy-data emptyDir: {} --- .../ref-implementation/openbao/values.yaml | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 23fe45f..4c2b294 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,20 +1,27 @@ server: extraContainers: - - name: grafana-alloy - image: grafana/alloy:latest - ports: - - containerPort: 12345 - volumeMounts: - - name: sidecar-container-alloy-config - mountPath: /etc/alloy/config.yaml - subPath: config.yaml + - name: grafana-alloy + image: grafana/alloy:latest + ports: + - containerPort: 12345 + # volumeMounts: + # - name: sidecar-container-alloy-config + # mountPath: /etc/alloy/config.yaml + # subPath: config.yaml # args: # - --config.file=/etc/alloy/config.yaml - + volumeMounts: + - name: alloy-data + mountPath: /var/lib/alloy/data + volumes: - - name: sidecar-container-alloy-config - configMap: - name: sidecar-container-alloy-config + - name: alloy-data + emptyDir: {} + + # volumes: + # - name: sidecar-container-alloy-config + # configMap: + # name: sidecar-container-alloy-config postStart: - sh -- 2.45.2 From c30cf9f380634ee7addb1f83b2f71a5179f1dc74 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 15:26:17 +0100 Subject: [PATCH 024/129] /tmp/alloy/data --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 4c2b294..8d025c1 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -12,7 +12,7 @@ server: # - --config.file=/etc/alloy/config.yaml volumeMounts: - name: alloy-data - mountPath: /var/lib/alloy/data + mountPath: /tmp/alloy/data volumes: - name: alloy-data -- 2.45.2 From 8617e200ea64f35af4940996c5748b1c34deb4c0 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 15:30:50 +0100 Subject: [PATCH 025/129] securityContext: runAsUser: 1000 fsGroup: 1000 --- template/stacks/ref-implementation/openbao/values.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 8d025c1..41e08cb 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -12,7 +12,10 @@ server: # - --config.file=/etc/alloy/config.yaml volumeMounts: - name: alloy-data - mountPath: /tmp/alloy/data + mountPath: /var/lib/alloy/data + securityContext: + runAsUser: 1000 + fsGroup: 1000 volumes: - name: alloy-data -- 2.45.2 From 46072b8f8185d2e69d5acbe71b64a120664741b5 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 15:34:43 +0100 Subject: [PATCH 026/129] runAsUser: 0 --- template/stacks/ref-implementation/openbao/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 41e08cb..74d85ec 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -14,8 +14,7 @@ server: - name: alloy-data mountPath: /var/lib/alloy/data securityContext: - runAsUser: 1000 - fsGroup: 1000 + runAsUser: 0 volumes: - name: alloy-data -- 2.45.2 From e993c274b014bff196675b8bcb4dbd4c6d201fe0 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 17 Mar 2025 15:41:18 +0100 Subject: [PATCH 027/129] runAsUser: 1000 # Run as non-root user fsGroup: 1000 --- template/stacks/ref-implementation/openbao/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 74d85ec..41e08cb 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -14,7 +14,8 @@ server: - name: alloy-data mountPath: /var/lib/alloy/data securityContext: - runAsUser: 0 + runAsUser: 1000 + fsGroup: 1000 volumes: - name: alloy-data -- 2.45.2 From 67876f18b993e4853e077368d8c4182edb821b89 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 11:39:10 +0100 Subject: [PATCH 028/129] runAsUser: 0 --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 41e08cb..6fae865 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -14,8 +14,8 @@ server: - name: alloy-data mountPath: /var/lib/alloy/data securityContext: - runAsUser: 1000 - fsGroup: 1000 + runAsUser: 0 + # fsGroup: 1000 volumes: - name: alloy-data -- 2.45.2 From 93fe631736c73842227c0735e5e77170f5a1e2c0 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 11:51:26 +0100 Subject: [PATCH 029/129] fsGroup: 1000 runAsGroup: 1000 runAsNonRoot: true runAsUser: 100 --- template/stacks/ref-implementation/openbao/values.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 6fae865..423abec 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -14,8 +14,10 @@ server: - name: alloy-data mountPath: /var/lib/alloy/data securityContext: - runAsUser: 0 - # fsGroup: 1000 + fsGroup: 1000 + runAsGroup: 1000 + runAsNonRoot: true + runAsUser: 100 volumes: - name: alloy-data -- 2.45.2 From 815f6a282252ec6a1fac59951fc8ef27fa08ab46 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 12:00:36 +0100 Subject: [PATCH 030/129] # volumeMounts: # - name: alloy-data # mountPath: /var/lib/alloy/data --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 423abec..14e859b 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -10,9 +10,9 @@ server: # subPath: config.yaml # args: # - --config.file=/etc/alloy/config.yaml - volumeMounts: - - name: alloy-data - mountPath: /var/lib/alloy/data + # volumeMounts: + # - name: alloy-data + # mountPath: /var/lib/alloy/data securityContext: fsGroup: 1000 runAsGroup: 1000 @@ -42,7 +42,7 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - bao audit enable file file_path=stdout + bao audit enable file file_path=/asdfsdf/sadfs.log rm /tmp/init.txt ui: enabled: true \ No newline at end of file -- 2.45.2 From b7de02d293da1b28b1fd74589a278fe2d3857193 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 12:04:53 +0100 Subject: [PATCH 031/129] # extraContainers: # - name: grafana-alloy # image: grafana/alloy:latest # ports: # - containerPort: 12345 --- .../ref-implementation/openbao/values.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 14e859b..734e5d7 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,9 +1,9 @@ server: - extraContainers: - - name: grafana-alloy - image: grafana/alloy:latest - ports: - - containerPort: 12345 + # extraContainers: + # - name: grafana-alloy + # image: grafana/alloy:latest + # ports: + # - containerPort: 12345 # volumeMounts: # - name: sidecar-container-alloy-config # mountPath: /etc/alloy/config.yaml @@ -13,11 +13,11 @@ server: # volumeMounts: # - name: alloy-data # mountPath: /var/lib/alloy/data - securityContext: - fsGroup: 1000 - runAsGroup: 1000 - runAsNonRoot: true - runAsUser: 100 + # securityContext: + # fsGroup: 1000 + # runAsGroup: 1000 + # runAsNonRoot: true + # runAsUser: 100 volumes: - name: alloy-data -- 2.45.2 From 43b172d8d429abb5677b5087ae7c10fb7ea9d004 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 12:14:27 +0100 Subject: [PATCH 032/129] user 0 --- .../ref-implementation/openbao/values.yaml | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 734e5d7..7452e1e 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,23 +1,20 @@ server: - # extraContainers: - # - name: grafana-alloy - # image: grafana/alloy:latest - # ports: - # - containerPort: 12345 + extraContainers: + - name: grafana-alloy + image: grafana/alloy:latest + ports: + - containerPort: 12345 # volumeMounts: # - name: sidecar-container-alloy-config # mountPath: /etc/alloy/config.yaml # subPath: config.yaml # args: # - --config.file=/etc/alloy/config.yaml - # volumeMounts: - # - name: alloy-data - # mountPath: /var/lib/alloy/data - # securityContext: - # fsGroup: 1000 - # runAsGroup: 1000 - # runAsNonRoot: true - # runAsUser: 100 + volumeMounts: + - name: alloy-data + mountPath: /var/lib/alloy/data + securityContext: + runAsUser: 0 volumes: - name: alloy-data -- 2.45.2 From 8db5e5950d0050b1416c1d6c66a4b5ccac707477 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 12:47:09 +0100 Subject: [PATCH 033/129] # volumeMounts: # - name: alloy-data # mountPath: /var/lib/alloy/data # securityContext: # runAsUser: 0 --- .../ref-implementation/openbao/values.yaml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 7452e1e..19a12cd 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -4,17 +4,11 @@ server: image: grafana/alloy:latest ports: - containerPort: 12345 - # volumeMounts: - # - name: sidecar-container-alloy-config - # mountPath: /etc/alloy/config.yaml - # subPath: config.yaml - # args: - # - --config.file=/etc/alloy/config.yaml - volumeMounts: - - name: alloy-data - mountPath: /var/lib/alloy/data - securityContext: - runAsUser: 0 + # volumeMounts: + # - name: alloy-data + # mountPath: /var/lib/alloy/data + # securityContext: + # runAsUser: 0 volumes: - name: alloy-data -- 2.45.2 From ef22f9e7be8658d52aa329a4311e2a22f06f1c9d Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 12:59:08 +0100 Subject: [PATCH 034/129] ["/bin/sh", "-c", "while kill -0 $(pidof main-container) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...'; sleep 20"] --- .../ref-implementation/openbao/values.yaml | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 19a12cd..aa996ce 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,24 +1,16 @@ server: extraContainers: - - name: grafana-alloy - image: grafana/alloy:latest - ports: - - containerPort: 12345 - # volumeMounts: - # - name: alloy-data - # mountPath: /var/lib/alloy/data - # securityContext: - # runAsUser: 0 + - name: log-sidecar + image: busybox + command: ["/bin/sh", "-c", "while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...'; sleep 20"] + volumeMounts: + - name: log-storage + mountPath: /var/log/ volumes: - - name: alloy-data + - name: log-storage emptyDir: {} - # volumes: - # - name: sidecar-container-alloy-config - # configMap: - # name: sidecar-container-alloy-config - postStart: - sh - -c -- 2.45.2 From 57779745e93db3640a31a24b088697a9fb6a95bf Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 13:12:09 +0100 Subject: [PATCH 035/129] curlimages/curl:latest --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index aa996ce..0e0817b 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,7 +1,7 @@ server: extraContainers: - name: log-sidecar - image: busybox + image: curlimages/curl:latest command: ["/bin/sh", "-c", "while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...'; sleep 20"] volumeMounts: - name: log-storage -- 2.45.2 From e4611e967e2e1661396e0ed94a855cc9f0e5296c Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 13:35:34 +0100 Subject: [PATCH 036/129] busybox --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 0e0817b..c3c7e6b 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,8 +1,8 @@ server: extraContainers: - name: log-sidecar - image: curlimages/curl:latest - command: ["/bin/sh", "-c", "while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...'; sleep 20"] + image: busybox + command: ["/bin/sh", "-c", "while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; sleep 20"] volumeMounts: - name: log-storage mountPath: /var/log/ -- 2.45.2 From bc189a53e0f14cb3973dea84f2de86459884e4d1 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 13:38:40 +0100 Subject: [PATCH 037/129] image: alpine:latest --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index c3c7e6b..56cc992 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,7 +1,7 @@ server: extraContainers: - name: log-sidecar - image: busybox + image: alpine:latest command: ["/bin/sh", "-c", "while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; sleep 20"] volumeMounts: - name: log-storage -- 2.45.2 From 46d6a22b65100bf32647992b0deac16576a17680 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 14:21:41 +0100 Subject: [PATCH 038/129] bao audit enable file file_path=/var/log/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 56cc992..b30fcf0 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -25,7 +25,7 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - bao audit enable file file_path=/asdfsdf/sadfs.log + bao audit enable file file_path=/var/log/openbao.log rm /tmp/init.txt ui: enabled: true \ No newline at end of file -- 2.45.2 From 52f484d463a9d28bb7f2277ebf4eb43d56e702de Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 14:28:14 +0100 Subject: [PATCH 039/129] touch /var/log/openbao.log chmod 644 /var/log/openbao.log chown openbao:openbao /var/1og/openbao_audit.log bao audit enable file file_path=/var/log/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index b30fcf0..346ea23 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -25,6 +25,9 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') + touch /var/log/openbao.log + chmod 644 /var/log/openbao.log + chown openbao:openbao /var/1og/openbao_audit.log bao audit enable file file_path=/var/log/openbao.log rm /tmp/init.txt ui: -- 2.45.2 From ac3988f9ace199707ebf19194972e0e324b43180 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 18 Mar 2025 14:34:59 +0100 Subject: [PATCH 040/129] touch /var/log/openbao.log chmod 644 /var/log/openbao.log chown openbao:openbao /var/1og/openbao_audit.log bao audit enable file file_path=/var/log/openbao.log removed --- template/stacks/ref-implementation/openbao/values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 346ea23..7d11d0b 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -25,10 +25,6 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - touch /var/log/openbao.log - chmod 644 /var/log/openbao.log - chown openbao:openbao /var/1og/openbao_audit.log - bao audit enable file file_path=/var/log/openbao.log rm /tmp/init.txt ui: enabled: true \ No newline at end of file -- 2.45.2 From abdbcff9fd78b5fcedb8270b718808bbbb1731c5 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 10:18:19 +0100 Subject: [PATCH 041/129] while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; sleep 20; echo 'Sidecar exiting.'; exit 1; --- template/stacks/ref-implementation/openbao/values.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 7d11d0b..64059da 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -2,7 +2,13 @@ server: extraContainers: - name: log-sidecar image: alpine:latest - command: ["/bin/sh", "-c", "while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; sleep 20"] + command: ["/bin/sh", "-c", " + while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; + echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; + sleep 20; + echo 'Sidecar exiting.'; + exit 1; + "] volumeMounts: - name: log-storage mountPath: /var/log/ -- 2.45.2 From 1c71f8555d0709d54e1a8d7f05c5cc9530716d2a Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 10:25:44 +0100 Subject: [PATCH 042/129] # while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; # echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; # sleep 20; # echo 'Sidecar exiting.'; # exit 1; --- template/stacks/ref-implementation/openbao/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 64059da..c07cb45 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -3,11 +3,11 @@ server: - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " - while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; - echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; - sleep 20; - echo 'Sidecar exiting.'; - exit 1; + # while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; + # echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; + # sleep 20; + # echo 'Sidecar exiting.'; + # exit 1; "] volumeMounts: - name: log-storage -- 2.45.2 From fb0eebef13668db749a9c010541c0703772608fb Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 10:26:14 +0100 Subject: [PATCH 043/129] no exit --- template/stacks/ref-implementation/openbao/values.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index c07cb45..7a37601 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -3,11 +3,10 @@ server: - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " - # while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; - # echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; - # sleep 20; - # echo 'Sidecar exiting.'; - # exit 1; + while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; + echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; + sleep 20; + echo 'Sidecar exiting.'; "] volumeMounts: - name: log-storage -- 2.45.2 From 3bb9b4b05956578bb9f3be579471b3575381fbc4 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 10:33:33 +0100 Subject: [PATCH 044/129] while true; do echo 'Hello' sleep 5; done "] --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 7a37601..4e84bdc 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -3,10 +3,10 @@ server: - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " - while kill -0 $(pidof openbao) 2>/dev/null; do sleep 1; done; - echo 'OpenBao has crashed - giving Alloy time to collect logs...' >> var/log/openbao.log; - sleep 20; - echo 'Sidecar exiting.'; + while true; do + echo 'Hello' + sleep 5; + done "] volumeMounts: - name: log-storage -- 2.45.2 From 0b5b2b25fdf0391b26f406779caf60cfa18c03a9 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 10:47:00 +0100 Subject: [PATCH 045/129] touch /var/log/openbao.log chmod 644 /var/log/openbao.log chown openbao:openbao /var/1og/openbao_audit.log bao audit enable file file_path=/var/log/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 4e84bdc..c78bf9c 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -30,6 +30,11 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') + bao audit enable file file_path=stdout + touch /var/log/openbao.log + chmod 644 /var/log/openbao.log + chown openbao:openbao /var/1og/openbao_audit.log + bao audit enable file file_path=/var/log/openbao.log rm /tmp/init.txt ui: enabled: true \ No newline at end of file -- 2.45.2 From 055713e4a518b2b12dc1c5cd9673ba97f0598157 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 11:02:44 +0100 Subject: [PATCH 046/129] command: ["/bin/sh", "-c", " while true; do echo 'Hello' sleep 5; done "] --- template/stacks/ref-implementation/openbao/values.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index c78bf9c..d2c8083 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -2,12 +2,6 @@ server: extraContainers: - name: log-sidecar image: alpine:latest - command: ["/bin/sh", "-c", " - while true; do - echo 'Hello' - sleep 5; - done - "] volumeMounts: - name: log-storage mountPath: /var/log/ -- 2.45.2 From 3d399484686b41e90826ca673b04bde89b54075e Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 11:18:38 +0100 Subject: [PATCH 047/129] command: ["/bin/sh", "-c", " while true; do echo 'Hello' sleep 5; done "] --- template/stacks/ref-implementation/openbao/values.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index d2c8083..2452d91 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -2,6 +2,12 @@ server: extraContainers: - name: log-sidecar image: alpine:latest + command: ["/bin/sh", "-c", " + while true; do + echo 'Hello' + sleep 5; + done + "] volumeMounts: - name: log-storage mountPath: /var/log/ @@ -27,7 +33,7 @@ server: bao audit enable file file_path=stdout touch /var/log/openbao.log chmod 644 /var/log/openbao.log - chown openbao:openbao /var/1og/openbao_audit.log + chown openbao:openbao /var/log/openbao.log bao audit enable file file_path=/var/log/openbao.log rm /tmp/init.txt ui: -- 2.45.2 From 3cd6a846b27f715374c820af2d221405984719dd Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 11:35:16 +0100 Subject: [PATCH 048/129] securityContext: runAsUser: 1001 --- template/stacks/ref-implementation/openbao/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 2452d91..e7cf291 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -11,6 +11,8 @@ server: volumeMounts: - name: log-storage mountPath: /var/log/ + securityContext: + runAsUser: 1001 volumes: - name: log-storage -- 2.45.2 From 7efc8124b007d2f1f6612989073f2dc6a95abb82 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 11:39:53 +0100 Subject: [PATCH 049/129] runAsUser: 0 --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e7cf291..91c18f0 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -12,7 +12,7 @@ server: - name: log-storage mountPath: /var/log/ securityContext: - runAsUser: 1001 + runAsUser: 0 volumes: - name: log-storage -- 2.45.2 From 18d03cee74846a95e4967f4aa57b5365cc6d6053 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 11:47:50 +0100 Subject: [PATCH 050/129] runAsUser: 1 --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 91c18f0..8ce0f7c 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -12,7 +12,7 @@ server: - name: log-storage mountPath: /var/log/ securityContext: - runAsUser: 0 + runAsUser: 1 volumes: - name: log-storage -- 2.45.2 From 80ca890f5f31c9e9769a9618c77286a5f099b360 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 13:20:34 +0100 Subject: [PATCH 051/129] - name: init-log-permissions image: busybox command: ["sh", "-c", "chown -R 1000:1000 /var/log && chmod -R 775 /var/log"] securityContext: runAsUser: 0 volumeMounts: - mountPath: /var/log name: log-storage --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 8ce0f7c..2d7d558 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,5 +1,13 @@ server: extraContainers: + - name: init-log-permissions + image: busybox + command: ["sh", "-c", "chown -R 1000:1000 /var/log && chmod -R 775 /var/log"] + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /var/log + name: log-storage - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " -- 2.45.2 From 1938cc8f44e298171886ab67d4ec71400233c326 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 13:24:40 +0100 Subject: [PATCH 052/129] - name: init-log-permissions image: busybox command: ["sh", "-c", "chown -R 1000:1000 /var/log && chmod -R 775 /var/log"] volumeMounts: - mountPath: /var/log name: log-storage --- template/stacks/ref-implementation/openbao/values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 2d7d558..7f082a1 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -3,8 +3,6 @@ server: - name: init-log-permissions image: busybox command: ["sh", "-c", "chown -R 1000:1000 /var/log && chmod -R 775 /var/log"] - securityContext: - runAsUser: 0 volumeMounts: - mountPath: /var/log name: log-storage @@ -19,8 +17,6 @@ server: volumeMounts: - name: log-storage mountPath: /var/log/ - securityContext: - runAsUser: 1 volumes: - name: log-storage -- 2.45.2 From 8f7ccf5fa799631ea94bfb44ea325814c719fdb4 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 13:53:13 +0100 Subject: [PATCH 053/129] mountPath: /var/log/test --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 7f082a1..be4bca1 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -16,7 +16,7 @@ server: "] volumeMounts: - name: log-storage - mountPath: /var/log/ + mountPath: /var/log/test volumes: - name: log-storage -- 2.45.2 From 4d93d50874122d76fc56d35b672f6007e7e21ec6 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 13:58:20 +0100 Subject: [PATCH 054/129] volumes: - name: log-storage path: /var/log/test --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index be4bca1..7b63c55 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -20,7 +20,7 @@ server: volumes: - name: log-storage - emptyDir: {} + path: /var/log/test postStart: - sh -- 2.45.2 From 0971384fd26eeeac6cb57ef4e5f21779e928ff70 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:06:21 +0100 Subject: [PATCH 055/129] emptyDir: {} volumeMounts: - name: log-storage mountPath: /var/log/test --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 7b63c55..aa51d7a 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -20,7 +20,11 @@ server: volumes: - name: log-storage - path: /var/log/test + emptyDir: {} + + volumeMounts: + - name: log-storage + mountPath: /var/log/test postStart: - sh @@ -36,11 +40,11 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') + rm /tmp/init.txt bao audit enable file file_path=stdout touch /var/log/openbao.log chmod 644 /var/log/openbao.log chown openbao:openbao /var/log/openbao.log bao audit enable file file_path=/var/log/openbao.log - rm /tmp/init.txt ui: enabled: true \ No newline at end of file -- 2.45.2 From cba0a236f5ea8c83762b8b6f565d00889cb5f6f8 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:14:07 +0100 Subject: [PATCH 056/129] volumes: - name: log-storage path: /var/log/test --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index aa51d7a..31b72c6 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -20,7 +20,7 @@ server: volumes: - name: log-storage - emptyDir: {} + path: /var/log/test volumeMounts: - name: log-storage -- 2.45.2 From da3624d82a040dd23f5190461df0807f2588c6b9 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:20:57 +0100 Subject: [PATCH 057/129] volumeMounts: - mountPath: /var/log/test name: plugins readOnly: false --- template/stacks/ref-implementation/openbao/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 31b72c6..38b38d9 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -23,8 +23,9 @@ server: path: /var/log/test volumeMounts: - - name: log-storage - mountPath: /var/log/test + - mountPath: /var/log/test + name: plugins + readOnly: false postStart: - sh -- 2.45.2 From d946b419e71b6f3db756b0846e3cb76e30faf094 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:27:04 +0100 Subject: [PATCH 058/129] volumeMounts: - mountPath: / name: plugins readOnly: false --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 38b38d9..4592f06 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -23,7 +23,7 @@ server: path: /var/log/test volumeMounts: - - mountPath: /var/log/test + - mountPath: / name: plugins readOnly: false -- 2.45.2 From ac4d10d6196b592dd901c248a7a8d14850533925 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:30:00 +0100 Subject: [PATCH 059/129] # volumeMounts: # - mountPath: / # name: plugins # readOnly: false --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 4592f06..887224a 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -22,10 +22,10 @@ server: - name: log-storage path: /var/log/test - volumeMounts: - - mountPath: / - name: plugins - readOnly: false + # volumeMounts: + # - mountPath: / + # name: plugins + # readOnly: false postStart: - sh -- 2.45.2 From ff727206543960478a54afa3fa1b48b8c2b371f3 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:35:18 +0100 Subject: [PATCH 060/129] volumes: - name: log-storage emptyDir: {} --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 887224a..e62739b 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -20,10 +20,10 @@ server: volumes: - name: log-storage - path: /var/log/test + emptyDir: {} # volumeMounts: - # - mountPath: / + # - mountPath: /var/log/test # name: plugins # readOnly: false -- 2.45.2 From e72e440e5101940639ef7a6da2b06d015c9fe737 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:40:57 +0100 Subject: [PATCH 061/129] volumeMounts: - mountPath: /var/log/test name: plugins readOnly: false --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e62739b..1b1ae37 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -22,10 +22,10 @@ server: - name: log-storage emptyDir: {} - # volumeMounts: - # - mountPath: /var/log/test - # name: plugins - # readOnly: false + volumeMounts: + - mountPath: /var/log/test + name: plugins + readOnly: false postStart: - sh -- 2.45.2 From 5ffb47d1ca072a73c8e4ebee0cd462aca8a3a49d Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:44:29 +0100 Subject: [PATCH 062/129] volumeMounts: - mountPath: /var/log/test name: log-storage readOnly: false --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 1b1ae37..e1b367d 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -24,7 +24,7 @@ server: volumeMounts: - mountPath: /var/log/test - name: plugins + name: log-storage readOnly: false postStart: -- 2.45.2 From 12d35ad1e9bd21c8914b58500a57f30f915dca9b Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 14:48:25 +0100 Subject: [PATCH 063/129] touch /var/log/openbao.log chmod 644 /var/log/openbao.log chown openbao:openbao /var/log/openbao.log bao audit enable file file_path=/var/log/openbao.log removed --- template/stacks/ref-implementation/openbao/values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e1b367d..dc3f57d 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -43,9 +43,5 @@ server: bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt bao audit enable file file_path=stdout - touch /var/log/openbao.log - chmod 644 /var/log/openbao.log - chown openbao:openbao /var/log/openbao.log - bao audit enable file file_path=/var/log/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From e7d693465d18ba8e707a379265faa8deaf9d7f5e Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 15:02:47 +0100 Subject: [PATCH 064/129] mountPath: /openbao/logs --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index dc3f57d..01c35ab 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -16,14 +16,14 @@ server: "] volumeMounts: - name: log-storage - mountPath: /var/log/test + mountPath: /openbao/logs volumes: - name: log-storage emptyDir: {} volumeMounts: - - mountPath: /var/log/test + - mountPath: /openbao/logs name: log-storage readOnly: false -- 2.45.2 From 1bf5b468bcd9428f1aae51cfca710410e68c49b0 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 16:25:16 +0100 Subject: [PATCH 065/129] bao audit enable file file_path=/openbao/logs/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 01c35ab..f0fa1e4 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,11 +1,5 @@ server: extraContainers: - - name: init-log-permissions - image: busybox - command: ["sh", "-c", "chown -R 1000:1000 /var/log && chmod -R 775 /var/log"] - volumeMounts: - - mountPath: /var/log - name: log-storage - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " @@ -43,5 +37,6 @@ server: bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt bao audit enable file file_path=stdout + bao audit enable file file_path=/openbao/logs/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From d51e0859a994404ee3706744b8cc3d63d9ebcba8 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 19 Mar 2025 16:34:32 +0100 Subject: [PATCH 066/129] touch /openbao/logs/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index f0fa1e4..87774b6 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -37,6 +37,7 @@ server: bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt bao audit enable file file_path=stdout + touch /openbao/logs/openbao.log bao audit enable file file_path=/openbao/logs/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From 974e0182cc425f08a56590b250ca2645883b22b1 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 10:45:12 +0100 Subject: [PATCH 067/129] # touch /openbao/logs/openbao.log # bao audit enable file file_path=/openbao/logs/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 87774b6..a32d8de 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -37,7 +37,7 @@ server: bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt bao audit enable file file_path=stdout - touch /openbao/logs/openbao.log - bao audit enable file file_path=/openbao/logs/openbao.log + # touch /openbao/logs/openbao.log + # bao audit enable file file_path=/openbao/logs/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From a5ec02205aa736765d6014638db43ec5846fb95c Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 11:03:57 +0100 Subject: [PATCH 068/129] bao audit enable -path="stdout" file file_path=stdout bao audit enable -path="file" file file_path=/openbao/logs/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index a32d8de..960afd2 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -36,8 +36,7 @@ server: echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt - bao audit enable file file_path=stdout - # touch /openbao/logs/openbao.log - # bao audit enable file file_path=/openbao/logs/openbao.log + bao audit enable -path="stdout" file file_path=stdout + bao audit enable -path="file" file file_path=/openbao/logs/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From 3e1b284e3b8c967bc61b7a978d1ba178400e1666 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 11:26:21 +0100 Subject: [PATCH 069/129] local.file_match "openbao_file_logs" { path_targets = [{"__path__" = "/openbao/logs/*"}] sync_period = "5s" } loki.source.file "openbao_logs" { targets = local.file_match.openbao_file_logs.output forward_to = [loki.write.local_loki.receiver] } --- template/stacks/monitoring/alloy/values.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index a2ac67d..c83bdda 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -76,3 +76,13 @@ alloy: targets = discovery.relabel.pod_logs.output forward_to = [loki.write.local_loki.receiver] } + + local.file_match "openbao_file_logs" { + path_targets = [{"__path__" = "/openbao/logs/*"}] + sync_period = "5s" + } + + loki.source.file "openbao_logs" { + targets = local.file_match.openbao_file_logs.output + forward_to = [loki.write.local_loki.receiver] + } \ No newline at end of file -- 2.45.2 From 5843e9498b6917710fff3460bbd2110a107e3a3f Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 11:33:08 +0100 Subject: [PATCH 070/129] targets = local.file_match.openbao_file_logs.targets --- template/stacks/monitoring/alloy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index c83bdda..3b1f8f4 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -83,6 +83,6 @@ alloy: } loki.source.file "openbao_logs" { - targets = local.file_match.openbao_file_logs.output + targets = local.file_match.openbao_file_logs.targets forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From 0dbf64647704c567d5265f4034446d75979bf218 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 12:36:18 +0100 Subject: [PATCH 071/129] alloy is back --- template/stacks/monitoring/alloy/values.yaml | 11 +++++++++++ .../sidecar-container-alloy-configmap.yaml | 0 .../stacks/ref-implementation/openbao/values.yaml | 12 ++++++++++++ 3 files changed, 23 insertions(+) rename template/stacks/ref-implementation/{openbao-alloy-configmap => openbao-alloy-configmap 11-45-55-394}/sidecar-container-alloy-configmap.yaml (100%) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 3b1f8f4..02068cc 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -72,6 +72,17 @@ alloy: } + discovery.relabel "openbao_pod_logs" { + targets = discovery.kubernetes.pod.targets + + rule { + source_labels = ["__meta_kubernetes_pod_name"] + action = "keep" + regex = "openbao-0" + } + + } + loki.source.kubernetes "all_pod_logs" { targets = discovery.relabel.pod_logs.output forward_to = [loki.write.local_loki.receiver] diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap 11-45-55-394/sidecar-container-alloy-configmap.yaml similarity index 100% rename from template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml rename to template/stacks/ref-implementation/openbao-alloy-configmap 11-45-55-394/sidecar-container-alloy-configmap.yaml diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 960afd2..0303f9f 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,5 +1,17 @@ server: extraContainers: + - name: grafana-alloy + image: grafana/alloy:latest + ports: + - containerPort: 12345 + # args: + # - --config.file=/etc/alloy/config.yaml + # volumeMounts: + # - name: alloy-data + # mountPath: /var/lib/alloy/data + volumeMounts: + - name: log-storage + mountPath: /openbao/logs - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " -- 2.45.2 From c9c67a9d54724cf470bcd20cf5e8267765723d32 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 12:36:57 +0100 Subject: [PATCH 072/129] name changes --- .../sidecar-container-alloy-configmap.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename template/stacks/ref-implementation/{openbao-alloy-configmap 11-45-55-394 => openbao-alloy-configmap}/sidecar-container-alloy-configmap.yaml (100%) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap 11-45-55-394/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml similarity index 100% rename from template/stacks/ref-implementation/openbao-alloy-configmap 11-45-55-394/sidecar-container-alloy-configmap.yaml rename to template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml -- 2.45.2 From 285e823936193996e3a195a762fc0595a97761ba Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 12:55:00 +0100 Subject: [PATCH 073/129] path_targets = [{"__path__" = "/var/log/*"}] --- template/stacks/monitoring/alloy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 02068cc..91ca41d 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -89,7 +89,7 @@ alloy: } local.file_match "openbao_file_logs" { - path_targets = [{"__path__" = "/openbao/logs/*"}] + path_targets = [{"__path__" = "/var/log/*"}] sync_period = "5s" } -- 2.45.2 From 140dddd955eb7a9f26e2fb6b1cf949031a65c12c Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 12:58:23 +0100 Subject: [PATCH 074/129] mountPath: /var/lib/alloy/data --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 0303f9f..3aa51ac 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -11,7 +11,7 @@ server: # mountPath: /var/lib/alloy/data volumeMounts: - name: log-storage - mountPath: /openbao/logs + mountPath: /var/lib/alloy/data - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " -- 2.45.2 From 005f7503ce654a1d1aa5c773a96f378fc7e5b0a9 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 13:05:44 +0100 Subject: [PATCH 075/129] mountPath: /var/lib/alloy/data --- template/stacks/ref-implementation/openbao/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 3aa51ac..c921446 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -11,6 +11,8 @@ server: # mountPath: /var/lib/alloy/data volumeMounts: - name: log-storage + mountPath: /openbao/logs + - name: alloy-data mountPath: /var/lib/alloy/data - name: log-sidecar image: alpine:latest @@ -23,10 +25,14 @@ server: volumeMounts: - name: log-storage mountPath: /openbao/logs + - name: log-storage + mountPath: /var/lib/alloy/data volumes: - name: log-storage emptyDir: {} + - name: alloy-data + emptyDir: {} volumeMounts: - mountPath: /openbao/logs -- 2.45.2 From 6385e39067e1c986326c0b5374b9c974315e6651 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 13:12:50 +0100 Subject: [PATCH 076/129] /openbao/logs/pupa2 --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index c921446..f227c18 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -24,7 +24,7 @@ server: "] volumeMounts: - name: log-storage - mountPath: /openbao/logs + mountPath: /openbao/logs/pupa - name: log-storage mountPath: /var/lib/alloy/data @@ -35,7 +35,7 @@ server: emptyDir: {} volumeMounts: - - mountPath: /openbao/logs + - mountPath: /openbao/logs/pupa2 name: log-storage readOnly: false -- 2.45.2 From 88df4ea8f491e682231d2670bb683bf0d9d0ae2d Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 13:30:37 +0100 Subject: [PATCH 077/129] runAsUser: 100 --- template/stacks/ref-implementation/openbao/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index f227c18..8ccc168 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -4,6 +4,8 @@ server: image: grafana/alloy:latest ports: - containerPort: 12345 + securityContext: + runAsUser: 100 # args: # - --config.file=/etc/alloy/config.yaml # volumeMounts: -- 2.45.2 From 87522c11dbbf7b9e77d8ffac17b64b5f279f0e2d Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 13:39:35 +0100 Subject: [PATCH 078/129] /var --- template/stacks/ref-implementation/openbao/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 8ccc168..3fe6c45 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -15,7 +15,7 @@ server: - name: log-storage mountPath: /openbao/logs - name: alloy-data - mountPath: /var/lib/alloy/data + mountPath: /var - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " @@ -27,7 +27,7 @@ server: volumeMounts: - name: log-storage mountPath: /openbao/logs/pupa - - name: log-storage + - name: alloy-data mountPath: /var/lib/alloy/data volumes: @@ -38,7 +38,7 @@ server: volumeMounts: - mountPath: /openbao/logs/pupa2 - name: log-storage + name: alloy-data readOnly: false postStart: -- 2.45.2 From 2058f6a36bda08c165a20f67c544c5f6e65be2b1 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 13:48:12 +0100 Subject: [PATCH 079/129] mountPath: /var/lib --- template/stacks/ref-implementation/openbao/values.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 3fe6c45..bea82c3 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -15,7 +15,7 @@ server: - name: log-storage mountPath: /openbao/logs - name: alloy-data - mountPath: /var + mountPath: /var/lib - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " @@ -27,8 +27,6 @@ server: volumeMounts: - name: log-storage mountPath: /openbao/logs/pupa - - name: alloy-data - mountPath: /var/lib/alloy/data volumes: - name: log-storage @@ -37,7 +35,7 @@ server: emptyDir: {} volumeMounts: - - mountPath: /openbao/logs/pupa2 + - mountPath: /var/lib/alloy/data name: alloy-data readOnly: false -- 2.45.2 From ec2fc47ea2940af5b23d3431dc9b200aa6ba6a7a Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 13:52:04 +0100 Subject: [PATCH 080/129] mountPath: /var/lib/alloy --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index bea82c3..e331840 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -15,7 +15,7 @@ server: - name: log-storage mountPath: /openbao/logs - name: alloy-data - mountPath: /var/lib + mountPath: /var/lib/alloy - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " -- 2.45.2 From 39eab1ef93b300c84e7f07ae033996fa76048c32 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 14:00:59 +0100 Subject: [PATCH 081/129] - name: config-volume configMap: name: sidecar-container-alloy-config --- template/stacks/ref-implementation/openbao/values.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e331840..45323ad 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -16,6 +16,8 @@ server: mountPath: /openbao/logs - name: alloy-data mountPath: /var/lib/alloy + - name: config-volume + mountPath: /var/lib/alloy/config - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " @@ -33,10 +35,13 @@ server: emptyDir: {} - name: alloy-data emptyDir: {} + - name: config-volume + configMap: + name: sidecar-container-alloy-config volumeMounts: - - mountPath: /var/lib/alloy/data - name: alloy-data + - mountPath: /openbao/logs + name: log-storage readOnly: false postStart: -- 2.45.2 From c376f6d0c69f2df2f788f3c53f00a96e39de78cb Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 14:09:45 +0100 Subject: [PATCH 082/129] - --config.file=/var/lib/alloy/config/config.yaml --- .../sidecar-container-alloy-configmap.yaml | 20 +++++++++---------- .../ref-implementation/openbao/values.yaml | 7 ++----- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml index 9a62c3f..52963f3 100644 --- a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml @@ -15,18 +15,16 @@ data: } } - discovery.kubernetes "pod" { - role = "pod" + local.file_match "applogs" { + path_targets = [ + { + "__path__" = "/openbao/logs/*" + } + ] + sync_period = "5s" } - discovery.relabel "openbao_pod_logs" { - targets = discovery.kubernetes.pod.targets - - rule { - source_labels = ["__meta_kubernetes_pod_name"] - action = "keep" - regex = "openbao-0" - } - + loki.source.file "openbao_logs" { + targets = local.file_match.applogs.targets forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 45323ad..c0e4152 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -6,11 +6,8 @@ server: - containerPort: 12345 securityContext: runAsUser: 100 - # args: - # - --config.file=/etc/alloy/config.yaml - # volumeMounts: - # - name: alloy-data - # mountPath: /var/lib/alloy/data + args: + - --config.file=/var/lib/alloy/config/config.yaml volumeMounts: - name: log-storage mountPath: /openbao/logs -- 2.45.2 From 267a04fee54c690bd85ec0d6d3a3d79ed7f4c251 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 14:23:57 +0100 Subject: [PATCH 083/129] mountPath: /etc/alloy items: - key: "config.yaml" path: "config.alloy" --- template/stacks/ref-implementation/openbao/values.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index c0e4152..1e94eec 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -6,15 +6,16 @@ server: - containerPort: 12345 securityContext: runAsUser: 100 - args: - - --config.file=/var/lib/alloy/config/config.yaml volumeMounts: - name: log-storage mountPath: /openbao/logs - name: alloy-data mountPath: /var/lib/alloy - name: config-volume - mountPath: /var/lib/alloy/config + mountPath: /etc/alloy + items: + - key: "config.yaml" + path: "config.alloy" - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " -- 2.45.2 From d866169744a4d54a2f084558179bf75f5ce3db45 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 14:28:27 +0100 Subject: [PATCH 084/129] - name: config-volume mountPath: /etc/alloy items: - key: "config.yaml" path: "config.alloy" --- template/stacks/ref-implementation/openbao/values.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 1e94eec..4beb602 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -27,6 +27,11 @@ server: volumeMounts: - name: log-storage mountPath: /openbao/logs/pupa + - name: config-volume + mountPath: /etc/alloy + items: + - key: "config.yaml" + path: "config.alloy" volumes: - name: log-storage -- 2.45.2 From 3db40581819c6fed1d7195d94eb51a21ee915ca8 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 14:34:51 +0100 Subject: [PATCH 085/129] - key: "config.yaml" path: "/config.alloy" - key: "config.yaml" path: "/pupa/config.alloy" --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 4beb602..85e4459 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -16,6 +16,10 @@ server: items: - key: "config.yaml" path: "config.alloy" + - key: "config.yaml" + path: "/config.alloy" + - key: "config.yaml" + path: "/pupa/config.alloy" - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " -- 2.45.2 From 02c739524bd3dc6a6d7822422b431e22610c60cf Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 14:39:03 +0100 Subject: [PATCH 086/129] config.alloy --- .../sidecar-container-alloy-configmap.yaml | 2 +- template/stacks/ref-implementation/openbao/values.yaml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml index 52963f3..364ec15 100644 --- a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: sidecar-container-alloy-config data: - config.yaml: | + config.alloy: | logging { level = "info" format = "logfmt" diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 85e4459..8b9651a 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -13,13 +13,6 @@ server: mountPath: /var/lib/alloy - name: config-volume mountPath: /etc/alloy - items: - - key: "config.yaml" - path: "config.alloy" - - key: "config.yaml" - path: "/config.alloy" - - key: "config.yaml" - path: "/pupa/config.alloy" - name: log-sidecar image: alpine:latest command: ["/bin/sh", "-c", " -- 2.45.2 From 350398cb231e7d230f77cdd09069f2ffa338c9a3 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 14:44:48 +0100 Subject: [PATCH 087/129] path_targets = [{"__path__" = "/openbao/logs/*"}] --- .../sidecar-container-alloy-configmap.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml index 364ec15..104ad2f 100644 --- a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml @@ -16,11 +16,7 @@ data: } local.file_match "applogs" { - path_targets = [ - { - "__path__" = "/openbao/logs/*" - } - ] + path_targets = [{"__path__" = "/openbao/logs/*"}] sync_period = "5s" } -- 2.45.2 From 64677a02d116d0340a629e78e22c188bd096f44f Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 15:14:01 +0100 Subject: [PATCH 088/129] url = "http://loki-loki-distributed-gateway.monitoring.svc.cluster.local/loki/api/v1/push" --- .../sidecar-container-alloy-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml index 104ad2f..c0f1a92 100644 --- a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml @@ -11,7 +11,7 @@ data: loki.write "local_loki" { endpoint { - url = "http://loki-loki-distributed-gateway/loki/api/v1/push" + url = "http://loki-loki-distributed-gateway.monitoring.svc.cluster.local/loki/api/v1/push" } } -- 2.45.2 From d21c543f2c287adab527c8691ea4ea4593aed03e Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 15:50:04 +0100 Subject: [PATCH 089/129] log-sidecar removed --- .../ref-implementation/openbao/values.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 8b9651a..07f3fc5 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -13,22 +13,6 @@ server: mountPath: /var/lib/alloy - name: config-volume mountPath: /etc/alloy - - name: log-sidecar - image: alpine:latest - command: ["/bin/sh", "-c", " - while true; do - echo 'Hello' - sleep 5; - done - "] - volumeMounts: - - name: log-storage - mountPath: /openbao/logs/pupa - - name: config-volume - mountPath: /etc/alloy - items: - - key: "config.yaml" - path: "config.alloy" volumes: - name: log-storage -- 2.45.2 From 3937c98d0044f4fbde52aa9fe078d4fa2258a12a Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 16:03:21 +0100 Subject: [PATCH 090/129] /openbao/logs/alive/main.alive --- .idea/workspace.xml | 94 ------------------- template/stacks/monitoring/alloy/values.yaml | 21 ----- .../stacks/ref-implementation/openbao.yaml | 2 +- .../ref-implementation/openbao/values.yaml | 2 + 4 files changed, 3 insertions(+), 116 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 61985ee..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1741874334984 - - - - - - - true - - \ No newline at end of file diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 91ca41d..47b77d1 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -72,28 +72,7 @@ alloy: } - discovery.relabel "openbao_pod_logs" { - targets = discovery.kubernetes.pod.targets - - rule { - source_labels = ["__meta_kubernetes_pod_name"] - action = "keep" - regex = "openbao-0" - } - - } - loki.source.kubernetes "all_pod_logs" { targets = discovery.relabel.pod_logs.output forward_to = [loki.write.local_loki.receiver] - } - - local.file_match "openbao_file_logs" { - path_targets = [{"__path__" = "/var/log/*"}] - sync_period = "5s" - } - - loki.source.file "openbao_logs" { - targets = local.file_match.openbao_file_logs.targets - forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index 8e286d9..ffc2923 100644 --- a/template/stacks/ref-implementation/openbao.yaml +++ b/template/stacks/ref-implementation/openbao.yaml @@ -23,7 +23,7 @@ spec: targetRevision: HEAD helm: valueFiles: - - $values/stacks/ref-implementation/openbao/values.yaml + - $values/stacks/ref-implementation/openbao/values.yaml - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 07f3fc5..4aa4ff0 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -2,6 +2,7 @@ server: extraContainers: - name: grafana-alloy image: grafana/alloy:latest + command: ["/bin/sh", "-c", "while [ -f /openbao/logs/alive/main.alive ]; do sleep 5; done; echo 'Main container exited, waiting 20s'; sleep 20; exit 1"] ports: - containerPort: 12345 securityContext: @@ -32,6 +33,7 @@ server: - sh - -c - | + trap 'rm -f /openbao/logs/alive/main.alive; exit 0' TERM; touch /openbao/logs/alive/main.alive; sleep infinity sleep 10 bao operator init >> /tmp/init.txt cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} -- 2.45.2 From 5f5ac62b0b4b686b1d66ed1c232710857057f678 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 16:14:03 +0100 Subject: [PATCH 091/129] touch /shared/main.alive; trap 'rm -f /shared/main.alive; exit 0' TERM; while true; do sleep 1; done --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 4aa4ff0..101a841 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -33,7 +33,7 @@ server: - sh - -c - | - trap 'rm -f /openbao/logs/alive/main.alive; exit 0' TERM; touch /openbao/logs/alive/main.alive; sleep infinity + touch /shared/main.alive; trap 'rm -f /shared/main.alive; exit 0' TERM; while true; do sleep 1; done sleep 10 bao operator init >> /tmp/init.txt cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} -- 2.45.2 From 4601d2f25d73e3102c579380adc507636967e2a3 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 20 Mar 2025 16:18:43 +0100 Subject: [PATCH 092/129] those command were deleted --- template/stacks/ref-implementation/openbao/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 101a841..07f3fc5 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -2,7 +2,6 @@ server: extraContainers: - name: grafana-alloy image: grafana/alloy:latest - command: ["/bin/sh", "-c", "while [ -f /openbao/logs/alive/main.alive ]; do sleep 5; done; echo 'Main container exited, waiting 20s'; sleep 20; exit 1"] ports: - containerPort: 12345 securityContext: @@ -33,7 +32,6 @@ server: - sh - -c - | - touch /shared/main.alive; trap 'rm -f /shared/main.alive; exit 0' TERM; while true; do sleep 1; done sleep 10 bao operator init >> /tmp/init.txt cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} -- 2.45.2 From d41a27305ec86e454588cb8c80c180f93866eb6b Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 12:54:27 +0100 Subject: [PATCH 093/129] livenessProbe: enabled: true --- template/stacks/ref-implementation/openbao/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 07f3fc5..43ea2dc 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -28,6 +28,9 @@ server: name: log-storage readOnly: false + livenessProbe: + enabled: true + postStart: - sh - -c -- 2.45.2 From f39c8c979bb6b6d74f71e835de02ec699cb1d795 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:12:46 +0100 Subject: [PATCH 094/129] livenessProbe: enabled: true execCommand: - /bin/sh - -c - bao status --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 43ea2dc..112571b 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -30,6 +30,10 @@ server: livenessProbe: enabled: true + execCommand: + - /bin/sh + - -c + - bao status postStart: - sh -- 2.45.2 From dcce720122367296c878e97c8c3b5d197c39dbcd Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:32:40 +0100 Subject: [PATCH 095/129] # bao audit enable -path="stdout" file file_path=stdout # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 112571b..9eb9cf0 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -50,7 +50,7 @@ server: echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt - bao audit enable -path="stdout" file file_path=stdout - bao audit enable -path="file" file file_path=/openbao/logs/openbao.log + # bao audit enable -path="stdout" file file_path=stdout + # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From 8f28c3036493e6ff68470aa8e84144df74c6a945 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:33:13 +0100 Subject: [PATCH 096/129] ### --- .../ref-implementation/openbao/values.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 9eb9cf0..7fd7b18 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -40,16 +40,16 @@ server: - -c - | sleep 10 - bao operator init >> /tmp/init.txt - cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} - echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt - echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt - echo $(grep "Unseal Key 2:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key2.txt - echo $(grep "Unseal Key 3:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key3.txt - echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt - echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt - bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - rm /tmp/init.txt + # bao operator init >> /tmp/init.txt + # cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} + # echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt + # echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt + # echo $(grep "Unseal Key 2:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key2.txt + # echo $(grep "Unseal Key 3:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key3.txt + # echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt + # echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt + # bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') + # rm /tmp/init.txt # bao audit enable -path="stdout" file file_path=stdout # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log ui: -- 2.45.2 From 8d7a7cb1bfb746842e9b955cdac0cf421d0496b8 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:38:15 +0100 Subject: [PATCH 097/129] bao operator init >> /tmp/init.txt --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 7fd7b18..ced9144 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -40,7 +40,7 @@ server: - -c - | sleep 10 - # bao operator init >> /tmp/init.txt + bao operator init >> /tmp/init.txt # cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} # echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt # echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt -- 2.45.2 From aae508014a0a796ca2790cfeaa9e2b8be3e15341 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:41:47 +0100 Subject: [PATCH 098/129] cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt echo $(grep "Unseal Key 2:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key2.txt echo $(grep "Unseal Key 3:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key3.txt echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt --- .../ref-implementation/openbao/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index ced9144..9eb9cf0 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -41,15 +41,15 @@ server: - | sleep 10 bao operator init >> /tmp/init.txt - # cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} - # echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt - # echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt - # echo $(grep "Unseal Key 2:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key2.txt - # echo $(grep "Unseal Key 3:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key3.txt - # echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt - # echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt - # bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - # rm /tmp/init.txt + cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} + echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt + echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt + echo $(grep "Unseal Key 2:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key2.txt + echo $(grep "Unseal Key 3:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key3.txt + echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt + echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt + bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') + rm /tmp/init.txt # bao audit enable -path="stdout" file file_path=stdout # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log ui: -- 2.45.2 From 2c5cad03c8fb5c532f7ca01b848ebd2e8cca3aae Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:50:07 +0100 Subject: [PATCH 099/129] sleep 10 --- template/stacks/ref-implementation/openbao/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 9eb9cf0..3c7b963 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -41,6 +41,7 @@ server: - | sleep 10 bao operator init >> /tmp/init.txt + sleep 10 cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt -- 2.45.2 From 5086db7cba3bd6faa73a261cb51caac72cbf9594 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:50:33 +0100 Subject: [PATCH 100/129] 100 --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 3c7b963..d2bb4fa 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -41,7 +41,7 @@ server: - | sleep 10 bao operator init >> /tmp/init.txt - sleep 10 + sleep 100 cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt -- 2.45.2 From 4620a92aee70761e90b740233827529d1641e9d6 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 13:57:39 +0100 Subject: [PATCH 101/129] # rm /tmp/init.txt --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index d2bb4fa..e97b26c 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -50,7 +50,7 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - rm /tmp/init.txt + # rm /tmp/init.txt # bao audit enable -path="stdout" file file_path=stdout # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log ui: -- 2.45.2 From 71a5463237b85a6a9b0456f3ee6e2146e1af6186 Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 14:20:54 +0100 Subject: [PATCH 102/129] rm /tmp/init.txt bao audit enable -path="stdout" file file_path=stdout bao audit enable -path="file" file file_path=/openbao/logs/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e97b26c..b4f82a0 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -40,8 +40,8 @@ server: - -c - | sleep 10 + rm -rf /openbao/data/* bao operator init >> /tmp/init.txt - sleep 100 cat /tmp/init.txt | grep "Key " | awk '{print $NF}' | xargs -I{} bao operator unseal {} echo $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/initial_token.txt echo $(grep "Unseal Key 1:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key1.txt @@ -50,8 +50,8 @@ server: echo $(grep "Unseal Key 4:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key4.txt echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') - # rm /tmp/init.txt - # bao audit enable -path="stdout" file file_path=stdout - # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log + rm /tmp/init.txt + bao audit enable -path="stdout" file file_path=stdout + bao audit enable -path="file" file file_path=/openbao/logs/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From 320e67a1d2a8c06f6cd822e2099204a2f01da65e Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 24 Mar 2025 14:50:16 +0100 Subject: [PATCH 103/129] no liveness probe --- template/stacks/ref-implementation/openbao/values.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index b4f82a0..dcc5ed3 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -28,13 +28,6 @@ server: name: log-storage readOnly: false - livenessProbe: - enabled: true - execCommand: - - /bin/sh - - -c - - bao status - postStart: - sh - -c -- 2.45.2 From 547938acd45b82070cfecd631c80c70cabf5c9d8 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 11:18:52 +0100 Subject: [PATCH 104/129] - name: host-log hostPath: path: /var/log type: Directory --- template/stacks/ref-implementation/openbao/values.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index dcc5ed3..8941611 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -13,6 +13,8 @@ server: mountPath: /var/lib/alloy - name: config-volume mountPath: /etc/alloy + - name: host-log + mountPath: /tmp/host volumes: - name: log-storage @@ -22,11 +24,18 @@ server: - name: config-volume configMap: name: sidecar-container-alloy-config + - name: host-log + hostPath: + path: /var/log + type: Directory volumeMounts: - mountPath: /openbao/logs name: log-storage readOnly: false + - mountPath: /var/log + name: host-log + readOnly: false postStart: - sh -- 2.45.2 From c6e71f8aebca74cb2977d8c4439cb44a2a84f9be Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 12:51:00 +0100 Subject: [PATCH 105/129] logging setup --- ...figmap.yaml => openbao-logging-setup.yaml} | 2 +- .../create-logging-directory-deamonset.yaml | 37 +++++++++++++++++++ .../sidecar-container-alloy-configmap.yaml | 0 3 files changed, 38 insertions(+), 1 deletion(-) rename template/stacks/ref-implementation/{openbao-alloy-configmap.yaml => openbao-logging-setup.yaml} (90%) create mode 100644 template/stacks/ref-implementation/openbao-logging/create-logging-directory-deamonset.yaml rename template/stacks/ref-implementation/{openbao-alloy-configmap => openbao-logging}/sidecar-container-alloy-configmap.yaml (100%) diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-logging-setup.yaml similarity index 90% rename from template/stacks/ref-implementation/openbao-alloy-configmap.yaml rename to template/stacks/ref-implementation/openbao-logging-setup.yaml index 9daa56a..8ee0b7a 100644 --- a/template/stacks/ref-implementation/openbao-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-logging-setup.yaml @@ -12,7 +12,7 @@ spec: source: repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD - path: "stacks/ref-implementation/openbao-alloy-configmap" + path: "stacks/ref-implementation/openbao-logging" destination: server: "https://kubernetes.default.svc" namespace: openbao diff --git a/template/stacks/ref-implementation/openbao-logging/create-logging-directory-deamonset.yaml b/template/stacks/ref-implementation/openbao-logging/create-logging-directory-deamonset.yaml new file mode 100644 index 0000000..1a0b0d0 --- /dev/null +++ b/template/stacks/ref-implementation/openbao-logging/create-logging-directory-deamonset.yaml @@ -0,0 +1,37 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: openbao-logging-dir + namespace: openbao +spec: + selector: + matchLabels: + app: openbao-logging-dir + template: + metadata: + labels: + app: openbao-logging-dir + spec: + initContainers: + - name: creator + image: busybox + command: ["/bin/sh", "-c"] + args: + - | + set -e + mkdir -p /var/log/openbao + chown 100:100 /var/log/openbao + securityContext: + runAsUser: 0 + volumeMounts: + - name: host-log + mountPath: /var/log + containers: + - name: running-container + image: busybox + command: ["sleep", "infinity"] + volumes: + - name: host-log + hostPath: + path: /var/log + type: Directory \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml similarity index 100% rename from template/stacks/ref-implementation/openbao-alloy-configmap/sidecar-container-alloy-configmap.yaml rename to template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml -- 2.45.2 From be7881e2ec405beda3825116d0e8045c0bc6ffa9 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 13:03:29 +0100 Subject: [PATCH 106/129] test --- .../ref-implementation/openbao-logging-setup.yaml | 2 +- .../stacks/ref-implementation/openbao/values.yaml | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/template/stacks/ref-implementation/openbao-logging-setup.yaml b/template/stacks/ref-implementation/openbao-logging-setup.yaml index 8ee0b7a..d6f9bc6 100644 --- a/template/stacks/ref-implementation/openbao-logging-setup.yaml +++ b/template/stacks/ref-implementation/openbao-logging-setup.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: openbao-alloy-configmap + name: openbao-logging-setup namespace: argocd labels: env: dev diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 8941611..e3e9b38 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -7,34 +7,27 @@ server: securityContext: runAsUser: 100 volumeMounts: - - name: log-storage - mountPath: /openbao/logs - name: alloy-data mountPath: /var/lib/alloy - name: config-volume mountPath: /etc/alloy - - name: host-log - mountPath: /tmp/host + - name: host-log-storage + mountPath: /openbao/logs volumes: - - name: log-storage - emptyDir: {} - name: alloy-data emptyDir: {} - name: config-volume configMap: name: sidecar-container-alloy-config - - name: host-log + - name: host-log-storage hostPath: path: /var/log type: Directory volumeMounts: - mountPath: /openbao/logs - name: log-storage - readOnly: false - - mountPath: /var/log - name: host-log + name: host-log-storage readOnly: false postStart: -- 2.45.2 From 2372cefe0bb5492073af38eae404ddf182f0e148 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 13:13:39 +0100 Subject: [PATCH 107/129] # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log --- ...g-directory-deamonset.yaml => create-logging-directory.yaml} | 0 template/stacks/ref-implementation/openbao/values.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename template/stacks/ref-implementation/openbao-logging/{create-logging-directory-deamonset.yaml => create-logging-directory.yaml} (100%) diff --git a/template/stacks/ref-implementation/openbao-logging/create-logging-directory-deamonset.yaml b/template/stacks/ref-implementation/openbao-logging/create-logging-directory.yaml similarity index 100% rename from template/stacks/ref-implementation/openbao-logging/create-logging-directory-deamonset.yaml rename to template/stacks/ref-implementation/openbao-logging/create-logging-directory.yaml diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e3e9b38..e2b889f 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -47,6 +47,6 @@ server: bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt bao audit enable -path="stdout" file file_path=stdout - bao audit enable -path="file" file file_path=/openbao/logs/openbao.log + # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From bb3c6cf438eacabe767697df738a685c9500f0e8 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 13:19:15 +0100 Subject: [PATCH 108/129] /openbao/logs/openbao/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index e2b889f..d500a6d 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -47,6 +47,6 @@ server: bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt bao audit enable -path="stdout" file file_path=stdout - # bao audit enable -path="file" file file_path=/openbao/logs/openbao.log + # bao audit enable -path="file" file file_path=/openbao/logs/openbao/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From 5c197fd0f1aee5ef1910cc1664653a4ea11876b2 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 13:26:28 +0100 Subject: [PATCH 109/129] sidecar container detached --- .../sidecar-container-alloy-configmap.yaml | 46 +++++++++---------- .../ref-implementation/openbao/values.yaml | 38 +++++++-------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml index c0f1a92..1b89a78 100644 --- a/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml +++ b/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml @@ -1,26 +1,26 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: sidecar-container-alloy-config -data: - config.alloy: | - logging { - level = "info" - format = "logfmt" - } +# apiVersion: v1 +# kind: ConfigMap +# metadata: +# name: sidecar-container-alloy-config +# data: +# config.alloy: | +# logging { +# level = "info" +# format = "logfmt" +# } - loki.write "local_loki" { - endpoint { - url = "http://loki-loki-distributed-gateway.monitoring.svc.cluster.local/loki/api/v1/push" - } - } +# loki.write "local_loki" { +# endpoint { +# url = "http://loki-loki-distributed-gateway.monitoring.svc.cluster.local/loki/api/v1/push" +# } +# } - local.file_match "applogs" { - path_targets = [{"__path__" = "/openbao/logs/*"}] - sync_period = "5s" - } +# local.file_match "applogs" { +# path_targets = [{"__path__" = "/openbao/logs/*"}] +# sync_period = "5s" +# } - loki.source.file "openbao_logs" { - targets = local.file_match.applogs.targets - forward_to = [loki.write.local_loki.receiver] - } \ No newline at end of file +# loki.source.file "openbao_logs" { +# targets = local.file_match.applogs.targets +# forward_to = [loki.write.local_loki.receiver] +# } \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index d500a6d..a226bd2 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,25 +1,25 @@ server: - extraContainers: - - name: grafana-alloy - image: grafana/alloy:latest - ports: - - containerPort: 12345 - securityContext: - runAsUser: 100 - volumeMounts: - - name: alloy-data - mountPath: /var/lib/alloy - - name: config-volume - mountPath: /etc/alloy - - name: host-log-storage - mountPath: /openbao/logs + # extraContainers: + # - name: grafana-alloy + # image: grafana/alloy:latest + # ports: + # - containerPort: 12345 + # securityContext: + # runAsUser: 100 + # volumeMounts: + # - name: alloy-data + # mountPath: /var/lib/alloy + # - name: config-volume + # mountPath: /etc/alloy + # - name: host-log-storage + # mountPath: /openbao/logs volumes: - - name: alloy-data - emptyDir: {} - - name: config-volume - configMap: - name: sidecar-container-alloy-config + # - name: alloy-data + # emptyDir: {} + # - name: config-volume + # configMap: + # name: sidecar-container-alloy-config - name: host-log-storage hostPath: path: /var/log -- 2.45.2 From 278cf798f454b743a70b66f584ca2c99eb1ed935 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 13:52:55 +0100 Subject: [PATCH 110/129] apiVersion: v1 kind: ConfigMap metadata: name: openbao-logrotate-config namespace: openbao data: openbao: | /var/log/openbao/*.log { size 5k rotate 7 compress missingok notifempty postrotate kill -SIGHUP $(pidof bao) endscript } --- .../openbao-logging/logrotate.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 template/stacks/ref-implementation/openbao-logging/logrotate.yaml diff --git a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml new file mode 100644 index 0000000..79ef774 --- /dev/null +++ b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml @@ -0,0 +1,55 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: openbao-logrotate + namespace: openbao +spec: + selector: + matchLabels: + app: openbao-logrotate + template: + metadata: + labels: + app: openbao-logrotate + spec: + containers: + - name: logrotate + image: alpine + command: ["/bin/sh", "-c"] + args: + - | + apk add --no-cache logrotate + while true; do logrotate -f /etc/logrotate.d/openbao; sleep 3600; done + volumeMounts: + - name: logrotate-config + mountPath: /etc/logrotate.d/openbao + subPath: openbao + - name: host-log + mountPath: /var/log/openbao + volumes: + - name: logrotate-config + configMap: + name: openbao-logrotate-config + - name: host-log + hostPath: + path: /var/log + type: Directory +--- + +apiVersion: v1 +kind: ConfigMap +metadata: + name: openbao-logrotate-config + namespace: openbao +data: + openbao: | + /var/log/openbao/*.log { + size 5k + rotate 7 + compress + missingok + notifempty + postrotate + kill -SIGHUP $(pidof bao) + endscript + } \ No newline at end of file -- 2.45.2 From 42be001b3ccd616d239123da6c875a6de3c76753 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 13:59:25 +0100 Subject: [PATCH 111/129] bao audit enable -path="file" file file_path=/openbao/logs/openbao/openbao.log --- template/stacks/ref-implementation/openbao/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index a226bd2..233b44d 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -47,6 +47,6 @@ server: bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt bao audit enable -path="stdout" file file_path=stdout - # bao audit enable -path="file" file file_path=/openbao/logs/openbao/openbao.log + bao audit enable -path="file" file file_path=/openbao/logs/openbao/openbao.log ui: enabled: true \ No newline at end of file -- 2.45.2 From c34d538073d88ca75c48fea1e053613c0608ed76 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 14:08:02 +0100 Subject: [PATCH 112/129] /var/log/openbao/openbao/*.log { --- .../stacks/ref-implementation/openbao-logging/logrotate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml index 79ef774..13fbe84 100644 --- a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml +++ b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml @@ -43,7 +43,7 @@ metadata: namespace: openbao data: openbao: | - /var/log/openbao/*.log { + /var/log/openbao/openbao/*.log { size 5k rotate 7 compress -- 2.45.2 From d941d12bcd9ce5b4bcb50393b900987b8f63d5a2 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 15:02:50 +0100 Subject: [PATCH 113/129] mkdir pupa --- .../stacks/ref-implementation/openbao-logging/logrotate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml index 13fbe84..e8ae65f 100644 --- a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml +++ b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml @@ -50,6 +50,7 @@ data: missingok notifempty postrotate + mkdir pupa kill -SIGHUP $(pidof bao) endscript } \ No newline at end of file -- 2.45.2 From 5c9b4c679d897ac5a5b06850b0cabc337c0c3524 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 25 Mar 2025 15:16:07 +0100 Subject: [PATCH 114/129] sleep 60 --- .../stacks/ref-implementation/openbao-logging/logrotate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml index e8ae65f..4c2be6f 100644 --- a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml +++ b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml @@ -19,7 +19,7 @@ spec: args: - | apk add --no-cache logrotate - while true; do logrotate -f /etc/logrotate.d/openbao; sleep 3600; done + while true; do logrotate -f /etc/logrotate.d/openbao; sleep 60; done volumeMounts: - name: logrotate-config mountPath: /etc/logrotate.d/openbao -- 2.45.2 From 2a8bdd0f6d90b9289e549137120fbc6fa731d166 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 11:01:33 +0100 Subject: [PATCH 115/129] loki.source.syslog "tcp_socket" { listener { address = "0.0.0.0:1514" } forward_to = [loki.write.local_loki.receiver] } --- template/stacks/monitoring/alloy/values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 47b77d1..ae4a9d7 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -75,4 +75,11 @@ alloy: loki.source.kubernetes "all_pod_logs" { targets = discovery.relabel.pod_logs.output forward_to = [loki.write.local_loki.receiver] + } + + loki.source.syslog "tcp_socket" { + listener { + address = "0.0.0.0:1514" + } + forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From 08a40379290a22572a19d079b24be3a4a626e20a Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 11:46:02 +0100 Subject: [PATCH 116/129] extraPorts: - name: "tcp_socket" port: 1514 targetPort: 1514 protocol: "TCP" appProtocol: "tcp" --- template/stacks/monitoring/alloy/values.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index ae4a9d7..a67d4bc 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -5,6 +5,13 @@ alloy: uiPathPrefix: "/alloy" + extraPorts: + - name: "tcp_socket" + port: 1514 + targetPort: 1514 + protocol: "TCP" + appProtocol: "tcp" + configMap: content: |- @@ -81,5 +88,5 @@ alloy: listener { address = "0.0.0.0:1514" } - forward_to = [loki.write.local_loki.receiver] + forwardping_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From e901ac85fc5fdc997c24b028c7732465cb1ef835 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 11:53:11 +0100 Subject: [PATCH 117/129] extraPorts: - name: "tcp_socket" port: 1514 targetPort: 1514 protocol: "TCP" appProtocol: "tcp" --- template/stacks/monitoring/alloy/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index a67d4bc..76176f1 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -6,11 +6,11 @@ alloy: uiPathPrefix: "/alloy" extraPorts: - - name: "tcp_socket" - port: 1514 - targetPort: 1514 - protocol: "TCP" - appProtocol: "tcp" + - name: "tcp_socket" + port: 1514 + targetPort: 1514 + protocol: "TCP" + appProtocol: "tcp" configMap: content: |- -- 2.45.2 From c16ad821507565b6e4d5cdd9f3ddac7824716281 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 12:28:37 +0100 Subject: [PATCH 118/129] # extraPorts: # - name: "tcp_socket" # port: 1514 # targetPort: 1514 # protocol: "TCP" # appProtocol: "tcp" --- template/stacks/monitoring/alloy/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 76176f1..6503023 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -5,12 +5,12 @@ alloy: uiPathPrefix: "/alloy" - extraPorts: - - name: "tcp_socket" - port: 1514 - targetPort: 1514 - protocol: "TCP" - appProtocol: "tcp" + # extraPorts: + # - name: "tcp_socket" + # port: 1514 + # targetPort: 1514 + # protocol: "TCP" + # appProtocol: "tcp" configMap: content: |- -- 2.45.2 From d64ecf325b297f8bb7bc36f94e5fdc5168acadc8 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 12:30:30 +0100 Subject: [PATCH 119/129] address = "0.0.0.0:12345" --- template/stacks/monitoring/alloy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 6503023..a58b06b 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -86,7 +86,7 @@ alloy: loki.source.syslog "tcp_socket" { listener { - address = "0.0.0.0:1514" + address = "0.0.0.0:12345" } forwardping_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From bfc8972580ebdcd7a9db6f2a0d1fa15718381f95 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 12:34:48 +0100 Subject: [PATCH 120/129] forward_to = [loki.write.local_loki.receiver] --- template/stacks/monitoring/alloy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index a58b06b..270a65c 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -88,5 +88,5 @@ alloy: listener { address = "0.0.0.0:12345" } - forwardping_to = [loki.write.local_loki.receiver] + forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From e8c6aeb3c2c18edb2c9824029f2a5e2218625f11 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 12:38:39 +0100 Subject: [PATCH 121/129] address = "0.0.0.0:1514" --- template/stacks/monitoring/alloy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 270a65c..a2c5cf1 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -86,7 +86,7 @@ alloy: loki.source.syslog "tcp_socket" { listener { - address = "0.0.0.0:12345" + address = "0.0.0.0:1514" } forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From ecf2ed5787ac72fe218a0f20a34ab943528f11ea Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 12:43:02 +0100 Subject: [PATCH 122/129] extraPorts: - name: "tcp_socket" port: 1514 targetPort: 1514 protocol: "TCP" appProtocol: "tcp" --- template/stacks/monitoring/alloy/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index a2c5cf1..307b621 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -5,12 +5,12 @@ alloy: uiPathPrefix: "/alloy" - # extraPorts: - # - name: "tcp_socket" - # port: 1514 - # targetPort: 1514 - # protocol: "TCP" - # appProtocol: "tcp" + extraPorts: + - name: "tcp_socket" + port: 1514 + targetPort: 1514 + protocol: "TCP" + appProtocol: "tcp" configMap: content: |- -- 2.45.2 From 21ce529abe736d1af6c363b05fcdebc92c493ff3 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 12:50:13 +0100 Subject: [PATCH 123/129] create: false name: alloy-config key: config.alloy --- template/stacks/monitoring/alloy/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 307b621..71f6874 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -1,10 +1,5 @@ alloy: - create: false - name: alloy-config - key: config.alloy - - uiPathPrefix: "/alloy" - + extraPorts: - name: "tcp_socket" port: 1514 @@ -12,7 +7,12 @@ alloy: protocol: "TCP" appProtocol: "tcp" + uiPathPrefix: "/alloy" + configMap: + create: false + name: alloy-config + key: config.alloy content: |- logging { -- 2.45.2 From a1925e083b9ba7529e8741ccdc5ca1bc9d48d53a Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 12:56:03 +0100 Subject: [PATCH 124/129] - name: "tcpsocket" --- template/stacks/monitoring/alloy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 71f6874..e41a24c 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -1,7 +1,7 @@ alloy: extraPorts: - - name: "tcp_socket" + - name: "tcpsocket" port: 1514 targetPort: 1514 protocol: "TCP" -- 2.45.2 From 2fda5818ec1acc07c0929f40a317ad0995828a8e Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 13:03:23 +0100 Subject: [PATCH 125/129] create: false name: alloy-config key: config.alloy --- template/stacks/monitoring/alloy/values.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index e41a24c..8875c77 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -9,10 +9,11 @@ alloy: uiPathPrefix: "/alloy" + create: false + name: alloy-config + key: config.alloy + configMap: - create: false - name: alloy-config - key: config.alloy content: |- logging { -- 2.45.2 From 992749c6fc74db831eafdbf7acee74d5c02fee92 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 13:16:02 +0100 Subject: [PATCH 126/129] loki.source.kubernetes "all_pod_logs" { targets = discovery.relabel.pod_logs.output forward_to = [loki.write.local_loki.receiver] } --- template/stacks/monitoring/alloy/values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 8875c77..2798ab2 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -80,10 +80,6 @@ alloy: } - loki.source.kubernetes "all_pod_logs" { - targets = discovery.relabel.pod_logs.output - forward_to = [loki.write.local_loki.receiver] - } loki.source.syslog "tcp_socket" { listener { -- 2.45.2 From 574fe295654109e02f3530c8769e11534786aea7 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 13:46:08 +0100 Subject: [PATCH 127/129] labels = { component = "loki.source.syslog", protocol = "tcp" } --- template/stacks/monitoring/alloy/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 2798ab2..5a46a11 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -85,5 +85,6 @@ alloy: listener { address = "0.0.0.0:1514" } + labels = { component = "loki.source.syslog", protocol = "tcp" } forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From 1f429f079beea214b84200624e11ff0f4642a5d5 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 13:55:46 +0100 Subject: [PATCH 128/129] loki.source.syslog "tcp_socket" { listener { address = "0.0.0.0:1514" labels = { component = "loki.source.syslog", protocol = "tcp" } } forward_to = [loki.write.local_loki.receiver] } --- template/stacks/monitoring/alloy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index 5a46a11..d24bc06 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -84,7 +84,7 @@ alloy: loki.source.syslog "tcp_socket" { listener { address = "0.0.0.0:1514" + labels = { component = "loki.source.syslog", protocol = "tcp" } } - labels = { component = "loki.source.syslog", protocol = "tcp" } forward_to = [loki.write.local_loki.receiver] } \ No newline at end of file -- 2.45.2 From f9c880549de895be9ec21b4e152565ee373c7820 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 26 Mar 2025 14:51:33 +0100 Subject: [PATCH 129/129] configuration added --- template/stacks/monitoring/alloy/values.yaml | 5 +- .../openbao-logging-setup.yaml | 29 ---------- .../create-logging-directory.yaml | 37 ------------ .../openbao-logging/logrotate.yaml | 56 ------------------- .../sidecar-container-alloy-configmap.yaml | 26 --------- .../ref-implementation/openbao/values.yaml | 36 +----------- 6 files changed, 6 insertions(+), 183 deletions(-) delete mode 100644 template/stacks/ref-implementation/openbao-logging-setup.yaml delete mode 100644 template/stacks/ref-implementation/openbao-logging/create-logging-directory.yaml delete mode 100644 template/stacks/ref-implementation/openbao-logging/logrotate.yaml delete mode 100644 template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml index d24bc06..50dddb8 100644 --- a/template/stacks/monitoring/alloy/values.yaml +++ b/template/stacks/monitoring/alloy/values.yaml @@ -1,5 +1,4 @@ alloy: - extraPorts: - name: "tcpsocket" port: 1514 @@ -80,6 +79,10 @@ alloy: } + loki.source.kubernetes "all_pod_logs" { + targets = discovery.relabel.pod_logs.output + forward_to = [loki.write.local_loki.receiver] + } loki.source.syslog "tcp_socket" { listener { diff --git a/template/stacks/ref-implementation/openbao-logging-setup.yaml b/template/stacks/ref-implementation/openbao-logging-setup.yaml deleted file mode 100644 index d6f9bc6..0000000 --- a/template/stacks/ref-implementation/openbao-logging-setup.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: openbao-logging-setup - namespace: argocd - labels: - env: dev - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: default - source: - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder - targetRevision: HEAD - path: "stacks/ref-implementation/openbao-logging" - destination: - server: "https://kubernetes.default.svc" - namespace: openbao - syncPolicy: - syncOptions: - - CreateNamespace=true - automated: - selfHeal: true - retry: - limit: -1 - backoff: - duration: 15s - factor: 1 - maxDuration: 15s diff --git a/template/stacks/ref-implementation/openbao-logging/create-logging-directory.yaml b/template/stacks/ref-implementation/openbao-logging/create-logging-directory.yaml deleted file mode 100644 index 1a0b0d0..0000000 --- a/template/stacks/ref-implementation/openbao-logging/create-logging-directory.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: openbao-logging-dir - namespace: openbao -spec: - selector: - matchLabels: - app: openbao-logging-dir - template: - metadata: - labels: - app: openbao-logging-dir - spec: - initContainers: - - name: creator - image: busybox - command: ["/bin/sh", "-c"] - args: - - | - set -e - mkdir -p /var/log/openbao - chown 100:100 /var/log/openbao - securityContext: - runAsUser: 0 - volumeMounts: - - name: host-log - mountPath: /var/log - containers: - - name: running-container - image: busybox - command: ["sleep", "infinity"] - volumes: - - name: host-log - hostPath: - path: /var/log - type: Directory \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml b/template/stacks/ref-implementation/openbao-logging/logrotate.yaml deleted file mode 100644 index 4c2be6f..0000000 --- a/template/stacks/ref-implementation/openbao-logging/logrotate.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: openbao-logrotate - namespace: openbao -spec: - selector: - matchLabels: - app: openbao-logrotate - template: - metadata: - labels: - app: openbao-logrotate - spec: - containers: - - name: logrotate - image: alpine - command: ["/bin/sh", "-c"] - args: - - | - apk add --no-cache logrotate - while true; do logrotate -f /etc/logrotate.d/openbao; sleep 60; done - volumeMounts: - - name: logrotate-config - mountPath: /etc/logrotate.d/openbao - subPath: openbao - - name: host-log - mountPath: /var/log/openbao - volumes: - - name: logrotate-config - configMap: - name: openbao-logrotate-config - - name: host-log - hostPath: - path: /var/log - type: Directory ---- - -apiVersion: v1 -kind: ConfigMap -metadata: - name: openbao-logrotate-config - namespace: openbao -data: - openbao: | - /var/log/openbao/openbao/*.log { - size 5k - rotate 7 - compress - missingok - notifempty - postrotate - mkdir pupa - kill -SIGHUP $(pidof bao) - endscript - } \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml b/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml deleted file mode 100644 index 1b89a78..0000000 --- a/template/stacks/ref-implementation/openbao-logging/sidecar-container-alloy-configmap.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# apiVersion: v1 -# kind: ConfigMap -# metadata: -# name: sidecar-container-alloy-config -# data: -# config.alloy: | -# logging { -# level = "info" -# format = "logfmt" -# } - -# loki.write "local_loki" { -# endpoint { -# url = "http://loki-loki-distributed-gateway.monitoring.svc.cluster.local/loki/api/v1/push" -# } -# } - -# local.file_match "applogs" { -# path_targets = [{"__path__" = "/openbao/logs/*"}] -# sync_period = "5s" -# } - -# loki.source.file "openbao_logs" { -# targets = local.file_match.applogs.targets -# forward_to = [loki.write.local_loki.receiver] -# } \ No newline at end of file diff --git a/template/stacks/ref-implementation/openbao/values.yaml b/template/stacks/ref-implementation/openbao/values.yaml index 233b44d..7306dd6 100644 --- a/template/stacks/ref-implementation/openbao/values.yaml +++ b/template/stacks/ref-implementation/openbao/values.yaml @@ -1,35 +1,4 @@ -server: - # extraContainers: - # - name: grafana-alloy - # image: grafana/alloy:latest - # ports: - # - containerPort: 12345 - # securityContext: - # runAsUser: 100 - # volumeMounts: - # - name: alloy-data - # mountPath: /var/lib/alloy - # - name: config-volume - # mountPath: /etc/alloy - # - name: host-log-storage - # mountPath: /openbao/logs - - volumes: - # - name: alloy-data - # emptyDir: {} - # - name: config-volume - # configMap: - # name: sidecar-container-alloy-config - - name: host-log-storage - hostPath: - path: /var/log - type: Directory - - volumeMounts: - - mountPath: /openbao/logs - name: host-log-storage - readOnly: false - +server: postStart: - sh - -c @@ -46,7 +15,6 @@ server: echo $(grep "Unseal Key 5:" /tmp/init.txt | awk '{print $NF}')| cat > /openbao/data/unseal_key5.txt bao login $(grep "Initial Root Token:" /tmp/init.txt | awk '{print $NF}') rm /tmp/init.txt - bao audit enable -path="stdout" file file_path=stdout - bao audit enable -path="file" file file_path=/openbao/logs/openbao/openbao.log + bao audit enable socket address=alloy.monitoring.svc.cluster.local:1514 socket_type=tcp ui: enabled: true \ No newline at end of file -- 2.45.2