Merge branch 'main' of https://github.com/Netcracker/qubership-apihub

Author: alagishev

docker-compose/with-keycloak/README.md

@@ -100,7 +100,7 @@ Execute `generate_env_and_up_compose.sh` - it will initialize all require ENV VA
 
 http://host.docker.internal:8081/ - Qubserhip-APIHUB UI URL
 
-You will be able to login under user/user credential (set in ./keycloack/realm.json)
+You will be able to login under user/user credential (set in ./keycloak/realm.json)
 
 ## Startup with locally built images
 

helm-templates/local-k8s-quickstart/README.md

@@ -121,7 +121,7 @@ If ports are busy:
 
 Quickstart procedure uses official Qubership APIHUB [Helm Chart](../qubership-apihub/). Please also refer to official [Installation Notes](/docs/installation-guide.md).
 
-This folder contains `postgresql` and `keycloack` Helm charts for Qubserhip APIHUB dependecies deployment.
+This folder contains `postgresql` and `keycloak` Helm charts for Qubserhip APIHUB dependecies deployment.
 
 `qubership-apihub` folder contains prefilled `values.yaml` files with parameters values fits for deployment to local k8s cluster - so no need to care about filling values. Required secrets are generated by scripts.
 
@@ -138,15 +138,15 @@ Deployment phases represented by scripts in `scripts` folder, so you can see wha
 - `1-start-kind-cluster.sh`
 - `2-deploy-postgres.sh`
 - `3-generate-secrets.sh`
-- `4-deploy-keycloack.sh` (optional, need for `5-deploy-apihub-with-keycloack`)
+- `4-deploy-keycloak.sh` (optional, need for `5-deploy-apihub-with-keycloak`)
 - `5-deploy-apihub.sh`
-- `5-deploy-apihub-with-keycloack.sh`
+- `5-deploy-apihub-with-keycloak.sh`
 - `6-patch-apihub-hosts.sh` (required for keycloak setup)
 
 One-liners:
 
 1. `apihub-quickstart.sh` - PostgreSQL + Pure APIHUB. Basic option
-1. `apihub-with-keycloack-quickstart.sh` - APIHUB with SAML and OIDC integration via Keycloak
+1. `apihub-with-keycloak-quickstart.sh` - APIHUB with SAML and OIDC integration via Keycloak
 
 
 ## Verify Installation

…tart/apihub-with-keycloack-quickstart.sh …start/apihub-with-keycloak-quickstart.shhelm-templates/local-k8s-quickstart/apihub-with-keycloack-quickstart.sh renamed to helm-templates/local-k8s-quickstart/apihub-with-keycloak-quickstart.sh helm-templates/local-k8s-quickstart/apihub-with-keycloack-quickstart.sh renamed to helm-templates/local-k8s-quickstart/apihub-with-keycloak-quickstart.sh

@@ -6,10 +6,10 @@ sleep 30
 echo "Sleep 30 seconds, wait for PG init"
 sleep 30
 ./3-generate-secrets.sh
-./4-deploy-keycloack.sh
-echo "Sleep 150 seconds, wait for Keycloack init"
+./4-deploy-keycloak.sh
+echo "Sleep 150 seconds, wait for Keycloak init"
 sleep 150
-./5-deploy-apihub-with-keycloack.sh
+./5-deploy-apihub-with-keycloak.sh
 echo "Patch APIHUB Deployments for keycloak Ingress DNS resolution"
 ./6-patch-apihub-hosts.sh
 cd ..

…hub/with-keycloack-local-k8s-values.yaml …ihub/with-keycloak-local-k8s-values.yamlhelm-templates/local-k8s-quickstart/qubership-apihub/with-keycloack-local-k8s-values.yaml renamed to helm-templates/local-k8s-quickstart/qubership-apihub/with-keycloak-local-k8s-values.yaml helm-templates/local-k8s-quickstart/qubership-apihub/with-keycloack-local-k8s-values.yaml renamed to helm-templates/local-k8s-quickstart/qubership-apihub/with-keycloak-local-k8s-values.yaml

@@ -37,7 +37,7 @@ rm -f private_key.pem
 rm -f certificate.pem
 
 envsubst < ../qubership-apihub/local-secrets.yaml.template > ../qubership-apihub/local-secrets.yaml 
-envsubst < ../qubership-apihub/with-keycloack-local-secrets.yaml.template > ../qubership-apihub/with-keycloack-local-secrets.yaml 
+envsubst < ../qubership-apihub/with-keycloak-local-secrets.yaml.template > ../qubership-apihub/with-keycloak-local-secrets.yaml 
 envsubst < ../keycloak/files/realm.json.template > ../keycloak/files/realm.json
 
 echo "APIHUB_ADMIN_EMAIL = $APIHUB_ADMIN_EMAIL"

…th-keycloack-local-secrets.yaml.template …ith-keycloak-local-secrets.yaml.templatehelm-templates/local-k8s-quickstart/qubership-apihub/with-keycloack-local-secrets.yaml.template renamed to helm-templates/local-k8s-quickstart/qubership-apihub/with-keycloak-local-secrets.yaml.template helm-templates/local-k8s-quickstart/qubership-apihub/with-keycloack-local-secrets.yaml.template renamed to helm-templates/local-k8s-quickstart/qubership-apihub/with-keycloak-local-secrets.yaml.template

@@ -1,3 +1,3 @@
 echo "---Start APIHUB deploy using Helm---"
-helm install apihub -n qubership-apihub --create-namespace -f ../qubership-apihub/with-keycloack-local-k8s-values.yaml -f ../qubership-apihub/with-keycloack-local-secrets.yaml ../../qubership-apihub
+helm install apihub -n qubership-apihub --create-namespace -f ../qubership-apihub/with-keycloak-local-k8s-values.yaml -f ../qubership-apihub/with-keycloak-local-secrets.yaml ../../qubership-apihub
 echo "---Complete APIHUB deploy using Helm---"