fix: Update v2 (#26)

* fix: update to 2.0.0 * cockroach * Update README.md * new major * fix tests * Update charts/zitadel/values.yaml Co-authored-by: Elio Bischof <[email protected]> Co-authored-by: Elio Bischof <[email protected]>
zitadel · Jul 29, 2022 · 2b1a94c · 2b1a94c
1 parent 13ece28
commit 2b1a94c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ ZITADEL_CRDB_PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 32)
 # install a zitadel release that is accessible via port forwarding to localhost
 helm install --namespace zitadel --create-namespace my-zitadel zitadel/zitadel \
   --set zitadel.masterkey=${ZITADEL_MASTERKEY} \
-  --set zitadel.secretConfig.Database.User.Password=${ZITADEL_CRDB_PASSWORD} \
+  --set zitadel.secretConfig.Database.cockroach.User.Password=${ZITADEL_CRDB_PASSWORD} \
   --set zitadel.configmapConfig.ExternalSecure=false \
   --set zitadel.configmapConfig.ExternalPort=8080 \
   --set zitadel.configmapConfig.TLS.Enabled=false
@@ -60,6 +60,6 @@ Use the zitadel admin user for the initial login:
 ## Configuring ZITADEL
 
 For learning how to run ZITADEL in production, please read the following docs:
-- [configuration docs](https://docs.zitadel.com/docs/guides/installation/configure)
-- [load balancing example docs](https://docs.zitadel.com/docs/guides/installation/loadbalancing-example)
+- [configuration docs](https://docs.zitadel.com/docs/guides/manage/self-hosted/configure)
+- [load balancing example docs](https://docs.zitadel.com/docs/guides/deploy/loadbalancing-example)
 
diff --git a/charts/zitadel/Chart.yaml b/charts/zitadel/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: zitadel
 description: A Helm chart for ZITADEL v2
 type: application
-version: 2.3.0
-appVersion: "v2.0.0-v2-alpha.43-amd64"
+appVersion: "v2.0.0-amd64"
+version: 3.0.0
 kubeVersion: '>= 1.16.15-0'
 icon: https://zitadel.zitadel.cloud/ui/login/resources/themes/zitadel/logo-dark.svg
 dependencies:

diff --git a/charts/zitadel/templates/deployment.yaml b/charts/zitadel/templates/deployment.yaml
@@ -54,15 +54,15 @@ spec:
                   apiVersion: v1
                   fieldPath: status.podIP
             {{- if (or .Values.zitadel.dbSslRootCrt .Values.zitadel.dbSslRootCrtSecret) }}
-            - name: ZITADEL_DATABASE_USER_SSL_ROOTCERT
+            - name: ZITADEL_DATABASE_COCKROACH_USER_SSL_ROOTCERT
               value: /.secrets/ca.crt
-            - name: ZITADEL_ADMINUSER_SSL_ROOTCERT
+            - name: ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_ROOTCERT
               value: /.secrets/ca.crt
             {{- end}}
             {{- if .Values.zitadel.dbSslClientCrtSecret }}
-            - name: ZITADEL_ADMINUSER_SSL_CERT
+            - name: ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_CERT
               value: /.secrets/tls.crt
-            - name: ZITADEL_ADMINUSER_SSL_KEY
+            - name: ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_KEY
               value: /.secrets/tls.key
             {{- end}}
           ports:

diff --git a/charts/zitadel/templates/secret_zitadel-secrets.yaml b/charts/zitadel/templates/secret_zitadel-secrets.yaml
@@ -1,5 +1,5 @@
-{{- if (and .Values.cockroachdb.enabled .Values.cockroachdb.tls.enabled (not (((.Values.zitadel.secretConfig).Database).User).Password)) }}
-{{- fail ".Values.zitadel.secretConfig.Database.User.Password is mandatory for tls enabled cockroach" }}
+{{- if (and .Values.cockroachdb.enabled .Values.cockroachdb.tls.enabled (not ((((.Values.zitadel.secretConfig).Database).cockroach).User).Password)) }}
+{{- fail ".Values.zitadel.secretConfig.Database.cockroach.User.Password is mandatory for tls enabled cockroach" }}
 {{- end }}
 apiVersion: v1
 kind: Secret

diff --git a/charts/zitadel/test/integration/e2e_test.go b/charts/zitadel/test/integration/e2e_test.go
@@ -12,11 +12,11 @@ func (s *integrationTest) TestZITADELEnd2End() {
 	options := &helm.Options{
 		KubectlOptions: s.kubeOptions,
 		SetValues: map[string]string{
-			"zitadel.masterkey":                           "x123456789012345678901234567891y",
-			"zitadel.secretConfig.Database.User.Password": "xy",
-			"zitadel.configmapConfig.ExternalPort":        "8080",
-			"zitadel.configmapConfig.ExternalSecure":      "false",
-			"zitadel.configmapConfig.TLS.Enabled":         "false",
+			"zitadel.masterkey": "x123456789012345678901234567891y",
+			"zitadel.secretConfig.Database.cockroach.User.Password": "xy",
+			"zitadel.configmapConfig.ExternalPort":                  "8080",
+			"zitadel.configmapConfig.ExternalSecure":                "false",
+			"zitadel.configmapConfig.TLS.Enabled":                   "false",
 		},
 	}
 

diff --git a/charts/zitadel/values.yaml b/charts/zitadel/values.yaml
@@ -3,18 +3,18 @@ zitadel:
 
   # The ZITADEL config under configmapConfig is written to a Kubernetes ConfigMap
   # See all defaults here:
-  # https://github.com/zitadel/zitadel/blob/v2-alpha/cmd/defaults.yaml
+  # https://github.com/zitadel/zitadel/blob/main/cmd/defaults.yaml
   configmapConfig:
 
     Database:
-      Host: "crdb-public"
-      User:
-        SSL:
-          Mode: "verify-full"
-
-    AdminUser:
-      SSL:
-        Mode: "verify-full"
+      cockroach:
+        Host: "crdb-public"
+        User:
+          SSL:
+            Mode: "verify-full"
+        Admin:
+          SSL:
+            Mode: "verify-full"
 
     Machine:
       Identification:
@@ -25,7 +25,7 @@ zitadel:
 
   # The ZITADEL config under secretConfig is written to a Kubernetes Secret
   # See all defaults here:
-  # https://github.com/zitadel/zitadel/blob/v2-alpha/cmd/defaults.yaml
+  # https://github.com/zitadel/zitadel/blob/main/cmd/defaults.yaml
   secretConfig:
 
   # ZITADEL uses the masterkey for symmetric encryption.