trying chatgpt trick

disabling ssl
same
2024-12-29 18:10:09 +01:00 · 2024-12-29 17:52:11 +01:00 · 2024-12-29 16:21:00 +01:00 · 2024-12-29 15:55:45 +01:00 · 2024-12-29 00:36:34 +01:00 · 2024-12-29 00:01:16 +01:00
25 changed files with 110 additions and 44 deletions
--- a/immich-argocd-apps/Chart.yaml
+++ b/immich-argocd-apps/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: immich-argocd-apps
 description: A Helm chart for deploying Immich as an ArgoCD app
 type: application
-version: 0.2.0
-appVersion: v1.122.3
+version: 0.3.0
+appVersion: v1.123.0
--- a/keycloak-argocd-apps/Chart.yaml
+++ b/keycloak-argocd-apps/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: keycloak-argocd-apps
 description: A Helm chart for deploying the different argocd apps to deploy Keycloak
 type: application
-version: 0.1.0
+version: 0.2.1
--- a/keycloak-argocd-apps/templates/keycloak-deployment-app.yaml
+++ b/keycloak-argocd-apps/templates/keycloak-deployment-app.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: keycloak-deployment
+  name: {{ .Values.argocd.prefix }}keycloak-deployment
  namespace: {{ .Values.argocd.namespace }}
  annotations:
    argocd.argoproj.io/sync-wave: "0"
@@ -10,14 +10,26 @@ spec:
  project: {{ .Values.argocd.project }}
  source:
    repoURL: "https://git.blarre.net/thomas/helm-charts.git"
-    targetRevision: HEAD
+    targetRevision: {{ .Values.keycloakDeployment.targetRevision }}
    path: keycloak-deployment
    helm:
      releaseName: keycloak-deployment
      valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
        keycloakDeployment:
+          deploymentName: {{ .Values.keycloakDeployment.deploymentName }}
          numInstances: {{ .Values.keycloakDeployment.numInstances }}
          hostname: {{ .Values.keycloakDeployment.hostname }}
+          vendor: {{ .Values.keycloakDeployment.vendor }}
+          dbHost: {{ .Values.keycloakDeployment.dbHost }}
+          dbPort: {{ .Values.keycloakDeployment.dbPort }}
+          usernameSecret:
+            name: {{ .Values.keycloakDeployment.usernameSecret.name }}
+            key: {{ .Values.keycloakDeployment.usernameSecret.key }}
+          passwordSecret:
+            name: {{ .Values.keycloakDeployment.passwordSecret.name }}
+            key: {{ .Values.keycloakDeployment.passwordSecret.key }}
+          database: {{ .Values.keycloakDeployment.database }}
  destination:
    server: {{ .Values.mainDestination }}
    namespace: {{ .Values.mainNamespace }}
--- a/keycloak-argocd-apps/templates/keycloak-postinstall-app.yaml
+++ b/keycloak-argocd-apps/templates/keycloak-postinstall-app.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: keycloak-postinstall
+  name: {{ .Values.argocd.prefix }}keycloak-postinstall
  namespace: {{ .Values.argocd.namespace }}
  annotations:
    argocd.argoproj.io/sync-wave: "1"
@@ -10,11 +10,12 @@ spec:
  project: {{ .Values.argocd.project }}
  source:
    repoURL: "https://git.blarre.net/thomas/helm-charts.git"
-    targetRevision: HEAD
+    targetRevision: {{ .Values.keycloakDeployment.targetRevision }}
    path: keycloak-postinstall
    helm:
      releaseName: keycloak-postinstall
      valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
        tailscaleIngresses:
          keycloakHostname: {{ .Values.tailscaleIngresses.keycloakHostname }}
  destination:
--- a/keycloak-argocd-apps/templates/keycloak-requirements-app.yaml
+++ b/keycloak-argocd-apps/templates/keycloak-requirements-app.yaml
@@ -1,7 +1,8 @@
+{{- if .Values.dbCluster.enable -}}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: keycloak-requirements
+  name: {{ .Values.argocd.prefix }}keycloak-requirements
  namespace: {{ .Values.argocd.namespace }}
  annotations:
    argocd.argoproj.io/sync-wave: "-1"
@@ -15,6 +16,7 @@ spec:
    helm:
      releaseName: keycloak-requirements
      valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
        dbCluster:
          size: {{ .Values.dbCluster.size }}
          numInstances: {{ .Values.dbCluster.numInstances }}
@@ -29,3 +31,4 @@ spec:
      - ApplyOutOfSyncOnly=true
      - ServerSideApply=true
      - CreateNamespace=true
+{{- end }}
--- a/keycloak-argocd-apps/values.yaml
+++ b/keycloak-argocd-apps/values.yaml
@@ -1,13 +1,26 @@
 argocd:
  namespace: argocd
  project: default
+  prefix: null
 dbCluster:
+  enable: true
  size: 10Gi
  numInstances: 3
 mainNamespace: keycloak
 mainDestination: https://kubernetes.default.svc
 keycloakDeployment:
+  targetRevision: HEAD
  numInstances: 1
  hostname: sso.domain.net
+  vendor: postgres
+  dbHost: keycloak-db-rw
+  dbPort: 5432
+  usernameSecret:
+    name: keycloak-db-app
+    key: user
+  passwordSecret:
+    name: keycloak-db-app
+    key: password
+  database: app
 tailscaleIngresses:
  keycloakHostname: sso
--- a/keycloak-deployment/Chart.yaml
+++ b/keycloak-deployment/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: keycloak-deployment
 description: A Helm chart for deploying the actual keycloak pod through the keycloak operator
 type: application
-version: 0.1.0
+version: 0.2.1
--- a/keycloak-deployment/templates/keycloak-deployment.yaml
+++ b/keycloak-deployment/templates/keycloak-deployment.yaml
@@ -1,19 +1,20 @@
 apiVersion: k8s.keycloak.org/v2alpha1
 kind: Keycloak
 metadata:
-  name: linode-keycloak
+  name: {{ .Values.prefix }}keycloak
 spec:
  instances: {{ .Values.keycloakDeployment.numInstances }}
  db:
-    vendor: postgres
-    host: keycloak-db-rw
+    vendor: {{ .Values.keycloakDeployment.vendor }}
+    host: {{ .Values.keycloakDeployment.dbHost }}
+    port: {{ .Values.keycloakDeployment.dbPort }}
    usernameSecret:
-      name: keycloak-db-app
-      key: user
+      name: {{ .Values.keycloakDeployment.usernameSecret.name }}
+      key: {{ .Values.keycloakDeployment.usernameSecret.key }}
    passwordSecret:
-      name: keycloak-db-app
-      key: password
-    database: app
+      name: {{ .Values.keycloakDeployment.passwordSecret.name }}
+      key: {{ .Values.keycloakDeployment.passwordSecret.key }}
+    database: {{ .Values.keycloakDeployment.database }}
  ingress:
    enabled: false
  http:
--- a/keycloak-deployment/values.yaml
+++ b/keycloak-deployment/values.yaml
@@ -1,3 +1,14 @@
+prefix: null
 keycloakDeployment:
  numInstances: 1
  hostname: sso.domain.net
+  vendor: postgres
+  dbHost: keycloak-db-rw
+  dbPort: 5432
+  usernameSecret:
+    name: keycloak-db-app
+    key: user
+  passwordSecret:
+    name: keycloak-db-app
+    key: password
+  database: app
--- a/keycloak-postinstall/templates/ts-ingress.yaml
+++ b/keycloak-postinstall/templates/ts-ingress.yaml
@@ -1,13 +1,13 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ts-keycloak
+  name: {{ .Values.prefix }}ts-keycloak
  annotations:
    tailscale.com/funnel: "true"
 spec:
  defaultBackend:
    service:
-      name: linode-keycloak-service
+      name: {{ .Values.prefix }}keycloak-service
      port:
        number: 8080
  ingressClassName: tailscale
--- a/keycloak-postinstall/values.yaml
+++ b/keycloak-postinstall/values.yaml
@@ -1,2 +1,3 @@
+prefix: null
 tailscaleIngresses:
  keycloakHostname: sso
--- a/keycloak-requirements/Chart.yaml
+++ b/keycloak-requirements/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: keycloak-requirements
 description: A Helm chart for deploying the DB used by keycloak
 type: application
-version: 0.1.0
+version: 0.1.1
--- a/keycloak-requirements/templates/db-cluster.yaml
+++ b/keycloak-requirements/templates/db-cluster.yaml
@@ -1,7 +1,7 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: keycloak-db
+  name: {{ .Values.prefix }}keycloak-db
 spec:
  instances: {{ .Values.dbCluster.numInstances }}

--- a/keycloak-requirements/values.yaml
+++ b/keycloak-requirements/values.yaml
@@ -1,4 +1,4 @@
+prefix: null
 dbCluster:
  size: 1Gi
  numInstances: 3
-
--- a/odoo-argocd-apps/Chart.yaml
+++ b/odoo-argocd-apps/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: odoo-argocd-apps
 description: A Helm chart for deploying the requirements, main charts and postinstall as ArgoCD apps for Odoo
 type: application
-version: 0.1.0
+version: 0.1.1
--- a/odoo-argocd-apps/templates/odoo-chart.yaml
+++ b/odoo-argocd-apps/templates/odoo-chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: odoo-chart
+  name: {{ .Values.argocd.prefix }}odoo-chart
  namespace: {{ .Values.argocd.namespace }}
  annotations:
    argocd.argoproj.io/sync-wave: "0"
@@ -13,8 +13,9 @@ spec:
    chart: odoo
    targetRevision: 28.x
    helm:
-      releaseName: odoo
+      releaseName: {{ .Values.argocd.prefix }}odoo
      valuesObject:
+        image.debug: {{ .Values.odoo.image.debug }}
        odooEmail: {{ .Values.odoo.odooEmail }}
        replicaCount: {{ .Values.odoo.replicaCount }}
        resourcesPreset: {{ .Values.odoo.resourcesPreset }}
@@ -23,13 +24,15 @@ spec:
        postgresql:
          enabled: false
        externalDatabase:
-          host: odoo-db-rw
-          port: 5432
-          user: app
-          database: app
-          create: false
-          existingSecret: odoo-db-app
-          existingSecretPasswordKey: password
+          host: {{ .Values.odoo.externalDatabase.host }}
+          port: {{ .Values.odoo.externalDatabase.port }}
+          user: {{ .Values.odoo.externalDatabase.user }}
+          database: {{ .Values.odoo.externalDatabase.database }}
+          create: {{ .Values.odoo.externalDatabase.create }}
+          existingSecret: {{ .Values.odoo.externalDatabase.passwordSecret.name }}
+          existingSecretPasswordKey: {{ .Values.odoo.externalDatabase.passwordSecret.key }}
+          sslmode: require
+          extraOptions: sslrootcert=/opt/ssl/root.crt sslcert=/opt/ssl/postgresql.crt sslkey=/opt/ssl/postgresql.key
  destination:
    server: {{ .Values.destination.server }}
    namespace: {{ .Values.destination.namespace }}
--- a/odoo-argocd-apps/templates/odoo-postinstall.yaml
+++ b/odoo-argocd-apps/templates/odoo-postinstall.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: odoo-postinstall
+  name: {{ .Values.argocd.prefix }}odoo-postinstall
  namespace: {{ .Values.argocd.namespace }}
  annotations:
    argocd.argoproj.io/sync-wave: "1"
@@ -15,6 +15,7 @@ spec:
    helm:
      releaseName: odoo-postinstall
      valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
        tailscaleIngresses:
          odooHostname: {{ .Values.tailscaleIngresses.odooHostname }}
  destination:
--- a/odoo-argocd-apps/templates/odoo-requirements-app.yaml
+++ b/odoo-argocd-apps/templates/odoo-requirements-app.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: odoo-requirements
+  name: {{ .Values.argocd.prefix }}odoo-requirements
  namespace: {{ .Values.argocd.namespace }}
  annotations:
    argocd.argoproj.io/sync-wave: "-1"
@@ -15,8 +15,10 @@ spec:
    helm:
      releaseName: odoo-requirements
      valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
        odoo:
          dbCluster:
+            enable: {{ .Values.odoo.dbCluster.enable }}
            numInstances: {{ .Values.odoo.dbCluster.numInstances }}
            size: {{ .Values.odoo.dbCluster.size }}
          dataPvc:
--- a/odoo-argocd-apps/values.yaml
+++ b/odoo-argocd-apps/values.yaml
@@ -1,6 +1,7 @@
 argocd:
  namespace: argocd 
  project: default
+  prefix: null
  requirements:
    repoURL: "https://git.blarre.net/thomas/helm-charts.git"
    targetRevision: HEAD
@@ -16,6 +17,7 @@ destination:

 odoo:
  dbCluster:
+    enable: true
    numInstances: 3
    size: 10Gi
  dataPvc:
@@ -25,6 +27,17 @@ odoo:
  odooEmail: "admin@domain.net"
  resourcesPreset: "large"
  replicaCount: 1
+  externalDatabase:
+    host: odoo-db-rw
+    port: 5432
+    user: app
+    database: app
+    create: false
+    passwordSecret:
+      name: odoo-db-secret
+      key: password
+  image:
+    debug: false

 tailscaleIngresses:
  odooHostname: odoo
--- a/odoo-postinstall/Chart.yaml
+++ b/odoo-postinstall/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: odoo-postinstall
 description: A Helm chart for deploying the postinall stuff for odoo, mainly the ingress
 type: application
-version: 0.1.0
+version: 0.1.1
--- a/odoo-postinstall/templates/odoo-ingress.yaml
+++ b/odoo-postinstall/templates/odoo-ingress.yaml
@@ -1,13 +1,13 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ts-odoo
+  name: {{ .Values.prefix}}ts-odoo
  annotations:
    tailscale.com/funnel: "true"
 spec:
  defaultBackend:
    service:
-      name: odoo
+      name: {{ .Values.prefix }}odoo
      port:
        name: http
  ingressClassName: tailscale
--- a/odoo-postinstall/values.yaml
+++ b/odoo-postinstall/values.yaml
@@ -1,2 +1,3 @@
+prefix: null
 tailcaleIngresses:
  odooHostname: odoo
--- a/odoo-requirements/Chart.yaml
+++ b/odoo-requirements/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: odoo-requirements
 description: A Helm chart for the requirements for Odoo
 type: application
-version: 0.1.0
+version: 0.1.1
--- a/odoo-requirements/templates/db-cluster.yaml
+++ b/odoo-requirements/templates/db-cluster.yaml
@@ -1,8 +1,10 @@
-apiVersion: postgresql.cnpg.io/v1
+{{- if .Values.odoo.dbCluster.enabled -}}
+: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: odoo-db
+  name: {{ .Values.prefix }}odoo-db
 spec:
  instances: {{ .Values.odoo.dbCluster.numInstances }}
  storage:
    size: {{ .Values.odoo.dbCluster.size }}
+{{- end }}
--- a/odoo-requirements/values.yaml
+++ b/odoo-requirements/values.yaml
@@ -1,5 +1,7 @@
+prefix: null
 odoo:
  dbCluster:
+    enable: true
    numInstances: 3
    size: 10Gi
  dataPvc:
Author	SHA1	Message	Date
Thomas Blarre	27a5aacffd	trying chatgpt trick	2024-12-29 18:10:09 +01:00
Thomas Blarre	f26304e5b8	disabling ssl	2024-12-29 17:52:11 +01:00
Thomas Blarre	cf39626324	same	2024-12-29 16:21:00 +01:00
Thomas Blarre	42d2bdbf4a	trying bypassing ssl verification	2024-12-29 15:55:45 +01:00
Thomas Blarre	6b9f1792a6	adding debug mode	2024-12-29 00:36:34 +01:00
Thomas Blarre	98e4812a3e	removed superfluous prefix	2024-12-29 00:01:16 +01:00
Thomas Blarre	88fd35d2fd	added prefix	2024-12-28 23:52:17 +01:00
Thomas Blarre	b6c96025d0	adding prefix and non cnpg database	2024-12-28 21:06:47 +01:00
Thomas Blarre	f0552c9548	Merge branch 'main' of ssh://git.blarre.net:2277/thomas/helm-charts	2024-12-28 16:33:48 +01:00
Thomas Blarre	3e00bef7fa	Forgot to handle the prefix on the service for keycloak	2024-12-28 16:32:57 +01:00
Thomas Blarre	d8029652d1	Merge pull request 'keycloak-v2' (#3 ) from keycloak-v2 into main Reviewed-on: #3	2024-12-28 15:27:41 +00:00
Thomas Blarre	d11b156f15	adding db port	2024-12-26 10:58:30 +01:00
Thomas Blarre	854f936c13	bad value	2024-12-23 21:07:11 +01:00
roukydesbois	88e49484bb	forgot targetRevision	2024-12-23 20:29:37 +01:00
Thomas Blarre	d72e29ff16	handle prefix	2024-12-23 19:38:06 +01:00
Thomas Blarre	3bbb2f8240	v2 suffix not to conflict with existing one	2024-12-23 19:01:49 +01:00
Thomas Blarre	c84b0cd754	Prepping to use the linode database for keycloak	2024-12-22 09:54:12 +01:00
roukydesbois	b0b300073f	Bumped immich to 1.123.0	2024-12-18 21:37:50 +01:00