Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable log collection by default for PAAS #272

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Disable log collection by default for PAAS #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/paas/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/paas/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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` |
Expand Down
1 change: 1 addition & 0 deletions charts/paas/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
1 change: 1 addition & 0 deletions charts/paas/ci/test-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ namespaces:
serviceAccount: foo-account
account: foo
groups: ['bar']
collectLogs: true
- name: baz
serviceAccount: example
account: baz
3 changes: 3 additions & 0 deletions charts/paas/templates/namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Loading