From 6f54208d9a5564505db41b8f8561b23ba3864b71 Mon Sep 17 00:00:00 2001 From: "tishan.harischandra" Date: Fri, 20 Jun 2025 13:22:26 +0530 Subject: [PATCH 1/2] added redis configs to KC --- configmaps/keycloak-service-configs.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configmaps/keycloak-service-configs.yml b/configmaps/keycloak-service-configs.yml index eb1a3e2..6d2e32a 100644 --- a/configmaps/keycloak-service-configs.yml +++ b/configmaps/keycloak-service-configs.yml @@ -6,10 +6,12 @@ metadata: data: QUARKUS_SSL_NATIVE: "false" QUARKUS_SSL_TRUST_ALL: "true" - KC_DB_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + KC_DB_URL: jdbc:postgresql://172.15.100.27:5432/temp-quat-database KC_DB: postgres KC_CACHE_CONFIG_FILE: "cache-ispn.xml" KC_HOSTNAME: quat.cloudsolutions.lk KC_PROXY: edge KC_HOSTNAME_STRICT: "true" - KC_HTTP_RELATIVE_PATH: /auth \ No newline at end of file + KC_HTTP_RELATIVE_PATH: /auth + KC_SPI_CURRENT_LOCATIONS_CURRENT_LOCATIONS_REDIS_HOST: 172.15.100.41 + KC_SPI_CURRENT_LOCATIONS_CURRENT_LOCATIONS_REDIS_PORT: "6379" From 68d222f2f771fe27819b52e3d848defcc106f98a Mon Sep 17 00:00:00 2001 From: "tishan.harischandra" Date: Fri, 20 Jun 2025 13:25:00 +0530 Subject: [PATCH 2/2] conflict resolve --- Application-Control/01/baseRepoCred.yml | 11 +++++++++++ Application-Control/01/temp-app.json | 0 2 files changed, 11 insertions(+) create mode 100644 Application-Control/01/baseRepoCred.yml create mode 100644 Application-Control/01/temp-app.json diff --git a/Application-Control/01/baseRepoCred.yml b/Application-Control/01/baseRepoCred.yml new file mode 100644 index 0000000..1a2b327 --- /dev/null +++ b/Application-Control/01/baseRepoCred.yml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Secret +metadata: + name: central-base-repo-creds + namespace: argocd + labels: + argocd.argoproj.io/secret-type: repository +stringData: + url: https://git.cloudsolutions.com.sa/BASE/CENTRAL-BASE-REPO.git + username: Ishrath.Ahamed # Replace with your Git username + password: 1qaz!QAZ # Replace with your Git personal access token diff --git a/Application-Control/01/temp-app.json b/Application-Control/01/temp-app.json new file mode 100644 index 0000000..e69de29