Disable log collection by default for PAAS

OSC · Dec 16, 2024 · 0db1874 · 0db1874
1 parent 72988c1
commit 0db1874
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/charts/paas/Chart.yaml b/charts/paas/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: paas
 description: OSC PAAS bootstrap Helm Chart
 type: application
-version: 0.4.0
+version: 0.5.0
 appVersion: "0.1.0"
 maintainers:
   - name: treydock

diff --git a/charts/paas/README.md b/charts/paas/README.md
@@ -1,6 +1,6 @@
 # paas
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
 
 OSC PAAS bootstrap Helm Chart
 
@@ -55,6 +55,7 @@ namespaces:
 | account | The charge account for this namespace | **required** |
 | groups | The groups that can manage the namespace's resources | `[]` |
 | allowedDNS | Allowed DNS entries for namespace's Ingress resources | `[]` |
+| collectLogs | Collect pod logs | `false` |
 | cpuLimit | The max CPU this namespace can consume | `4` |
 | cpuDefault | The default CPU request for this namespace | `1` |
 | memoryLimit | The max memory this namespace can consume | `8Gi` |

diff --git a/charts/paas/README.md.gotmpl b/charts/paas/README.md.gotmpl
@@ -52,6 +52,7 @@ namespaces:
 | account | The charge account for this namespace | **required** |
 | groups | The groups that can manage the namespace's resources | `[]` |
 | allowedDNS | Allowed DNS entries for namespace's Ingress resources | `[]` |
+| collectLogs | Collect pod logs | `false` |
 | cpuLimit | The max CPU this namespace can consume | `4` |
 | cpuDefault | The default CPU request for this namespace | `1` |
 | memoryLimit | The max memory this namespace can consume | `8Gi` |

diff --git a/charts/paas/ci/test-values.yaml b/charts/paas/ci/test-values.yaml
@@ -18,6 +18,7 @@ namespaces:
   serviceAccount: foo-account
   account: foo
   groups: ['bar']
+  collectLogs: true
 - name: baz
   serviceAccount: example
   account: baz
diff --git a/charts/paas/templates/namespace.yaml b/charts/paas/templates/namespace.yaml
@@ -15,4 +15,7 @@ metadata:
     {{- with $namespace.allowedDNS }}
     osc.edu/allowed-dns: {{ join "," . | quote }}
     {{- end }}
+    {{- if ne $namespace.collectLogs true }}
+    splunk.com/exclude: "true"
+    {{- end }}
 {{ end }}