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

@@ -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

charts/enterprise/blocky/templates/_k8sgateway.tpl

@@ -1,26 +1,22 @@
 {{- define "k8sgateway.container" -}}
-image: {{ .Values.k8sgatewayImage.repository }}:{{ .Values.k8sgatewayImage.tag }}
+enabled: true
-imagePullPolicy: {{ .Values.k8sgatewayImage.pullPolicy }}
+imageSelector: k8sgatewayImage
 securityContext:
   runAsUser: 0
   runAsGroup: 0
   readOnlyRootFilesystem: true
-  runAsNonRoot: false
 args: ["-conf", "/etc/coredns/Corefile"]
-volumeMounts:
+probes:
-  - name: config-volume
-    mountPath: /etc/coredns
-probe:
   readiness:
-    httpGet:
+    enabled: true
     path: /ready
     port: 8181
   liveness:
-    httpGet:
+    enabled: true
     path: /health
     port: 8080
   startup:
-    httpGet:
+    enabled: true
     path: /ready
     port: 8181
 {{- end -}}

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) -}}

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

charts/enterprise/grafana/questions.yaml

@@ -10,12 +10,9 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
-# Include{containerBasic}
+                                - variable: env
-# Include{containerAdvanced}
-
-  - variable: secretEnv
                                   group: "App Configuration"
-    label: "Secret Image Environment"
+                                  label: "Image Environment"
                                   schema:
                                     additional_attrs: true
                                     type: dict
@@ -33,13 +30,6 @@ questions:
                                           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"
@@ -61,6 +51,10 @@ questions:
                                         schema:
                                           type: string
                                           default: "/opt/bitnami/grafana/conf/ldap.toml"
+# Include{containerBasic}
+# Include{containerAdvanced}
+
+
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main