From 05416a001967d73dee951c0da30e80e0e0cdf5da Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 9 Aug 2022 13:20:56 +0300 Subject: [PATCH] fix(baikal): cleanup (#3389) * fix(baikal): cleanup * update image --- charts/incubator/baikal/Chart.yaml | 15 +++++------ charts/incubator/baikal/questions.yaml | 8 +++--- charts/incubator/baikal/values.yaml | 37 +++++++++++++------------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/charts/incubator/baikal/Chart.yaml b/charts/incubator/baikal/Chart.yaml index 014d8232600..7018e19fb78 100644 --- a/charts/incubator/baikal/Chart.yaml +++ b/charts/incubator/baikal/Chart.yaml @@ -1,7 +1,3 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - Network-Web apiVersion: v2 appVersion: "nginx" dependencies: @@ -9,12 +5,11 @@ dependencies: repository: https://library-charts.truecharts.org version: 10.4.9 deprecated: false -description: "Baïkal is a lightweight CalDAV+CardDAV server" -home: https://truecharts.org/docs/charts/incubator/baikal -icon: https://truecharts.org/img/hotlink-ok/chart-icons/baikal.png +description: "Baikal is a lightweight CalDAV+CardDAV server" +home: https://github.com/truecharts/charts/tree/master/charts/incubator/baikal +icon: https://truecharts.org/img/chart-icons/baikal.png keywords: - baikal - - Network-Web kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org @@ -27,3 +22,7 @@ sources: - https://hub.docker.com/r/ckulka/baikal/ type: application version: 0.0.14 +annotations: + truecharts.org/SCALE-support: "true" + truecharts.org/catagories: | + - utilities diff --git a/charts/incubator/baikal/questions.yaml b/charts/incubator/baikal/questions.yaml index 0c51d6f1258..97afaa93776 100644 --- a/charts/incubator/baikal/questions.yaml +++ b/charts/incubator/baikal/questions.yaml @@ -32,9 +32,9 @@ questions: description: "This port exposes the container port on the service" schema: type: int - default: 80 + default: 10293 required: true -# Include{advancedPortTCP} +# Include{advancedPortHTTP} - variable: targetPort label: "Target Port" description: "The internal(!) port on the container the Application runs on" @@ -48,7 +48,7 @@ questions: # Include{persistenceRoot} - variable: config label: "config Storage" - description: "Container Path varwwwbaikalconfig" + description: "config Storage" schema: additional_attrs: true type: dict @@ -57,7 +57,7 @@ questions: # Include{persistenceAdvanced} - variable: specific label: "specific Storage" - description: "Container Path varwwwbaikalSpecific" + description: "specific Storage" schema: additional_attrs: true type: dict diff --git a/charts/incubator/baikal/values.yaml b/charts/incubator/baikal/values.yaml index 523304c3e5b..d4743733bce 100644 --- a/charts/incubator/baikal/values.yaml +++ b/charts/incubator/baikal/values.yaml @@ -1,8 +1,24 @@ -env: {} image: - pullPolicy: IfNotPresent repository: tccr.io/truecharts/baikal - tag: vnginx + pullPolicy: IfNotPresent + tag: v0.9.2@sha256:70bae1a684eb0df7be6d3b163cad8a808983b568721bc224e6fcd54b583d3854 + +podSecurityContext: + runAsGroup: 0 + runAsUser: 0 + +securityContext: + readOnlyRootFilesystem: false + runAsNonRoot: false + +service: + main: + ports: + main: + port: 10293 + protocol: HTTP + targetPort: 80 + persistence: config: enabled: true @@ -10,21 +26,6 @@ persistence: specific: enabled: true mountPath: /var/www/baikal/Specific -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false -service: - main: - enabled: true - ports: - main: - enabled: true - port: 80 - protocol: TCP - targetPort: 80 portal: enabled: true