PAAS-2721: fix upgrade issue when tomcat filtering is on

Jahia · Dec 4, 2023 · 4ff5da2 · 4ff5da2
1 parent de0438c
commit 4ff5da2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/packages/jahia/disable-tomcat-filtering.yaml b/packages/jahia/disable-tomcat-filtering.yaml
@@ -16,5 +16,14 @@ onInstall:
       mv /etc/datadog-agent/conf.d/squid.d/conf.yaml /etc/datadog-agent/conf.d/squid.d/conf.yaml-disabled
       systemctl restart datadog-agent
   - setGlobalRepoRootUrl
-  - install:
-      jps: "${globals.repoRootUrl}/packages/jahia/jahia-rolling-restart.yml"
+  - if(! ${settings.skipRestart}):
+      - install:
+          jps: "${globals.repoRootUrl}/packages/jahia/jahia-rolling-restart.yml"
+
+settings:
+  fields:
+    - name: skipRestart
+      type: checkbox
+      caption: Skip the rolling restart
+      default: false
+      required: false
diff --git a/packages/jahia/rolling-upgrade.yml b/packages/jahia/rolling-upgrade.yml
@@ -12,6 +12,16 @@ mixins:
   - ../../mixins/jahia.yml
 
 onInstall:
+  # Remove tomcat filtering if enabled
+  - api: env.control.GetContainerEnvVarsByGroup
+    nodeGroup: proc
+  - if ("${response.object.tomcat_cfg_cloud_filtering}" == "true"):
+      - setGlobals:
+          tomcatFiltering: true
+  - if(globals.tomcatFiltering):
+      - setGlobalRepoRootUrl
+      - install:
+          jps: "${globals.repoRootUrl}/packages/jahia/disable-tomcat-filtering.yaml"
   # Dump modules state
   - dumpModules:
       operation: upgrade
@@ -37,6 +47,10 @@ onInstall:
   - checkModulesAfterOperation:
       operation: upgrade
       checkVersion: false
+  # Re-enable tomcat filtering if needed
+  - if(globals.tomcatFiltering):
+      - install:
+          jps: "${globals.repoRootUrl}/packages/jahia/enable-tomcat-filtering.yaml"
 
 settings:
   fields:

diff --git a/packages/jahia/upgrade.yml b/packages/jahia/upgrade.yml
@@ -50,6 +50,19 @@ onInstall:
       - set:
           targetDockerTag: ${settings.targetVersion}_${settings.dockerTagSuffix}
 
+  # Remove tomcat filtering if enabled
+  - api: env.control.GetContainerEnvVarsByGroup
+    nodeGroup: proc
+  - if ("${response.object.tomcat_cfg_cloud_filtering}" == "true"):
+      - setGlobals:
+          tomcatFiltering: true
+  - if(globals.tomcatFiltering):
+      - setGlobalRepoRootUrl
+      - install:
+          jps: "${globals.repoRootUrl}/packages/jahia/disable-tomcat-filtering.yaml"
+          settings:
+            skipRestart: true
+
   # Upgrade Jahia nodes (all Jahia nodes must be stopped first)
   - cmd [cp, proc]:
       - service tomcat stop
@@ -86,6 +99,11 @@ onInstall:
       operation: upgrade
       checkVersion: false
 
+  # Re-enable tomcat filtering if needed
+  - if(globals.tomcatFiltering):
+      - install:
+          jps: "${globals.repoRootUrl}/packages/jahia/enable-tomcat-filtering.yaml"
+
   # Unmute monitors
   - unmuteEnvWideMonitors
   - unmuteDatadogSynthetics