add conditional check for postinit

increment chart
fix backup fields
2024-07-04 22:52:02 -05:00 · 2024-07-04 22:45:41 -05:00 · 2024-07-04 22:45:18 -05:00 · 2024-07-04 22:41:31 -05:00 · 2024-07-01 18:08:23 -05:00 · 2024-07-01 18:08:23 -05:00
10 changed files with 62 additions and 36 deletions
--- a/charts/cloudflared/Chart.yaml
+++ b/charts/cloudflared/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 1.4.0
+version: 1.4.1
 description: Cloudflared Tunnel
 keywords:
  - cloudflare
@@ -15,4 +15,4 @@ dependencies:
    repository: https://bjw-s.github.io/helm-charts/
    version: 3.2.1
 icon: https://avatars.githubusercontent.com/u/314135?s=48&v=4
-appVersion: "2024.6.0"
+appVersion: "2024.6.1"
--- a/charts/cloudflared/values.yaml
+++ b/charts/cloudflared/values.yaml
@@ -3,7 +3,7 @@ existingSecretName: cloudflared-secret
 existingSecretKey: cf-tunnel-token
 image:
  repository: cloudflare/cloudflared
-  tag: "2024.6.0"
+  tag: "2024.6.1"
  pullPolicy: IfNotPresent
 resources:
  requests:
--- a/charts/mysql-cluster/Chart.yaml
+++ b/charts/mysql-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: mysql-cluster
-version: 0.2.1
+version: 0.2.4
 description: Chart for a mysql cluster
 keywords:
  - database
--- a/charts/mysql-cluster/templates/deployment.yaml
+++ b/charts/mysql-cluster/templates/deployment.yaml
@@ -21,32 +21,32 @@ spec:
  version: {{ .Values.cluster.image.version }}
  tlsUseSelfSigned: true
  secretName: {{ .Values.cluster.exisitingCredentialsSecret }}
+  {{- if .Values.cluster.podSpec }}
  podSpec:
-    {{- with .Values.cluster.podSpec }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
+    {{ toYaml .Values.cluster.podSpec | nindent 4 }}
+  {{- end }}
+  {{- if .Values.cluster.podAnnotations }}
  podAnnotations:
-    {{- with .Values.cluster.podAnnotations }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
+    {{ toYaml .Values.cluster.podAnnotations | nindent 4 }}
+  {{- end }}
+  {{- if .Values.cluster.podLabels }}
  podLabels:
-    {{- with .Values.cluster.podLabels }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
+    {{ toYaml .Values.cluster.podLabels | nindent 4 }}
+  {{- end }}
  router:
    instances: {{ required "router.instances is required" .Values.cluster.router.instances }}
+    {{- if .Values.cluster.router.podSpec }}
    podSpec:
-      {{- with .Values.cluster.router.podSpec }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
+      {{- toYaml .Values.cluster.router.podSpec | nindent 6 }}
+    {{- end }}
+    {{- if .Values.cluster.router.podAnnotations }}
    podAnnotations:
-      {{- with .Values.cluster.router.podAnnotations }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
+      {{- toYaml .Values.cluster.router.podAnnotations | nindent 6 }}
+    {{- end }}
+    {{- if .Values.cluster.router.podLabels }}
    podLabels:
-      {{- with .Values.cluster.router.podLabels }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
+      {{- toYaml .Values.cluster.router.podLabels | nindent 6 }}
+    {{- end }}
    tlsSecretName: {{ include "cluster.name" . }}-router-tls
  logs:
    {{- with .Values.cluster.logs }}
--- a/charts/mysql-cluster/values.yaml
+++ b/charts/mysql-cluster/values.yaml
@@ -40,7 +40,6 @@ cluster:

  logs:
    error:
-      enabled: true
      collect: false
    general:
      enabled: false
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 3.1.0
+version: 3.8.3
 description: Chart for cloudnative-pg cluster
 keywords:
  - database
@@ -10,4 +10,4 @@ sources:
 maintainers:
  - name: alexlebens
 icon: https://avatars.githubusercontent.com/u/100373852?s=48&v=4
-appVersion: v1.22.2
+appVersion: v1.23.1
--- a/charts/postgres-cluster/templates/_backup.tpl
+++ b/charts/postgres-cluster/templates/_backup.tpl
@@ -19,12 +19,24 @@ backup:
        name: {{ include "cluster.backupCredentials" . }}
        key: ACCESS_SECRET_KEY
    wal:
+      {{- if .Values.backup.wal.compression }}
      compression: {{ .Values.backup.wal.compression }}
+      {{- end }}
+      {{- if .Values.backup.wal.encryption }}
      encryption: {{ .Values.backup.wal.encryption }}
+      {{- end }}
+      {{- if .Values.backup.wal.maxParallel }}
      maxParallel: {{ .Values.backup.wal.maxParallel }}
+      {{- end }}
    data:
+      {{- if .Values.backup.data.compression }}
      compression: {{ .Values.backup.data.compression }}
+      {{- end }}
+      {{- if .Values.backup.data.encryption }}
      encryption: {{ .Values.backup.data.encryption }}
+      {{- end }}
+      {{- if .Values.backup.data.jobs }}
      jobs: {{ .Values.backup.data.jobs }}
+      {{- end }}
 {{- end }}
 {{- end }}
--- a/charts/postgres-cluster/templates/_bootstrap.tpl
+++ b/charts/postgres-cluster/templates/_bootstrap.tpl
@@ -7,6 +7,7 @@ bootstrap:
    {{- . | toYaml | nindent 4 }}
    {{- end }}
    {{- end }}
+    {{- if or (eq .Values.type "postgis") (eq .Values.type "timescaledb") (.Values.cluster.initdb) }}
    postInitApplicationSQL:
      {{- if eq .Values.type "postgis" }}
      - CREATE EXTENSION IF NOT EXISTS postgis;
@@ -21,6 +22,7 @@ bootstrap:
      {{- printf "- %s" . | nindent 6 }}
      {{- end }}
      {{- end }}
+    {{- end }}      
 {{- else if eq .Values.mode "replica" }}
  initdb:
    import:
@@ -78,13 +80,25 @@ externalClusters:
          name: {{ include "cluster.recoveryCredentials" . }}
          key: ACCESS_SECRET_KEY
      wal:
+        {{- if .Values.recovery.wal.compression }}
        compression: {{ .Values.recovery.wal.compression }}
+        {{- end }}
+        {{- if .Values.recovery.wal.encryption }}
        encryption: {{ .Values.recovery.wal.encryption }}
+        {{- end }}
+        {{- if .Values.recovery.wal.maxParallel }}
        maxParallel: {{ .Values.recovery.wal.maxParallel }}
+        {{- end }}
      data:
+        {{- if .Values.recovery.data.compression }}
        compression: {{ .Values.recovery.data.compression }}
+        {{- end }}
+        {{- if .Values.recovery.data.encryption }}
        encryption: {{ .Values.recovery.data.encryption }}
+        {{- end }}
+        {{- if .Values.recovery.data.jobs }}
        jobs: {{ .Values.recovery.data.jobs }}
+        {{- end }}
 {{- else }}
  {{ fail "Invalid cluster mode!" }}
 {{- end }}
--- a/charts/postgres-cluster/templates/cluster.yaml
+++ b/charts/postgres-cluster/templates/cluster.yaml
@@ -32,15 +32,17 @@ spec:
  affinity:
    {{- toYaml . | nindent 4 }}
  {{- end }}
+  {{- if .Values.cluster.priorityClassName }}
  priorityClassName: {{ .Values.cluster.priorityClassName }}
+  {{- end }}
  primaryUpdateMethod: {{ .Values.cluster.primaryUpdateMethod }}
  primaryUpdateStrategy: {{ .Values.cluster.primaryUpdateStrategy }}
  logLevel: {{ .Values.cluster.logLevel }}
  postgresql:
+    {{- if eq .Values.type "timescaledb" }}
    shared_preload_libraries:
-      {{- if eq .Values.type "timescaledb" }}
      - timescaledb
-      {{- end }}
+    {{- end }}
    {{- with .Values.cluster.postgresql.parameters }}
    parameters:
      {{- toYaml . | nindent 6 }}
--- a/charts/postgres-cluster/values.yaml
+++ b/charts/postgres-cluster/values.yaml
@@ -68,7 +68,7 @@ cluster:
    podMonitor:
      enabled: true
    prometheusRule:
-      enabled: true
+      enabled: false
      excludeRules: []

  # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-PostgresConfiguration
@@ -81,8 +81,7 @@ cluster:
  # BootstrapInitDB is the configuration of the bootstrap process when initdb is used.
  # See: https://cloudnative-pg.io/documentation/current/bootstrap/
  # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-bootstrapinitdb
-  initdb:
-    {}
+  initdb: {}
    # database: app
    # owner: app
    # secret: "" # Name of the secret containing the initial credentials for the owner of the user database. If empty a new secret will be created from scratch
Author	SHA1	Message	Date
alexlebens	668d50dfdb	add conditional check for postinit	2024-07-04 22:52:02 -05:00
alexlebens	93a232947e	increment chart	2024-07-04 22:45:41 -05:00
alexlebens	667236239d	fix backup fields	2024-07-04 22:45:18 -05:00
alexlebens	875f0c143c	fix backup fields	2024-07-04 22:41:31 -05:00
alexlebens	670b6e600c	add conditional check for values	2024-07-01 18:08:23 -05:00
alexlebens	6f5b5ffcb4	change value inseration	2024-07-01 18:08:23 -05:00
renovate[bot]	295a7296bc	Update cloudflare/cloudflared Docker tag to v2024.6.1 (#60 ) * Update cloudflare/cloudflared Docker tag to v2024.6.1 * update chart --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: alexlebens <alexanderlebens@gmail.com>	2024-06-28 17:01:04 -05:00
alexlebens	f1b4020287	change flow control	2024-06-22 18:26:19 -05:00
alexlebens	969357a664	change null handling	2024-06-22 18:22:25 -05:00
alexlebens	5685190e43	remove field not declared in schema	2024-06-22 18:18:03 -05:00
alexlebens	5e88f116fc	disable rules by default	2024-06-22 17:58:43 -05:00
alexlebens	f99ebfaa44	change initdb keys	2024-06-14 21:37:00 -05:00
alexlebens	64e3612762	fix init keys	2024-06-14 21:30:54 -05:00
alexlebens	a6821995ca	fix post init location	2024-06-14 21:23:48 -05:00
alexlebens	4291c3d18c	add options for postgresql init	2024-06-14 21:17:45 -05:00