From 4d7c76e02151759f1b4be79e8f2dc385942d7012 Mon Sep 17 00:00:00 2001 From: Ryan Holt Date: Tue, 23 Feb 2021 14:11:15 -0500 Subject: [PATCH] [searx] add support for an existingSecret (#618) * add support for an existingSecret Signed-off-by: Ryan Holt * forgot the closing end Signed-off-by: Ryan Holt * add a new line Signed-off-by: Ryan Holt --- charts/searx/Chart.yaml | 2 +- charts/searx/README.md | 1 + charts/searx/templates/helpers.tpl | 4 ++-- charts/searx/templates/secrets.yaml | 7 +++---- charts/searx/values.yaml | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/charts/searx/Chart.yaml b/charts/searx/Chart.yaml index c814b631..82091223 100644 --- a/charts/searx/Chart.yaml +++ b/charts/searx/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.18.0 description: Searx is a privacy-respecting, hackable metasearch engine name: searx -version: 2.0.1 +version: 2.1.0 kubeVersion: ">=1.16.0-0" keywords: - searx diff --git a/charts/searx/README.md b/charts/searx/README.md index 830fea59..f3381b49 100644 --- a/charts/searx/README.md +++ b/charts/searx/README.md @@ -132,6 +132,7 @@ N/A | ingress.enabled | bool | `false` | | | persistence.config.emptyDir | bool | `false` | | | persistence.config.enabled | bool | `false` | | +| searx.existingSecret.enabled | bool | `false` | | | searx.baseUrl | string | `"https://searx.DOMAIN"` | | | searx.mortyKey | string | `"changeme"` | | | service.port.port | int | `80` | | diff --git a/charts/searx/templates/helpers.tpl b/charts/searx/templates/helpers.tpl index 1163c34e..5a02da4b 100644 --- a/charts/searx/templates/helpers.tpl +++ b/charts/searx/templates/helpers.tpl @@ -3,7 +3,7 @@ {{/* Expand the name of the chart. */}} -{{- define "speedtest.name" -}} +{{- define "searx.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -13,7 +13,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "speedtest.fullname" -}} +{{- define "searx.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} diff --git a/charts/searx/templates/secrets.yaml b/charts/searx/templates/secrets.yaml index e3531cfa..d3a0c504 100644 --- a/charts/searx/templates/secrets.yaml +++ b/charts/searx/templates/secrets.yaml @@ -1,7 +1,5 @@ -{{/* -Searx Configuration files. -*/}} +{{- if not .Values.searx.existingSecret.enabled }} apiVersion: v1 kind: Secret metadata: @@ -12,4 +10,5 @@ stringData: BIND_ADDRESS: "0.0.0.0:8080" BASE_URL: {{ .Values.searx.baseUrl }} MORTY_URL: {{ print .Values.searx.baseUrl "/morty/" }} - MORTY_KEY: {{ .Values.searx.mortyKey }} \ No newline at end of file + MORTY_KEY: {{ .Values.searx.mortyKey }} +{{- end }} diff --git a/charts/searx/values.yaml b/charts/searx/values.yaml index 03bbd2f3..71b078b1 100644 --- a/charts/searx/values.yaml +++ b/charts/searx/values.yaml @@ -14,6 +14,8 @@ strategy: type: Recreate searx: + existingSecret: + enabled: false # external URL baseUrl: "https://searx.DOMAIN" # generate a random key used by Morty (Privacy aware web content sanitizer proxy as a service)