Merge branch 'pegasystems:master' into feature/clustering-service-name

alemax22 · Oct 9, 2024 · 79b43e7 · 79b43e7
2 parents 9b6a19f + 4fdedba
commit 79b43e7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
@@ -162,6 +162,14 @@ jobs:
         run: |
           make dependencies
 
+      - name: sync chart version
+        run: |
+          cd $GITHUB_WORKSPACE
+          chmod 777 sync_chart_version.sh
+          ./sync_chart_version.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_SECRET }}
+
       - name: before deploy step 1
         run: |
           cd $GITHUB_WORKSPACE
@@ -172,7 +180,6 @@ jobs:
         run: |
           make examples 
 
-
       - name: deploy on github releases
         uses: softprops/action-gh-release@v1
         with:
@@ -193,11 +200,3 @@ jobs:
           ./update_gh_pages.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_SECRET }}
-
-      - name: sync chart version
-        run: |
-          cd $GITHUB_WORKSPACE
-          chmod 777 sync_chart_version.sh
-          ./sync_chart_version.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_SECRET }}
diff --git a/.github/workflows/mend-scan.yml b/.github/workflows/mend-scan.yml
@@ -40,13 +40,13 @@ jobs:
           java -jar wss-unified-agent.jar
         fi
     - name: 'Upload WhiteSource folder'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Mend
         path: whitesource
         retention-days: 14
     - name: 'Upload Mend folder if failure'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Mend

diff --git a/charts/addons/Chart.yaml b/charts/addons/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: addons
-version: "3.24.3"
+version: "3.24.6"
diff --git a/charts/backingservices/Chart.yaml b/charts/backingservices/Chart.yaml
@@ -17,4 +17,4 @@ description: Helm Chart to provision the latest Search and Reporting Service (SR
 # The chart version: Pega provides this as a useful way to track changes you make to this chart.
 # As a best practice, you should increment the version number 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: "3.24.3"
+version: "3.24.6"
diff --git a/charts/pega/Chart.yaml b/charts/pega/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: pega
-version: "3.24.3"
+version: "3.24.6"
 description: Pega installation on kubernetes
 keywords:
 - pega

diff --git a/charts/pega/config/deploy/server.xml.tmpl b/charts/pega/config/deploy/server.xml.tmpl
@@ -72,6 +72,7 @@
                maxHttpHeaderSize="16384"
                maxSavePostSize="65536"
                connectionTimeout="20000"
+               keepAliveTimeout="{{ default .Env.CONFIG_CATALINA_CONNECTOR_8080_KEEPALIVETIMEOUT 20000 }}"
                maxHeaderCount="100"
                maxThreads="{{ default .Env.CONFIG_CATALINA_CONNECTOR_8080_MAXTHREADS 200 }}" />
 

diff --git a/terratest/src/test/pega/data/expectedInstallDeployServer.xml.tmpl b/terratest/src/test/pega/data/expectedInstallDeployServer.xml.tmpl
@@ -72,6 +72,7 @@
                maxHttpHeaderSize="16384"
                maxSavePostSize="65536"
                connectionTimeout="20000"
+               keepAliveTimeout="{{ default .Env.CONFIG_CATALINA_CONNECTOR_8080_KEEPALIVETIMEOUT 20000 }}"
                maxHeaderCount="100"
                maxThreads="{{ default .Env.CONFIG_CATALINA_CONNECTOR_8080_MAXTHREADS 200 }}" />