From d72e29ff1666f132b9d7fd9b2607529227fbb437 Mon Sep 17 00:00:00 2001 From: Thomas Blarre Date: Mon, 23 Dec 2024 19:38:06 +0100 Subject: [PATCH] handle prefix --- keycloak-argocd-apps/Chart.yaml | 2 +- keycloak-argocd-apps/templates/keycloak-deployment-app.yaml | 4 +++- keycloak-argocd-apps/templates/keycloak-postinstall-app.yaml | 3 ++- keycloak-argocd-apps/templates/keycloak-requirements-app.yaml | 3 ++- keycloak-argocd-apps/values.yaml | 1 + keycloak-deployment/Chart.yaml | 2 +- keycloak-deployment/templates/keycloak-deployment.yaml | 2 +- keycloak-deployment/values.yaml | 1 + keycloak-postinstall/templates/ts-ingress.yaml | 2 +- keycloak-postinstall/values.yaml | 1 + keycloak-requirements/Chart.yaml | 2 +- keycloak-requirements/templates/db-cluster.yaml | 2 +- keycloak-requirements/values.yaml | 4 ++-- 13 files changed, 18 insertions(+), 11 deletions(-) diff --git a/keycloak-argocd-apps/Chart.yaml b/keycloak-argocd-apps/Chart.yaml index 49cace2..10cd643 100644 --- 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.2.0 +version: 0.2.1 diff --git a/keycloak-argocd-apps/templates/keycloak-deployment-app.yaml b/keycloak-argocd-apps/templates/keycloak-deployment-app.yaml index 7e21ffa..35d8abf 100644 --- 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-v2 + name: {{ .Values.argocd.prefix }}keycloak-deployment namespace: {{ .Values.argocd.namespace }} annotations: argocd.argoproj.io/sync-wave: "0" @@ -15,7 +15,9 @@ spec: 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 }} diff --git a/keycloak-argocd-apps/templates/keycloak-postinstall-app.yaml b/keycloak-argocd-apps/templates/keycloak-postinstall-app.yaml index 7ab0dc3..b3c7e74 100644 --- 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-v2 + name: {{ .Values.argocd.prefix }}keycloak-postinstall namespace: {{ .Values.argocd.namespace }} annotations: argocd.argoproj.io/sync-wave: "1" @@ -15,6 +15,7 @@ spec: helm: releaseName: keycloak-postinstall valuesObject: + prefix: {{ .Values.argocd.prefix }} tailscaleIngresses: keycloakHostname: {{ .Values.tailscaleIngresses.keycloakHostname }} destination: diff --git a/keycloak-argocd-apps/templates/keycloak-requirements-app.yaml b/keycloak-argocd-apps/templates/keycloak-requirements-app.yaml index cf4a456..abc60f7 100644 --- a/keycloak-argocd-apps/templates/keycloak-requirements-app.yaml +++ b/keycloak-argocd-apps/templates/keycloak-requirements-app.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: keycloak-requirements-v2 + name: {{ .Values.argocd.prefix }}keycloak-requirements namespace: {{ .Values.argocd.namespace }} annotations: argocd.argoproj.io/sync-wave: "-1" @@ -16,6 +16,7 @@ spec: helm: releaseName: keycloak-requirements valuesObject: + prefix: {{ .Values.argocd.prefix }} dbCluster: size: {{ .Values.dbCluster.size }} numInstances: {{ .Values.dbCluster.numInstances }} diff --git a/keycloak-argocd-apps/values.yaml b/keycloak-argocd-apps/values.yaml index ef2cac5..163ffb1 100644 --- a/keycloak-argocd-apps/values.yaml +++ b/keycloak-argocd-apps/values.yaml @@ -1,6 +1,7 @@ argocd: namespace: argocd project: default + prefix: null dbCluster: enable: true size: 10Gi diff --git a/keycloak-deployment/Chart.yaml b/keycloak-deployment/Chart.yaml index 16c43df..1f2fdbe 100644 --- 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.2.0 \ No newline at end of file +version: 0.2.1 \ No newline at end of file diff --git a/keycloak-deployment/templates/keycloak-deployment.yaml b/keycloak-deployment/templates/keycloak-deployment.yaml index bf14a7b..7277d76 100644 --- a/keycloak-deployment/templates/keycloak-deployment.yaml +++ b/keycloak-deployment/templates/keycloak-deployment.yaml @@ -1,7 +1,7 @@ apiVersion: k8s.keycloak.org/v2alpha1 kind: Keycloak metadata: - name: linode-keycloak + name: {{ .Values.prefix }}keycloak spec: instances: {{ .Values.keycloakDeployment.numInstances }} db: diff --git a/keycloak-deployment/values.yaml b/keycloak-deployment/values.yaml index 50a3036..afc3ccb 100644 --- a/keycloak-deployment/values.yaml +++ b/keycloak-deployment/values.yaml @@ -1,3 +1,4 @@ +prefix: null keycloakDeployment: numInstances: 1 hostname: sso.domain.net diff --git a/keycloak-postinstall/templates/ts-ingress.yaml b/keycloak-postinstall/templates/ts-ingress.yaml index 49dd4f0..e90c222 100644 --- a/keycloak-postinstall/templates/ts-ingress.yaml +++ b/keycloak-postinstall/templates/ts-ingress.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: ts-keycloak + name: {{ .Values.prefix }}ts-keycloak annotations: tailscale.com/funnel: "true" spec: diff --git a/keycloak-postinstall/values.yaml b/keycloak-postinstall/values.yaml index cb822e9..f3f03dc 100644 --- a/keycloak-postinstall/values.yaml +++ b/keycloak-postinstall/values.yaml @@ -1,2 +1,3 @@ +prefix: null tailscaleIngresses: keycloakHostname: sso \ No newline at end of file diff --git a/keycloak-requirements/Chart.yaml b/keycloak-requirements/Chart.yaml index 79d0200..3a23d0a 100644 --- 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 diff --git a/keycloak-requirements/templates/db-cluster.yaml b/keycloak-requirements/templates/db-cluster.yaml index f0411d9..c500fb6 100644 --- 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 }} diff --git a/keycloak-requirements/values.yaml b/keycloak-requirements/values.yaml index f9fc30a..1bf69b6 100644 --- a/keycloak-requirements/values.yaml +++ b/keycloak-requirements/values.yaml @@ -1,4 +1,4 @@ +prefix: null dbCluster: size: 1Gi - numInstances: 3 - + numInstances: 3 \ No newline at end of file