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

Jump to bottom

Add option to disable Windows logging for Windows clusters #1133

Merged
merged 1 commit into from
Apr 22, 2021
Merged

Add option to disable Windows logging for Windows clusters #1133

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/rancher-logging/generated-changes/overlay/templates/loggings/root/logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
{{ include "logging-operator.labels" . | indent 4 }}
spec:
controlNamespace: {{ .Release.Namespace }}
{{- if not (kindIs "invalid" .Values.global.cattle.windows.enabled) }}
{{- if .Values.global.cattle.windows.enabled }}
nodeAgents:
- name: win-agent
Expand Down Expand Up @@ -45,6 +46,7 @@ spec:
enabled: {{ .Values.nodeAgents.tls.enabled | default false }}
{{- end }}
{{- end }}
{{- end }}
fluentbit:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
Expand Down
10 changes: 7 additions & 3 deletions packages/rancher-logging/generated-changes/patch/values.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
rbac:
enabled: true
psp:
@@ -85,3 +93,79 @@
@@ -85,3 +93,83 @@
additionalLabels: {}
metricRelabelings: []
relabelings: []
Expand Down Expand Up @@ -105,8 +105,12 @@
+global:
+ cattle:
+ systemDefaultRegistry: ""
+ windows:
+ enabled: false
nickgerace marked this conversation as resolved.
Show resolved Hide resolved
+ # Uncomment the below two lines to either enable or disable Windows logging. If this chart is
+ # installed via the Rancher UI, it will set this value to "true" if the cluster is a Windows
+ # cluster. In that scenario, if you would like to disable Windows logging on Windows clusters,
+ # set the value below to "false".
+ # windows:
+ # enabled: true
cbron marked this conversation as resolved.
Show resolved Hide resolved
+ # Change the "dockerRootDirectory" if the default Docker directory has changed.
+ dockerRootDirectory: ""
+ # This psp setting differs from the upstream "rbac.psp" by only enabling psp settings for the
Expand Down
2 changes: 1 addition & 1 deletion packages/rancher-logging/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
url: https://kubernetes-charts.banzaicloud.com/charts/logging-operator-3.9.4.tgz
packageVersion: 00
releaseCandidateVersion: 04
releaseCandidateVersion: 05
additionalCharts:
- workingDir: charts-crd
crdOptions:
Expand Down