diff --git a/charts/uffizzi-app/Chart.yaml b/charts/uffizzi-app/Chart.yaml index 6f58f411..9d218407 100644 --- a/charts/uffizzi-app/Chart.yaml +++ b/charts/uffizzi-app/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: uffizzi-app -version: 1.2.4 +version: 1.2.5 kubeVersion: ">= 1.21.0-0" # https://issuetracker.google.com/issues/77503699 description: "Uffizzi is an open-source engine for creating lightweight, ephemeral test environments for APIs and full-stack applications. Uffizzi enables teams to preview new features before merging." type: application diff --git a/charts/uffizzi-app/templates/configmap-common.yaml b/charts/uffizzi-app/templates/configmap-common.yaml index 7dc46ee2..c7e61051 100644 --- a/charts/uffizzi-app/templates/configmap-common.yaml +++ b/charts/uffizzi-app/templates/configmap-common.yaml @@ -9,6 +9,7 @@ data: RAILS_ENV: {{ .Values.env | quote }} APP_URL: {{ .Values.app_url }} CONTROLLER_URL: {{ default (print "http://" .Release.Name "-controller:8080") .Values.controller_url }} + VCLUSTER_CONTROLLER_URL: {{ default (print "http://" .Release.Name "-controller:8080") .Values.vcluster_controller_url }} EMAIL_DELIVERY_ENABLED: {{ .Values.feature_email_delivery | quote }} MANAGED_DNS_ZONE_DNS_NAME: {{ .Values.managed_dns_zone_dns_name | quote }} UFFIZZI_USER_EMAIL: {{ .Values.global.uffizzi.firstUser.email }} diff --git a/charts/uffizzi-app/templates/secret-web.yaml b/charts/uffizzi-app/templates/secret-web.yaml index a2862883..3ef51b63 100644 --- a/charts/uffizzi-app/templates/secret-web.yaml +++ b/charts/uffizzi-app/templates/secret-web.yaml @@ -15,6 +15,8 @@ data: SIDEKIQ_PASSWORD: {{ .Values.basic_auth_password | b64enc }} CONTROLLER_LOGIN: {{ .Values.global.uffizzi.controller.username | b64enc }} CONTROLLER_PASSWORD: {{ .Values.global.uffizzi.controller.password | b64enc }} + VCLUSTER_CONTROLLER_LOGIN: {{ .Values.global.uffizzi.controller.username | b64enc }} + VCLUSTER_CONTROLLER_PASSWORD: {{ .Values.global.uffizzi.controller.password | b64enc }} GITHUB_APP_ID: {{ .Values.github_app_id | b64enc }} GITHUB_APP_SLUG: {{ .Values.github_app_slug | b64enc }} GITHUB_CLIENT_ID: {{ .Values.github_client_id | b64enc }} diff --git a/charts/uffizzi-app/values.yaml b/charts/uffizzi-app/values.yaml index 8508ab78..d9ca26f5 100644 --- a/charts/uffizzi-app/values.yaml +++ b/charts/uffizzi-app/values.yaml @@ -27,6 +27,7 @@ web-replicas: 3 sidekiq-replicas: 1 hostname: localhost controller_url: "" +vcluster_controller_url: "" allowed_hosts: "" db_host: "" # default to dependent postgresql rails_secret_key_base: "" # default to half-random string