Adapt install-helm-chart.sh and test-helm-release.sh for multitenant

Author: jreynard-code

.github/scripts/install-helm-chart.sh

@@ -7,7 +7,6 @@ CURRENT_SCRIPT_DIR=$(realpath "$(dirname "$0")")
 HELM_DEPLOY_SCRIPT_BASE_PATH=$(realpath "${CURRENT_SCRIPT_DIR}"/../../api/kubernetes)
 
 PASSWORD_FOR_ARGO_PASSWORD="a-super-secure-password-we-dont-care-about"
-NAMESPACE="phoenix"
 
 # Generate a sample values-ci.yaml. We will also inherit configuration from values-dev.yaml
 cat <<EOF > values-ci.yaml
@@ -28,8 +27,8 @@ config:
       oauth2:
         resource-server:
           jwt:
-            issuer-uri: "https://localhost/${NAMESPACE}/auth/realms/cosmotech"
-            jwk-set-uri: "http://${NAMESPACE}-keycloak.${NAMESPACE}.svc.cluster.local/${NAMESPACE}/auth/realms/cosmotech/protocol/openid-connect/certs"
+            issuer-uri: "https://localhost/${CHART_RELEASE_TEST_NAMESPACE}/auth/realms/cosmotech"
+            jwk-set-uri: "http://${CHART_RELEASE_TEST_NAMESPACE}-keycloak.${CHART_RELEASE_TEST_NAMESPACE}.svc.cluster.local/${CHART_RELEASE_TEST_NAMESPACE}/auth/realms/cosmotech/protocol/openid-connect/certs"
             audiences:
               - "account"
 
@@ -45,12 +44,12 @@ config:
         principalJwtClaim: "email"
         tenantIdJwtClaim: "iss"
         allowed-tenants:
-          - "${NAMESPACE}"
+          - "${CHART_RELEASE_TEST_NAMESPACE}"
           - "cosmotech"
       identityProvider:
         code: keycloak
-        authorizationUrl: "https://localhost/${NAMESPACE}/auth/realms/cosmotech/protocol/openid-connect/auth"
-        tokenUrl: "https://localhost/${NAMESPACE}/auth/realms/cosmotech/protocol/openid-connect/token"
+        authorizationUrl: "https://localhost/${CHART_RELEASE_TEST_NAMESPACE}/auth/realms/cosmotech/protocol/openid-connect/auth"
+        tokenUrl: "https://localhost/${CHART_RELEASE_TEST_NAMESPACE}/auth/realms/cosmotech/protocol/openid-connect/token"
         defaultScopes:
           openid: "OpenId Scope"
           email: "Email Scope"

.github/scripts/test-helm-release.sh

@@ -2,7 +2,7 @@
 
 API_VERSION=${1:-latest}
 
-helm -n "${CHART_RELEASE_TEST_NAMESPACE}" test "cosmotech-api-${API_VERSION}"
+helm -n "${CHART_RELEASE_TEST_NAMESPACE}" test "cosmotech-api-${CHART_RELEASE_TEST_NAMESPACE}-${API_VERSION}"
 
 retVal=$?
 echo "retVal=$retVal"
@@ -20,15 +20,15 @@ kubectl describe all --all-namespaces
 echo "=== ==="
 
 for test in openapi swaggerui; do
-  echo ">>> Logs for cosmotech-api-${API_VERSION}-test-connection-${test} <<<"
-  kubectl -n "${CHART_RELEASE_TEST_NAMESPACE}" logs "cosmotech-api-${API_VERSION}-test-connection-${test}"
+  echo ">>> Logs for cosmotech-api-${CHART_RELEASE_TEST_NAMESPACE}-${API_VERSION}-test-connection-${test} <<<"
+  kubectl -n "${CHART_RELEASE_TEST_NAMESPACE}" logs "cosmotech-api-${CHART_RELEASE_TEST_NAMESPACE}-${API_VERSION}-test-connection-${test}"
   echo "-"
 done
 
 if [[ "${retVal}" != "0" ]]; then
   echo "Helm Release testing did not complete successfully: $retVal."
-  echo "  Command: helm -n ${CHART_RELEASE_TEST_NAMESPACE} test cosmotech-api-${API_VERSION}"
-  exit $retVal
+  echo "  Command: helm -n ${CHART_RELEASE_TEST_NAMESPACE} test cosmotech-api-${CHART_RELEASE_TEST_NAMESPACE}-${API_VERSION}"
+  exit $retVald
 fi
 
 # Also test the access via the Ingress
@@ -37,11 +37,11 @@ if [[ "${API_VERSION}" == "latest" ]]; then
 else
   base_path="/${API_VERSION}"
 fi
-for route in "/" "/openapi" "/openapi.json" "/openapi.yaml" ; do
-  echo "==> Testing the access (${base_path}${route}) via the Ingress Resource (controlled by an Ingress Controller)"
+for route in "/openapi" "/openapi.yaml" ; do
+  echo "==> Testing the access (/cosmotech-api/${CHART_RELEASE_TEST_NAMESPACE}${base_path}${route}) via the Ingress Resource (controlled by an Ingress Controller)"
   wget --no-check-certificate \
     --tries 10 \
     -S \
     -O - \
-    "https://localhost/cosmotech-api${base_path}${route}" || exit 1
+    "https://localhost/cosmotech-api/${CHART_RELEASE_TEST_NAMESPACE}${base_path}${route}" || exit 1
 done

api/kubernetes/helm-chart/templates/tests/test-access-openapi.yaml

@@ -39,7 +39,6 @@ spec:
         - '-O'
         - '-'
         - 'http://{{ include "cosmotech-api.fullname" . }}:{{ .Values.service.port }}{{ $contextPath | trimSuffix "/" }}/openapi'
-        - 'http://{{ include "cosmotech-api.fullname" . }}:{{ .Values.service.port }}{{ $contextPath | trimSuffix "/" }}/openapi.json'
         - 'http://{{ include "cosmotech-api.fullname" . }}:{{ .Values.service.port }}{{ $contextPath | trimSuffix "/" }}/openapi.yaml'
       securityContext:
         readOnlyRootFilesystem: true

api/kubernetes/helm-chart/templates/tests/test-access-swaggerui.yaml

@@ -5,7 +5,7 @@ metadata:
   name: "{{ include "cosmotech-api.fullname" . }}-test-connection-swaggerui"
   namespace: {{ .Release.Namespace }}
   labels:
-  {{- include "cosmotech-api.labels" . | nindent 4 }}
+    {{- include "cosmotech-api.labels" . | nindent 4 }}
   annotations:
     email: "[email protected]"
     "helm.sh/hook": test