diff --git a/config/configStruct.go b/config/configStruct.go index b3d474325..068bf0bd0 100644 --- a/config/configStruct.go +++ b/config/configStruct.go @@ -96,6 +96,7 @@ type ConfigStruct struct { License string `yaml:"license" json:"license" default:""` Scripting configStructs.ScriptingConfig `yaml:"scripting" json:"scripting"` Manifests ManifestsConfig `yaml:"manifests,omitempty" json:"manifests,omitempty"` + Timezone string `yaml:"timezone" json:"timezone"` } func (config *ConfigStruct) ImagePullPolicy() v1.PullPolicy { diff --git a/helm-chart/README.md b/helm-chart/README.md index 47d0b7120..cde69126d 100644 --- a/helm-chart/README.md +++ b/helm-chart/README.md @@ -173,6 +173,7 @@ Please refer to [metrics](./metrics.md) documentation for details. | `scripting.source` | Source directory of the scripts | `""` | | `scripting.watchScripts` | Enable watch mode for the scripts in source directory | `true` | | `tap.metrics.port` | Pod port used to expose Prometheus metrics | `49100` | +| `timezone` | IANA time zone applied to time shown in the front-end | `""` (local time zone applies) | KernelMapping pairs kernel versions with a DriverContainer image. Kernel versions can be matched diff --git a/helm-chart/templates/06-front-deployment.yaml b/helm-chart/templates/06-front-deployment.yaml index 0dc4d5b6d..c088ea3d5 100644 --- a/helm-chart/templates/06-front-deployment.yaml +++ b/helm-chart/templates/06-front-deployment.yaml @@ -32,6 +32,8 @@ spec: value: '{{ not (eq .Values.tap.auth.type "") | ternary .Values.tap.auth.type " " }}' - name: REACT_APP_AUTH_SAML_IDP_METADATA_URL value: '{{ not (eq .Values.tap.auth.saml.idpMetadataUrl "") | ternary .Values.tap.auth.saml.idpMetadataUrl " " }}' + - name: REACT_APP_TIMEZONE + value: '{{ not (eq .Values.timezone "") | ternary .Values.timezone " " }}' - name: REACT_APP_REPLAY_DISABLED value: '{{ .Values.tap.replayDisabled }}' - name: REACT_APP_SCRIPTING_DISABLED diff --git a/helm-chart/templates/12-config-map.yaml b/helm-chart/templates/12-config-map.yaml index 4f9feb6a9..936bb9932 100644 --- a/helm-chart/templates/12-config-map.yaml +++ b/helm-chart/templates/12-config-map.yaml @@ -28,3 +28,4 @@ data: JSON_TTL: '{{ .Values.tap.misc.jsonTTL }}' PCAP_TTL: '{{ .Values.tap.misc.pcapTTL }}' PCAP_ERROR_TTL: '{{ .Values.tap.misc.pcapErrorTTL }}' + TIMEZONE: '{{ not (eq .Values.timezone "") | ternary .Values.timezone " " }}' diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 65c5ee738..2717988a9 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -128,3 +128,4 @@ scripting: env: {} source: "" watchScripts: true +timezone: "" diff --git a/manifests/complete.yaml b/manifests/complete.yaml index fa8011dd1..386abf9c1 100644 --- a/manifests/complete.yaml +++ b/manifests/complete.yaml @@ -727,6 +727,8 @@ spec: value: 'saml' - name: REACT_APP_AUTH_SAML_IDP_METADATA_URL value: ' ' + - name: REACT_APP_TIMEZONE + value: ' ' - name: REACT_APP_REPLAY_DISABLED value: 'false' - name: REACT_APP_SCRIPTING_DISABLED