andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trigger windows components in logging if either windows field is true

pull/1438/head
Arvind Iyengar 2021-08-25 16:04:53 -07:00
parent 30a749a867
commit 19ab551eef
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/rancher-logging/generated-changes/patch/templates/_helpers.tpl.patch
View File

@ -1,6 +1,6 @@
--- charts-original/templates/_helpers.tpl --- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl +++ charts/templates/_helpers.tpl
@@ -56,3 +56,92 @@ @@ -56,3 +56,101 @@
{{- end }} {{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}} {{- end -}}
@ -14,13 +14,22 @@
+{{- end -}} +{{- end -}}
+ +
+{{- define "windowsEnabled" }} +{{- define "windowsEnabled" }}
+{{ $windowsEnabled := false }}
+{{- if not (kindIs "invalid" .Values.global.cattle.windows) }} +{{- if not (kindIs "invalid" .Values.global.cattle.windows) }}
+{{- if not (kindIs "invalid" .Values.global.cattle.windows.enabled) }} +{{- if not (kindIs "invalid" .Values.global.cattle.windows.enabled) }}
+{{- if .Values.global.cattle.windows.enabled }} +{{- if .Values.global.cattle.windows.enabled }}
+true +{{- $windowsEnabled = true }}
+{{- end }} +{{- end }}
+{{- end }} +{{- end }}
+{{- end }} +{{- end }}
+{{- if not (kindIs "invalid" .Values.rke2Windows) }}
+{{- if not (kindIs "invalid" .Values.rke2Windows.enabled) }}
+{{- if .Values.rke2Windows.enabled }}
+{{- $windowsEnabled = true }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{ $windowsEnabled }}
+{{- end }} +{{- end }}
+ +
+{{- define "windowsPathPrefix" -}} +{{- define "windowsPathPrefix" -}}

15
packages/rancher-logging/generated-changes/patch/values.yaml.patch
View File

@ -36,7 +36,7 @@
rbac: rbac:
enabled: true enabled: true
psp: psp:
@@ -95,3 +103,109 @@ @@ -95,3 +103,117 @@
additionalLabels: {} additionalLabels: {}
metricRelabelings: [] metricRelabelings: []
relabelings: [] relabelings: []
@ -131,9 +131,10 @@
+ cattle: + cattle:
+ systemDefaultRegistry: "" + systemDefaultRegistry: ""
+ # Uncomment the below two lines to either enable or disable Windows logging. If this chart is + # 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 + # installed via the Rancher UI, it will set this value to "true" if the cluster is an RKE1 Windows
+ # cluster. In that scenario, if you would like to disable Windows logging on Windows clusters, + # cluster. In that scenario, if you would like to disable Windows logging on Windows clusters,
+ # set the value below to "false". + # set both this value below and rke2Windows.enabled to false.
+ #
+ # windows: + # windows:
+ # enabled: true + # enabled: true
+ # Change the "dockerRootDirectory" if the default Docker directory has changed. + # Change the "dockerRootDirectory" if the default Docker directory has changed.
@ -146,3 +147,11 @@
+ rkeWindowsPathPrefix: "c:\\" + rkeWindowsPathPrefix: "c:\\"
+ seLinux: + seLinux:
+ enabled: false + enabled: false
+
+# Uncomment the below two lines to either enable or disable Windows logging. If this chart is
+# installed via the Rancher UI, you will be able to set this value in an RKE2 Windows
+# cluster. In that scenario, if you would like to disable Windows logging on Windows clusters,
+# set this value below to false.
+# rke2Windows:
+# enabled: false
\ No newline at end of file