Merge pull request #1787 from mladBlum/moveDittoHeaderToIngress

Move x-ditto-pre-authenticated and X-Forwarded-User to ingress.api.annotations
eclipse-ditto · Nov 3, 2023 · 5452d9f · 5452d9f
2 parents e6f1636 + 1b3739f
commit 5452d9f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
@@ -40,7 +40,7 @@ jobs:
           python-version: ${{ env.VERSION_PYTHON }}
           check-latest: true
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
         with:
           version: ${{ env.VERSION_CHART_TESTING }}
       - name: Run chart-testing (list-changed)
@@ -65,7 +65,7 @@ jobs:
         k8s:
           - v1.26.6
           - v1.27.3
-          - v1.28.0
+          - v1.28.3
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
         k8s:
           - v1.26.6
           - v1.27.3
-          - v1.28.0
+          - v1.28.3
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -109,7 +109,7 @@ jobs:
           python-version: ${{ env.VERSION_PYTHON }}
           check-latest: true
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
         with:
           version: ${{ env.VERSION_CHART_TESTING }}
       - name: Run chart-testing (list-changed)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.4.1  # chart version is effectively set by release-job
+version: 3.4.2  # chart version is effectively set by release-job
 appVersion: 3.4.0
 keywords:
   - iot-chart

diff --git a/deployment/helm/ditto/templates/nginx-ingress.yaml b/deployment/helm/ditto/templates/nginx-ingress.yaml
@@ -133,10 +133,6 @@ data:
     proxy_hide_header X-Original-URI;
     proxy_set_header X-Original-URI $request_uri;
 
-    # set ditto-specific forwarded headers
-    proxy_set_header        X-Forwarded-User              $remote_user;
-    proxy_set_header        x-ditto-pre-authenticated     "nginx:$remote_user";
-
   proxy-connect-timeout: "10" # seconds, default: 60
   # timeouts are configured slightly higher than gateway read-timeout of 60 seconds
   proxy-send-timeout: "70" # seconds, default: 60

diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
@@ -314,6 +314,10 @@ ingress:
         add_header "X-Content-Type-Options" "nosniff" always;
         add_header "X-Frame-Options" "SAMEORIGIN" always;
         add_header "X-XSS-Protection" "1; mode=block" always;
+
+        # set ditto-specific forwarded headers
+        proxy_set_header X-Forwarded-User $remote_user;
+        proxy_set_header x-ditto-pre-authenticated "nginx:$remote_user";
   # ws the /ws (WebSocket) Ingress configuration
   ws:
     # paths configures ingress paths