From 76946412d700b1aa1155b337609371b823df2a9b Mon Sep 17 00:00:00 2001
From: Tapas Jena <tapas.friends@gmail.com>
Date: Wed, 25 Sep 2024 23:36:11 +0800
Subject: [PATCH] fix keycloak temporarily

---
 pkg/cmd/create/root.go                                    | 2 +-
 pkg/cmd/delete/root.go                                    | 2 +-
 pkg/cmd/root.go                                           | 7 ++++---
 .../application/argo-workflows/templates/install.yaml     | 2 +-
 .../backstage/templates/postgresql/external-secrets.yaml  | 2 +-
 .../packages/security/keycloak/templates/secret-gen.yaml  | 8 ++++----
 tests/e2e/e2e.go                                          | 2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkg/cmd/create/root.go b/pkg/cmd/create/root.go
index c8ecf4d..72c8a11 100644
--- a/pkg/cmd/create/root.go
+++ b/pkg/cmd/create/root.go
@@ -37,7 +37,7 @@ var (
 
 var CreateCmd = &cobra.Command{
 	Use:     "create",
-	Short:   "Create an Adhar IDP cluster",
+	Short:   "Create an Adhar IDP cluster, Aliases: up",
 	Long:    ``,
 	RunE:    create,
 	PreRunE: preCreateE,
diff --git a/pkg/cmd/delete/root.go b/pkg/cmd/delete/root.go
index fcc5c70..93c6a0a 100644
--- a/pkg/cmd/delete/root.go
+++ b/pkg/cmd/delete/root.go
@@ -15,7 +15,7 @@ var (
 
 var DeleteCmd = &cobra.Command{
 	Use:     "delete",
-	Short:   "Delete an Adhar IDP cluster",
+	Short:   "Delete an Adhar IDP cluster, Aliases: down",
 	Long:    ``,
 	RunE:    deleteE,
 	PreRunE: preDeleteE,
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index d532469..d445621 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -13,9 +13,10 @@ import (
 )
 
 var rootCmd = &cobra.Command{
-	Use:   "adhar",
-	Short: "Adhar CLI",
-	Long:  "Adhar Internal Developer Platform - The Open Foundation!",
+	Use:     "adhar",
+	Short:   "Adhar CLI",
+	Long:    "Adhar Internal Developer Platform - The Open Foundation!",
+	Aliases: []string{"a", "ad"},
 }
 
 func init() {
diff --git a/platform/stack/packages/application/argo-workflows/templates/install.yaml b/platform/stack/packages/application/argo-workflows/templates/install.yaml
index 8a294eb..b41b6af 100644
--- a/platform/stack/packages/application/argo-workflows/templates/install.yaml
+++ b/platform/stack/packages/application/argo-workflows/templates/install.yaml
@@ -1271,7 +1271,7 @@ data:
         - email
         - groups
     nodeEvents:
-      enabled: false
+      # enabled: false
 kind: ConfigMap
 metadata:
   name: workflow-controller-configmap
diff --git a/platform/stack/packages/application/backstage/templates/postgresql/external-secrets.yaml b/platform/stack/packages/application/backstage/templates/postgresql/external-secrets.yaml
index 05fe2a2..f706c95 100644
--- a/platform/stack/packages/application/backstage/templates/postgresql/external-secrets.yaml
+++ b/platform/stack/packages/application/backstage/templates/postgresql/external-secrets.yaml
@@ -31,7 +31,7 @@ spec:
         POSTGRES_PORT: '5432'
         POSTGRES_DB: backstage
         POSTGRES_USER: backstage
-        POSTGRES_PASSWORD: "{{.POSTGRES_PASSWORD}}"
+        POSTGRES_PASSWORD: password #"{{.POSTGRES_PASSWORD}}"
         ARGO_WORKFLOWS_URL: https://{{ .Values.networking.host }}:{{ .Values.networking.port }}/argo-workflows
         KEYCLOAK_NAME_METADATA: https://{{ .Values.networking.host }}:{{ .Values.networking.port }}/keycloak/realms/cnoe/.well-known/openid-configuration
         KEYCLOAK_CLIENT_SECRET: "{{.BACKSTAGE_CLIENT_SECRET}}"
diff --git a/platform/stack/packages/security/keycloak/templates/secret-gen.yaml b/platform/stack/packages/security/keycloak/templates/secret-gen.yaml
index 7f0def1..1522e79 100644
--- a/platform/stack/packages/security/keycloak/templates/secret-gen.yaml
+++ b/platform/stack/packages/security/keycloak/templates/secret-gen.yaml
@@ -27,13 +27,13 @@ spec:
           cnoe.io/package-name: keycloak
       engineVersion: v2
       data:
-        KEYCLOAK_ADMIN_PASSWORD: "{{.KEYCLOAK_ADMIN_PASSWORD}}"
+        KEYCLOAK_ADMIN_PASSWORD: password #"{{.KEYCLOAK_ADMIN_PASSWORD}}"
         KC_DB_USERNAME: keycloak
-        KC_DB_PASSWORD: "{{.KC_DB_PASSWORD}}"
+        KC_DB_PASSWORD: password #"{{.KC_DB_PASSWORD}}"
         POSTGRES_DB: keycloak
         POSTGRES_USER: keycloak
-        POSTGRES_PASSWORD: "{{.KC_DB_PASSWORD}}"
-        USER_PASSWORD: "{{.USER_PASSWORD}}"
+        POSTGRES_PASSWORD: password #"{{.KC_DB_PASSWORD}}"
+        USER_PASSWORD: password #"{{.USER_PASSWORD}}"
   dataFrom:
     - sourceRef:
         generatorRef:
diff --git a/tests/e2e/e2e.go b/tests/e2e/e2e.go
index 36f2479..a4737da 100644
--- a/tests/e2e/e2e.go
+++ b/tests/e2e/e2e.go
@@ -248,7 +248,7 @@ func TestArgoCDEndpoints(ctx context.Context, t *testing.T, baseUrl string) {
 	err = SendAndParse(ctx, &appResp, httpClient, req)
 	assert.Nil(t, err, fmt.Sprintf("getting argocd applications: %s", err))
 
-	assert.Equal(t, 3, len(appResp.Items), fmt.Sprintf("number of apps do not match: %v", appResp.Items))
+	assert.Equal(t, 9, len(appResp.Items), fmt.Sprintf("number of apps do not match: %v", appResp.Items))
 }
 
 func GetBasicAuth(ctx context.Context, name string) (BasicAuth, error) {