From 9ad71ad1157e7dc005fcbda98a74528103e62fa6 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Mon, 13 Dec 2021 23:34:06 +0200 Subject: [PATCH] fix(scrutiny): fix storage and envs (#1530) --- charts/stable/scrutiny/questions.yaml | 82 ++++++++++++++++++++++++++- charts/stable/scrutiny/values.yaml | 7 +++ 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/charts/stable/scrutiny/questions.yaml b/charts/stable/scrutiny/questions.yaml index ec7cee3cdd6..103147ac5ae 100644 --- a/charts/stable/scrutiny/questions.yaml +++ b/charts/stable/scrutiny/questions.yaml @@ -82,7 +82,29 @@ questions: type: dict attrs: # Include{fixedEnv} - + - variable: GIN_MODE + label: "GIN_MODE" + schema: + type: string + default: "release" + required: true + enum: + - value: "release" + description: "release" + - value: "debug" + description: "debug" + - variable: SCRUTINY_WEB + label: "SCRUTINY_WEB" + description: "SCRUTINY_WEB" + schema: + type: boolean + default: true + - variable: SCRUTINY_COLLECTOR + label: "SCRUTINY_COLLECTOR" + description: "SCRUTINY_COLLECTOR" + schema: + type: boolean + default: true # Include{containerConfig} - variable: service @@ -232,6 +254,62 @@ questions: - value: "Memory" description: "Memory" # Include{persistenceAdvanced} + - variable: data + label: "App data Storage" + description: "Stores the Application data." + schema: + type: dict + attrs: + - variable: enabled + label: "Enable the storage" + schema: + type: boolean + default: true + hidden: true + - variable: type + label: "Type of Storage" + description: "Sets the persistence type, Anything other than PVC could break rollback!" + schema: + type: string + default: "simplePVC" + enum: + - value: "simplePVC" + description: "PVC (simple)" + - value: "simpleHP" + description: "HostPath (simple)" + - value: "emptyDir" + description: "emptyDir" + - value: "pvc" + description: "pvc" + - value: "hostPath" + description: "hostPath" +# Include{persistenceBasic} + - variable: hostPath + label: "hostPath" + description: "Path inside the container the storage is mounted" + schema: + show_if: [["type", "=", "hostPath"]] + type: hostpath + - variable: mountPath + label: "mountPath" + description: "Path inside the container the storage is mounted" + schema: + type: string + default: "/config" + hidden: true + valid_chars: '^\/([a-zA-Z0-9._-]+(\s?[a-zA-Z0-9._-]+|\/?))+$' + - variable: medium + label: "EmptyDir Medium" + schema: + show_if: [["type", "=", "emptyDir"]] + type: string + default: "" + enum: + - value: "" + description: "Default" + - value: "Memory" + description: "Memory" +# Include{persistenceAdvanced} # Include{persistenceList} @@ -278,7 +356,7 @@ questions: label: "ReadOnly Root Filesystem" schema: type: boolean - default: true + default: false - variable: allowPrivilegeEscalation label: "Allow Privilege Escalation" schema: diff --git a/charts/stable/scrutiny/values.yaml b/charts/stable/scrutiny/values.yaml index 12cdfdc3d31..81d7d32587f 100644 --- a/charts/stable/scrutiny/values.yaml +++ b/charts/stable/scrutiny/values.yaml @@ -7,6 +7,7 @@ securityContext: runAsNonRoot: false privileged: true allowPrivilegeEscalation: true + readOnlyRootFilesystem: false podSecurityContext: runAsUser: 0 @@ -14,6 +15,9 @@ podSecurityContext: env: PUID: 568 + SCRUTINY_WEB: true + SCRUTINY_COLLECTOR: true + SCRUTINY_API_ENDPOINT: "http://localhost:8080" service: main: @@ -28,6 +32,9 @@ persistence: config: enabled: true mountPath: "/scrutiny/config" + data: + enabled: true + mountPath: "/config" udev: type: hostPath hostPath: /run/udev