Merge branch 'master' of github.com:truecharts/charts

# Conflicts:
#	charts/enterprise/blocky/Chart.yaml
#	charts/enterprise/blocky/values.yaml
#	charts/enterprise/traefik/Chart.yaml
#	charts/enterprise/traefik/values.yaml
#	charts/operators/cert-manager/Chart.yaml
#	charts/operators/cert-manager/values.yaml
#	charts/operators/cloudnative-pg/Chart.yaml
#	charts/stable/prowlarr/Chart.yaml
#	charts/stable/prowlarr/values.yaml

.github/scripts/install_dependencies.sh

@@ -41,15 +41,14 @@ if [[ "$curr_chart" != "charts/operators/cloudnative-pg" ]]; then
     echo "Done installing cloudnative-pg chart"
 fi
 
-if [[ "$curr_chart" != "charts/operators/grafana-agent-operator" ]]; then
+if [[ "$curr_chart" != "charts/operators/prometheus-operator" ]]; then
-    echo "Installing Grafana-Agent-Operator chart"
+    echo "Installing prometheus-operator chart"
-    TODO Enable later
+    helm install prometheus-operator oci://tccr.io/truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait
-    helm install prometheus-operator oci://tccr.io/truecharts/grafana-agent-operator --namespace grafana-agent-operator --create-namespace --wait
     if [[ "$?" != "0" ]]; then
-        echo "Failed to install grafana-agent-operator chart"
+        echo "Failed to install prometheus-operator chart"
         exit 1
     fi
-    echo "Done installing grafana-agent-operator chart"
+    echo "Done installing prometheus-operator chart"
 fi
 
 if [[ "$curr_chart" != "charts/enterprise/traefik" ]]; then

charts/dependency/memcached/Chart.yaml

@@ -35,4 +35,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/dependency/memcached
   - https://hub.docker.com/r/bitnami/memcached
 type: application
-version: 12.1.4
+version: 12.2.1

charts/dependency/memcached/values.yaml

@@ -12,5 +12,15 @@ service:
 portal:
   open:
     enabled: false
+    
+configmap:
+  dashboard:
+    enabled: true
+    labels:
+      grafana_dashboard: '1'
+    data:
+      memcached.json: >-
+        {{ .Files.Get "dashboard.json" | indent 8 }}
+    
 manifestManager:
   enabled: false

charts/incubator/speedtest-tracker/.helmignore

@@ -0,0 +1,30 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+# OWNERS file for Kubernetes
+OWNERS
+# helm-docs templates
+*.gotmpl
+# docs folder
+/docs
+# icon
+icon.png

charts/incubator/speedtest-tracker/Chart.yaml

@@ -0,0 +1,45 @@
+annotations:
+  max_scale_version: 24.04.0
+  min_scale_version: 23.10.0
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/category: productivity
+  truecharts.org/max_helm_version: "3.14"
+  truecharts.org/min_helm_version: "3.12"
+  truecharts.org/train: incubator
+apiVersion: v2
+appVersion: 0.17.2
+dependencies:
+  - name: common
+    version: 18.0.3
+    repository: oci://tccr.io/truecharts
+    condition: ""
+    alias: ""
+    tags: []
+    import-values: []
+  - name: redis
+    version: 11.2.1
+    repository: oci://tccr.io/truecharts
+    condition: redis.enabled
+    alias: ""
+    tags: []
+    import-values: []
+deprecated: false
+description: Speedtest Tracker is a self-hosted internet performance tracking application that runs speedtest checks against Ookla's Speedtest service.
+home: https://truecharts.org/charts/incubator/speedtest-tracker
+icon: https://truecharts.org/img/hotlink-ok/chart-icons/speedtest-tracker.png
+keywords:
+  - speedtest
+  - speedtest-tracker
+kubeVersion: '>=1.24.0-0'
+maintainers:
+  - name: TrueCharts
+    email: info@truecharts.org
+    url: https://truecharts.org
+name: speedtest-tracker
+sources:
+  - https://github.com/alexjustesen/speedtest-tracker
+  - https://github.com/linuxserver/docker-speedtest-tracker
+  - https://github.com/truecharts/charts/tree/master/charts/incubator/speedtest-tracker
+  - https://ghcr.io/paperless-ngx/paperless-ngx
+type: application
+version: 0.0.1

charts/incubator/speedtest-tracker/README.md

@@ -0,0 +1,4 @@
+---
+title: README
+---
+

charts/incubator/speedtest-tracker/questions.yaml

@@ -0,0 +1,156 @@
+# Include{groups}
+portals:
+  open:
+# Include{portalLink}
+questions:
+# Include{global}
+# Include{workload}
+# Include{workloadDeployment}
+# Include{replicas1}
+# Include{podSpec}
+# Include{containerMain}
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: APP_URL
+                                        label: "Speedtest-Tracker URL"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: TELEGRAM_BOT_TOKEN
+                                        label: "Speedtest-Tracker Telegram Token"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: mail
+                                        label: Show Mail Server Settings
+                                        schema:
+                                          type: boolean
+                                          default: false
+                                          show_subquestions_if: true
+                                          subquestions:
+                                            - variable: MAIL_MAILER
+                                              label: Server Memory
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: "smtp"
+                                            - variable: MAIL_HOST
+                                              label: Host
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: ""
+                                            - variable: MAIL_PORT
+                                              label: Port
+                                              schema:
+                                                type: int
+                                                required: true
+                                                default: 465
+                                            - variable: MAIL_USERNAME
+                                              label: Username
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: ""
+                                            - variable: MAIL_PASSWORD
+                                              label: Password
+                                              schema:
+                                                type: string
+                                                required: true
+                                                private: true
+                                                default: ""
+                                            - variable: MAIL_ENCRYPTION
+                                              label: Mail Server Port
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: ""
+                                            - variable: MAIL_FROM_ADDRESS
+                                              label: Sender Address
+                                              schema:
+                                                type: string
+                                                default: ""
+                                            - variable: MAIL_FROM_NAME
+                                              label: Sender Name
+                                              schema:
+                                                type: string
+                                                default: "Speedtest Tracker"
+# Include{containerBasic}
+# Include{containerAdvanced}
+# Include{containerConfig}
+# Include{podOptions}
+# Include{serviceRoot}
+# Include{serviceMain}
+# Include{serviceSelectorLoadBalancer}
+# Include{serviceSelectorExtras}
+                    - variable: main
+                      label: "Main Service Port Configuration"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 9004
+                              required: true
+# Include{serviceExpertRoot}
+# Include{serviceExpert}
+# Include{serviceList}
+# Include{persistenceRoot}
+        - variable: config
+          label: App Config Storage
+          description: Stores the Application Config.
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{persistenceBasic}
+# Include{persistenceList}
+# Include{ingressRoot}
+        - variable: main
+          label: "Main Ingress"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{ingressDefault}
+# Include{ingressAdvanced}
+# Include{ingressList}
+# Include{securityContextRoot}
+              - 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
+# Include{resources}
+# Include{postgresql}
+# Include{advanced}
+# Include{addons}
+# Include{codeserver}
+# Include{netshoot}
+# Include{vpn}
+# Include{documentation}

charts/incubator/speedtest-tracker/templates/NOTES.txt

@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}

charts/incubator/speedtest-tracker/templates/_secrets.tpl

@@ -0,0 +1,11 @@
+{{/* Define the secrets */}}
+{{- define "speedtest-tracker.secrets" -}}
+{{- $secretName := (printf "%s-speedtest-tracker-secrets" (include "tc.v1.common.lib.chart.names.fullname" $)) -}}
+{{- $key := randAlphaNum 32 -}}
+{{- with (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
+  {{- $key = index .data "APP_KEY" | b64dec -}}
+{{- end }}
+enabled: true
+data:
+  APP_KEY: {{ $key }}
+{{- end -}}

charts/incubator/speedtest-tracker/templates/common.yaml

@@ -0,0 +1,11 @@
+{{/* Make sure all variables are set properly */}}
+{{ include "tc.v1.common.loader.init" . }}
+
+{{/* Render secrets for speedtest-tracker */}}
+{{- $secrets := include "speedtest-tracker.secrets" . | fromYaml -}}
+{{- if $secrets -}}
+{{- $_ := set .Values.secret "speedtest-tracker-secrets" $secrets -}}
+{{- end -}}
+
+{{/* Render the templates */}}
+{{ include "tc.v1.common.loader.apply" . }}

charts/incubator/speedtest-tracker/values.yaml

@@ -0,0 +1,87 @@
+image:
+  repository: ghcr.io/linuxserver/speedtest-tracker
+  pullPolicy: IfNotPresent
+  tag: 0.17.2@sha256:739aaa9df772ff38014d34eb1deddcea16a9e8ab6f72b30e24b23963ca397681
+service:
+  main:
+    ports:
+      main:
+        targetPort: 80
+        port: 9004
+persistence:
+  config:
+    enabled: true
+    mountPath: "/config"
+redis:
+  enabled: true
+  redisUsername: default
+cnpg:
+  main:
+    enabled: true
+    user: speedtest-tracker
+    database: speedtest-tracker
+portal:
+  open:
+    enabled: true
+securityContext:
+  container:
+    runAsNonRoot: false
+    readOnlyRootFilesystem: false
+    runAsUser: 0
+    runAsGroup: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          securityContext:
+            capabilities:
+              add:
+                - SYS_CHROOT
+                - KILL
+          probes:
+            liveness:
+              enabled: true
+              type: http
+              path: /api/healthcheck
+            startup:
+              enabled: true
+              type: http
+              path: /api/healthcheck
+            readiness:
+              enabled: true
+              type: http
+              path: /api/healthcheck
+          env:
+            APP_URL: ""
+            DB_CONNECTION: pgsql
+            DB_HOST:
+              secretKeyRef:
+                name: cnpg-main-urls
+                key: host
+            DB_PORT: "5432"
+            DB_DATABASE: "{{ .Values.cnpg.main.database }}"
+            DB_USERNAME: "{{ .Values.cnpg.main.user }}"
+            DB_PASSWORD:
+              secretKeyRef:
+                name: cnpg-main-user
+                key: password
+            APP_KEY:
+              secretKeyRef:
+                name: speedtest-tracker-secrets
+                key: APP_KEY
+            MAIL_MAILER: "smtp"
+            MAIL_PORT : 465
+            MAIL_USERNAME: ""
+            MAIL_PASSWORD: ""
+            MAIL_ENCRYPTION: ""
+            MAIL_FROM_ADDRESS: ""
+            MAIL_FROM_NAME: "Speedtest Tracker"
+            TELEGRAM_BOT_TOKEN: ""
+            CACHE_DRIVER: redis
+            REDIS_URL:
+              secretKeyRef:
+                expandObjectName: false
+                name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}'
+                key: url
+

charts/operators/cloudnative-pg/values.yaml

@@ -21,5 +21,17 @@ portal:
 operator:
   register: true
 
-manifestManager:
+cloudnative-pg:
-  enabled: false
+  monitoring:
+    # -- Specifies whether the monitoring should be enabled. Requires Prometheus Operator CRDs.
+    podMonitorEnabled: true
+    grafanaDashboard:
+      create: true
+      # -- Allows overriding the namespace where the ConfigMap will be created, defaulting to the same one as the Release.
+      namespace: ""
+      # -- The name of the ConfigMap containing the dashboard.
+      configMapName: "cnpg-grafana-dashboard"
+      # -- Label that ConfigMaps should have to be loaded as dashboards.
+      sidecarLabel: "grafana_dashboard"
+      # -- Label value that ConfigMaps should have to be loaded as dashboards.
+      sidecarLabelValue: "1"

charts/stable/prowlarr/Chart.yaml

@@ -37,4 +37,8 @@ sources:
   - https://ghcr.io/onedr0p/prowlarr-develop
   - https://ghcr.io/onedr0p/exportarr
 type: application
+<<<<<<< HEAD
 version: 15.3.1
+=======
+version: 15.3.0
+>>>>>>> ca4edb9ed17108ac4d6f5ec3b1651d62b566e672