From 9bb7d09f9ad13c4e44222ef57b37e9c73cf83dcd Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Fri, 30 Jun 2023 20:28:48 -0400 Subject: [PATCH] feat(redis-insight): Port to new common (#10039) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [X] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/incubator/redisinsight/Chart.yaml | 6 +-- charts/incubator/redisinsight/questions.yaml | 38 +++++++++--------- .../redisinsight/templates/NOTES.txt | 1 + .../redisinsight/templates/common.yaml | 3 +- charts/incubator/redisinsight/values.yaml | 39 +++++++++++-------- 5 files changed, 46 insertions(+), 41 deletions(-) create mode 100644 charts/incubator/redisinsight/templates/NOTES.txt diff --git a/charts/incubator/redisinsight/Chart.yaml b/charts/incubator/redisinsight/Chart.yaml index e0a4c973f9b..8fe2af3a522 100644 --- a/charts/incubator/redisinsight/Chart.yaml +++ b/charts/incubator/redisinsight/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: redisinsight -version: 2.0.9 -appVersion: "latest" +version: 3.0.0 +appVersion: "v1.14.0" description: GUI for Redis. type: application deprecated: false @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.14.2 maintainers: - email: info@truecharts.org name: TrueCharts diff --git a/charts/incubator/redisinsight/questions.yaml b/charts/incubator/redisinsight/questions.yaml index c6945b8b597..ed688d226c8 100644 --- a/charts/incubator/redisinsight/questions.yaml +++ b/charts/incubator/redisinsight/questions.yaml @@ -120,29 +120,29 @@ questions: # Include{ingressTraefik} # Include{ingressAdvanced} # Include{ingressList} +# Include{securityContextRoot} -# Include{podSecurityContextRoot} - - variable: runAsUser - label: runAsUser - description: The UserID of the user running the application - schema: - type: int - default: 0 - - variable: runAsGroup - label: runAsGroup - description: The groupID this App of the user running the application - schema: - type: int - default: 0 + - variable: runAsUser + label: runAsUser + description: The UserID of the user running the application + schema: + type: int + default: 0 + - variable: runAsGroup + label: runAsGroup + description: The groupID this App of the user running the application + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup - label: fsGroup - description: The group that should own ALL storage. - schema: - type: int - default: 568 + - variable: fsGroup + label: fsGroup + description: The group that should own ALL storage. + schema: + type: int + default: 568 # Include{resources} # Include{advanced} diff --git a/charts/incubator/redisinsight/templates/NOTES.txt b/charts/incubator/redisinsight/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/redisinsight/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/redisinsight/templates/common.yaml b/charts/incubator/redisinsight/templates/common.yaml index cbf66c20818..b51394e00a4 100644 --- a/charts/incubator/redisinsight/templates/common.yaml +++ b/charts/incubator/redisinsight/templates/common.yaml @@ -1,2 +1 @@ -{{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/redisinsight/values.yaml b/charts/incubator/redisinsight/values.yaml index 40a8148f79d..7336488ff69 100644 --- a/charts/incubator/redisinsight/values.yaml +++ b/charts/incubator/redisinsight/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/redisinsight - tag: latest@sha256:723214d13e55e0a65f7f698e4f431ffe2e2da8e5e859c89c86040ffc672cfafc + tag: v1.14.0@sha256:569d8cfd3352ef17800d0c1cb3437ce4510f49571c1d61bbb3422ebc1fd1bb0e redisinsight: log_level: WARNING @@ -9,28 +9,32 @@ redisinsight: auth_prompt: false auth_timer: 30 -env: - RIPORT: "{{ .Values.service.main.ports.main.port }}" - RIHOMEDIR: /config - RILOGDIR: /logs - RILOGLEVEL: "{{ .Values.redisinsight.log_level }}" - RITRUSTEDORIGINS: '{{ join "," .Values.redisinsight.trusted_origins }}' - RIAUTHPROMPT: "{{ .Values.redisinsight.auth_prompt }}" - RIAUTHTIMER: "{{ .Values.redisinsight.auth_timer }}" - -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 +workload: + main: + podSpec: + containers: + main: + env: + RIPORT: "{{ .Values.service.main.ports.main.port }}" + RIHOMEDIR: /config + RILOGDIR: /logs + RILOGLEVEL: "{{ .Values.redisinsight.log_level }}" + RITRUSTEDORIGINS: '{{ join "," .Values.redisinsight.trusted_origins }}' + RIAUTHPROMPT: "{{ .Values.redisinsight.auth_prompt }}" + RIAUTHTIMER: "{{ .Values.redisinsight.auth_timer }}" securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsGroup: 0 + runAsUser: 0 service: main: ports: main: - protocol: HTTP + protocol: http port: 10579 persistence: @@ -42,4 +46,5 @@ persistence: mountPath: /logs portal: - enabled: true + open: + enabled: true