From 0d704d846ac1c1a62abb1bbc17b013b8bb6ec2b0 Mon Sep 17 00:00:00 2001 From: Siri Date: Fri, 4 Mar 2022 00:41:15 +0700 Subject: [PATCH] Fixed external uri (#109) * Fixed external uri * fix space Signed-off-by: KongZ --- charts/graylog/Chart.yaml | 4 ++-- charts/graylog/README.md | 5 ++--- charts/graylog/templates/_helpers.tpl | 15 +-------------- charts/graylog/values.yaml | 5 +---- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/charts/graylog/Chart.yaml b/charts/graylog/Chart.yaml index 83e57c7..cffa0f9 100755 --- a/charts/graylog/Chart.yaml +++ b/charts/graylog/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: graylog home: https://www.graylog.org -version: 2.1.0 -appVersion: 4.2.3 +version: 2.1.1 +appVersion: 4.2.7 description: Graylog is the centralized log management solution built to open standards for capturing, storing, and enabling real-time analysis of terabytes of machine data. keywords: - graylog diff --git a/charts/graylog/README.md b/charts/graylog/README.md index 17e2cea..1ca2922 100644 --- a/charts/graylog/README.md +++ b/charts/graylog/README.md @@ -113,13 +113,12 @@ The following table lists the configurable parameters of the Graylog chart and t | Parameter | Description | Default | |------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------| | `graylog.image.repository` | `graylog` image repository | `graylog/graylog` | -| `graylog.image.tag` | `graylog` image tag | `4.2.3-1` | -| `graylog.imagePullPolicy` | Image pull policy | `IfNotPresent` | +| `graylog.image.tag` | `graylog` image tag | `4.2.7-1` | +| `graylog.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `graylog.replicas` | The number of Graylog instances in the cluster. The chart will automatic create assign master to one of replicas | `2` | | `graylog.resources` | CPU/Memory resource requests/limits | Memory: `1024Mi`, CPU: `500m` | | `graylog.heapSize` | Override Java heap size. If this value empty, chart will allocate heap size using `-XX:+UseCGroupMemoryLimitForHeap` | | | `graylog.externalUri` | External URI that Graylog is available at | | -| `graylog.externalUriTLS` | Using TLS offload on External URI? set this to `true` to get https:// on ExternalUri at | | | `graylog.nodeSelector` | Graylog server pod assignment | `{}` | | `graylog.affinity` | Graylog server affinity | `{}` | | `graylog.tolerations` | Graylog server tolerations | `[]` | diff --git a/charts/graylog/templates/_helpers.tpl b/charts/graylog/templates/_helpers.tpl index ba0702f..369e01f 100644 --- a/charts/graylog/templates/_helpers.tpl +++ b/charts/graylog/templates/_helpers.tpl @@ -57,25 +57,12 @@ Craft url taking into account the TLS settings of the server {{- end -}} {{- end -}} -{{/* -Craft Publicurl taking into account the TLS settings of the server -*/}} -{{- define "graylog.formatPublicUrl" -}} -{{- $env := index . 0 }} -{{- $url := index . 1 }} -{{- if $env.Values.graylog.externalUriTLS }} -{{- printf "https://%s" $url }} -{{- else }} -{{- printf "http://%s" $url }} -{{- end -}} -{{- end -}} - {{/* Print external URI */}} {{- define "graylog.url" -}} {{- if .Values.graylog.externalUri }} -{{- include "graylog.formatPublicUrl" (list . .Values.graylog.externalUri) }} +{{- printf .Values.graylog.externalUri }} {{- else if .Values.graylog.ingress.enabled }} {{- if .Values.graylog.ingress.tls }} {{- range .Values.graylog.ingress.tls }}{{ range .hosts }}https://{{ . }}{{ end }}{{ end }} diff --git a/charts/graylog/values.yaml b/charts/graylog/values.yaml index 66c499e..38f6db7 100644 --- a/charts/graylog/values.yaml +++ b/charts/graylog/values.yaml @@ -265,13 +265,10 @@ graylog: ## certFile: /etc/graylog/server/server.cert - ## External URL to access Graylog at + ## External URL to access Graylog at e.g. https://graylog.mycompany.com ## externalUri: "" - ## External URL is https ? - externalUriTLS: false - ingress: ## If true, Graylog server Ingress will be created ##