Rename TRENTO_DOMAIN to TRENTO_WEB_ORIGIN (#97)

* Rename TRENTO_DOMAIN to TRENTO_WEB_ORIGIN * Make TRENTO_WEB_ORIGIN mandatory in installation script
trento-project · Jun 10, 2024 · e66b626 · e66b626
1 parent 1b6e4a5
commit e66b626
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 17 deletions.
diff --git a/charts/trento-server/Chart.yaml b/charts/trento-server/Chart.yaml
@@ -7,7 +7,7 @@ description: The trento server chart contains all the components necessary to ru
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates
-version: 2.3.1-dev
+version: 2.3.1-dev1
 
 dependencies:
   - name: trento-web

diff --git a/charts/trento-server/charts/trento-web/Chart.yaml b/charts/trento-server/charts/trento-web/Chart.yaml
@@ -15,4 +15,4 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.1-dev
+version: 2.3.1-dev1
diff --git a/charts/trento-server/charts/trento-web/templates/configmap.yaml b/charts/trento-server/charts/trento-web/templates/configmap.yaml
@@ -15,4 +15,4 @@ data:
   PROMETHEUS_URL: "http://{{ .Release.Name }}-{{ .Values.global.prometheus.name }}"
   AMQP_URL: "amqp://trento:trento@{{ .Release.Name }}-{{ .Values.global.rabbitmq.name }}:{{ .Values.global.rabbitmq.servicePort }}"
   CHARTS_ENABLED: "{{ .Values.chartsEnabled }}"
-  TRENTO_DOMAIN: "{{ .Values.trentoDomain }}"
+  TRENTO_WEB_ORIGIN: "{{ .Values.trentoWebOrigin }}"
diff --git a/docs/trento-server.md b/docs/trento-server.md
@@ -100,7 +100,7 @@ helm install trento .
 or perform a rolling update:
 
 ```
-helm upgrade trento . --set trento-web.trentoDomain="trento.example.com"
+helm upgrade trento . --set trento-web.trentoWebOrigin="trento.example.com"
 ```
 
 _Note: be sure to replace trento.example.com with a valid hostname that points to the Trento server._

diff --git a/hack/cert-manager/README.md b/hack/cert-manager/README.md
@@ -30,7 +30,7 @@ helm install cert-manager jetstack/cert-manager --namespace cert-manager --creat
 ### 4. Generate a valid configuration for cert-manager
 Use `envsubst` to substitute the templates with actual valid data (make sure to replace the suggestions here with valid ones for your deployment):
 ```
-export TRENTO_DOMAIN=example.com [email protected] TRENTO_NAMESPACE=default TRENTO_INGRESS_CLASS=traefik
+export TRENTO_WEB_ORIGIN=example.com [email protected] TRENTO_NAMESPACE=default TRENTO_INGRESS_CLASS=traefik
 envsubst < certificate.tpl.yaml > certificate.yaml
 envsubst < cluster-issuer.tpl.yaml > cluster-issuer.yaml
 envsubst < override-values.tpl.yaml > override-values.yaml

diff --git a/hack/cert-manager/certificate.tpl.yaml b/hack/cert-manager/certificate.tpl.yaml
@@ -10,6 +10,6 @@ spec:
     name: letsencrypt-production
     kind: ClusterIssuer
 
-  commonName: ${TRENTO_DOMAIN}
+  commonName: ${TRENTO_WEB_ORIGIN}
   dnsNames:
-  - ${TRENTO_DOMAIN}
+  - ${TRENTO_WEB_ORIGIN}
diff --git a/hack/cert-manager/override-values.tpl.yaml b/hack/cert-manager/override-values.tpl.yaml
@@ -1,7 +1,7 @@
 trento-web:
   ingress:
     hosts:
-      - host: ${TRENTO_DOMAIN}
+      - host: ${TRENTO_WEB_ORIGIN}
         paths:
           - path: /
             pathType: ImplementationSpecific
@@ -13,7 +13,7 @@ trento-web:
 trento-wanda:
   ingress:
     hosts:
-      - host: ${TRENTO_DOMAIN}
+      - host: ${TRENTO_WEB_ORIGIN}
         paths:
         - path: /api/checks
           pathType: ImplementationSpecific

diff --git a/scripts/install-server.sh b/scripts/install-server.sh
@@ -27,7 +27,7 @@ usage() {
         -r, --rolling               Use the rolling version instead of the stable one.
         -e, --existing-k8s          Deploy to an existing kubernetes cluster (don't deploy k3s)
         -u, --use-registry          Container registry to pull the images from
-        -d, --trento-domain         FQDN for trento-server
+        -d, --trento-web-origin     Origin of trento-server
         -h, --help                  Print this help.
 
     Example:
@@ -52,7 +52,7 @@ cmdline() {
         --rolling) args="${args}-r " ;;
         --use-registry) args="${args}-u " ;;
         --existing-k8s) args="${args}-e " ;;
-        --trento-domain) args="${args}-d " ;;
+        --trento-web-origin) args="${args}-d " ;;
         --help) args="${args}-h " ;;
 
         # pass through anything else
@@ -118,7 +118,7 @@ cmdline() {
             ;;
 
         d)
-            TRENTO_DOMAIN=$OPTARG
+            TRENTO_WEB_ORIGIN=$OPTARG
             ;;
 
         *)
@@ -128,7 +128,7 @@ cmdline() {
         esac
     done
 
-    check_trento_domain
+    check_trento_web_origin
     set_admin_password
     confirm_admin_password
     configure_alerting
@@ -164,10 +164,17 @@ function set_admin_password() {
     fi
 }
 
-function check_trento_domain() {
-    if [[ -z "$TRENTO_DOMAIN" ]]; then
-        read -rp "A valid domain is required for websockets functionality, please provide one: " TRENTO_DOMAIN </dev/tty
+function check_trento_web_origin() {
+    if [[ -z "$TRENTO_WEB_ORIGIN" ]]; then
+        read -rp "A valid origin is required for websockets functionality, please provide one: " TRENTO_WEB_ORIGIN </dev/tty
     fi
+
+    if [[ -z "$TRENTO_WEB_ORIGIN" ]]; then
+        echo "An origin for trento web is mandatory, please try again."
+        unset TRENTO_WEB_ORIGIN
+        check_trento_web_origin
+    fi
+
 }
 
 function confirm_admin_password() {
@@ -304,7 +311,7 @@ install_trento_server_chart() {
         --set trento-wanda.image.tag="${TRENTO_WANDA_VERSION}"
         --set trento-wanda.image.repository="${wanda_image}"
         --set trento-web.adminUser.password="${ADMIN_PASSWORD}"
-        --set trento-web.trentoDomain="${TRENTO_DOMAIN}"
+        --set trento-web.trentoWebOrigin="${TRENTO_WEB_ORIGIN}"
     )
     if [[ "$ENABLE_ALERTING" == "true" ]]; then
         args+=(