Initial work for PROXY_ADDRESS_FORWARDING. (#2797)

hitachienergy · Dec 28, 2021 · 8c26257 · 8c26257
1 parent 211c389
commit 8c26257
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/ansible/playbooks/roles/applications/templates/auth-service/00-auth-service.yml.j2 b/ansible/playbooks/roles/applications/templates/auth-service/00-auth-service.yml.j2
@@ -209,6 +209,10 @@ spec:
               name: "{{ auth_service_name }}-db"
         - name: X509_CA_BUNDLE
           value: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+{% if data.service.proxy_address_forwarding is defined and data.service.proxy_address_forwarding %}
+        - name: PROXY_ADDRESS_FORWARDING
+          value: "true"
+{% endif %}
       containers:
       - command:
         - /scripts/keycloak.sh
@@ -241,6 +245,10 @@ spec:
               name: "{{ auth_service_name }}-db"
         - name: X509_CA_BUNDLE
           value: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+{% if data.service.proxy_address_forwarding is defined and data.service.proxy_address_forwarding %}
+        - name: PROXY_ADDRESS_FORWARDING
+          value: "true"
+{% endif %}
 {% if use_epiphany_image_registry %}
         image: {{ image_registry_address }}/{{ data.image_path }}
 {% else %}

diff --git a/docs/changelogs/CHANGELOG-1.3.md b/docs/changelogs/CHANGELOG-1.3.md
@@ -15,6 +15,7 @@
 - [#2644](https://github.com/epiphany-platform/epiphany/issues/2644) - Add validation to check hostnames for on-prem deployment
 - [#2703](https://github.com/epiphany-platform/epiphany/issues/2703) - Add tests for docker and kubelet cgroup driver
 - [#1076](https://github.com/epiphany-platform/epiphany/issues/1076) - Add sorting entries in the inventory file
+- [#2785](https://github.com/epiphany-platform/epiphany/issues/2785) - Add configuration option to Keycloak for PROXY_ADDRESS_FORWARDING env. variable
 - [#2814](https://github.com/epiphany-platform/epiphany/issues/2814) - Add description how to enable TLS in Kibana
 - [#1076](https://github.com/epiphany-platform/epiphany/issues/2595) - Document connection protocols and ciphers
 

diff --git a/schema/common/defaults/configuration/applications.yml b/schema/common/defaults/configuration/applications.yml
@@ -67,6 +67,7 @@ specification:
       namespace: namespace-for-auth
       admin_user: auth-service-username
       admin_password: PASSWORD_TO_CHANGE
+      proxy_address_forwarding: false # Enabling proxy address forwarding when behind HAProxy.
     database:
       name: auth-database-name
       #port: "5432" # leave it when default

diff --git a/schema/common/validation/configuration/applications.yml b/schema/common/validation/configuration/applications.yml
@@ -115,6 +115,8 @@ properties:
               type: string
             admin_password:
               type: string
+            proxy_address_forwarding:
+              type: boolean
         database:
           type: object
           properties: