From b5f09feffc80dff1bb6c6eb01de5d58bd7dbc7db Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 6 Mar 2023 22:50:19 +0100 Subject: [PATCH] fix(blocky/grafana): minor fixes (#7752) * fix(blocky): fix k8s-gateway not deploying when enabled * also fix grafana * more grafana fixes * caps * try something else * stupid selector mistake --- charts/enterprise/blocky/Chart.yaml | 2 +- .../blocky/templates/_k8sgateway.tpl | 28 +++--- .../enterprise/blocky/templates/common.yaml | 8 +- charts/enterprise/grafana/Chart.yaml | 2 +- charts/enterprise/grafana/questions.yaml | 90 +++++++++---------- 5 files changed, 62 insertions(+), 68 deletions(-) diff --git a/charts/enterprise/blocky/Chart.yaml b/charts/enterprise/blocky/Chart.yaml index ea9f8d78504..ccf8eaa54ce 100644 --- a/charts/enterprise/blocky/Chart.yaml +++ b/charts/enterprise/blocky/Chart.yaml @@ -26,7 +26,7 @@ sources: - https://0xerr0r.github.io/blocky/ - https://github.com/0xERR0R/blocky - https://github.com/Mozart409/blocky-frontend -version: 5.0.5 +version: 5.0.6 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/blocky/templates/_k8sgateway.tpl b/charts/enterprise/blocky/templates/_k8sgateway.tpl index e1dc79f3d5a..37bf5833e14 100644 --- a/charts/enterprise/blocky/templates/_k8sgateway.tpl +++ b/charts/enterprise/blocky/templates/_k8sgateway.tpl @@ -1,28 +1,24 @@ {{- define "k8sgateway.container" -}} -image: {{ .Values.k8sgatewayImage.repository }}:{{ .Values.k8sgatewayImage.tag }} -imagePullPolicy: {{ .Values.k8sgatewayImage.pullPolicy }} +enabled: true +imageSelector: k8sgatewayImage securityContext: runAsUser: 0 runAsGroup: 0 readOnlyRootFilesystem: true - runAsNonRoot: false args: ["-conf", "/etc/coredns/Corefile"] -volumeMounts: - - name: config-volume - mountPath: /etc/coredns -probe: +probes: readiness: - httpGet: - path: /ready - port: 8181 + enabled: true + path: /ready + port: 8181 liveness: - httpGet: - path: /health - port: 8080 + enabled: true + path: /health + port: 8080 startup: - httpGet: - path: /ready - port: 8181 + enabled: true + path: /ready + port: 8181 {{- end -}} {{/* diff --git a/charts/enterprise/blocky/templates/common.yaml b/charts/enterprise/blocky/templates/common.yaml index dd44acdaf99..f8f297e8e64 100644 --- a/charts/enterprise/blocky/templates/common.yaml +++ b/charts/enterprise/blocky/templates/common.yaml @@ -27,12 +27,16 @@ subPath: config.yml {{- define "k8sgateway.configvolume" -}} enabled: true type: configmap -mountPath: "/etc/coredns" objectName: corefile -readOnly: true items: - key: Corefile path: Corefile +targetSelector: + main: + k8sgateway: + mountPath: "/etc/coredns" + readOnly: true + {{- end -}} {{- $_ := set .Values.persistence "tc-config" (include "blocky.configmap.mount" . | fromYaml) -}} diff --git a/charts/enterprise/grafana/Chart.yaml b/charts/enterprise/grafana/Chart.yaml index 4137d69596a..6755c0249a1 100644 --- a/charts/enterprise/grafana/Chart.yaml +++ b/charts/enterprise/grafana/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://github.com/bitnami/bitnami-docker-grafana - https://grafana.com/ type: application -version: 7.0.4 +version: 7.0.5 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/enterprise/grafana/questions.yaml b/charts/enterprise/grafana/questions.yaml index 349775e26c6..485c62b4e6b 100644 --- a/charts/enterprise/grafana/questions.yaml +++ b/charts/enterprise/grafana/questions.yaml @@ -10,57 +10,51 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: GF_SECURITY_ADMIN_USER + label: "Admin User" + schema: + type: string + required: true + default: "admin" + - variable: GF_SECURITY_ADMIN_PASSWORD + label: "Admin Password" + schema: + type: string + required: true + private: true + default: "REPLACETHIS" + - variable: GF_INSTALL_PLUGINS + label: "Extra Plugins to Install" + description: "comma seperated" + schema: + type: string + default: "" + - variable: GF_AUTH_LDAP_ENABLED + label: "enable LDAP" + schema: + type: boolean + default: false + - variable: GF_AUTH_LDAP_ALLOW_SIGN_UP + label: "Allow LDAP Signup" + schema: + type: boolean + default: false + - variable: GF_AUTH_LDAP_CONFIG_FILE + label: "LDAP Config Path" + schema: + type: string + default: "/opt/bitnami/grafana/conf/ldap.toml" # Include{containerBasic} # Include{containerAdvanced} - - variable: secretEnv - group: "App Configuration" - label: "Secret Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: GF_SECURITY_ADMIN_USER - label: "Admin User" - schema: - type: string - required: true - default: "admin" - - variable: GF_SECURITY_ADMIN_PASSWORD - label: "Admin Password" - schema: - type: string - required: true - private: true - default: "REPLACETHIS" - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: GF_INSTALL_PLUGINS - label: "Extra Plugins to Install" - description: "comma seperated" - schema: - type: string - default: "" - - variable: GF_AUTH_LDAP_ENABLED - label: "enable LDAP" - schema: - type: boolean - default: false - - variable: GF_AUTH_LDAP_ALLOW_SIGN_UP - label: "Allow LDAP Signup" - schema: - type: boolean - default: false - - variable: GF_AUTH_LDAP_CONFIG_FILE - label: "LDAP Config Path" - schema: - type: string - default: "/opt/bitnami/grafana/conf/ldap.toml" + # Include{containerConfig} # Include{serviceRoot} - variable: main