[minor] Revert redis changes for collaborate add-on (#2152)"

.github/workflows/verify-cli-pr.yml

@@ -28,4 +28,4 @@ jobs:
             echo "Found local Python package ($GITHUB_WORKSPACE/image/cli/install/mas_devops.tar.gz) in this PR, Local package is not allowed in the master branch."
             RC=1
           fi
-          exit $RC
+          exit $RC

python/src/mas/cli/install/app.py

@@ -846,11 +846,7 @@ def configSNO(self):
         if self.isSNO():
             self.setParam("mongodb_replicas", "1")
             self.setParam("mongodb_cpu_requests", "500m")
-            self.setParam("redis_replicas", "1")
             self.setParam("mas_app_settings_aio_flag", "false")
-        else:
-            # Multi-node cluster: use 3 replicas for Redis HA
-            self.setParam("redis_replicas", "3")
 
     @logMethodCall
     def configDNSAndCerts(self):
@@ -1722,12 +1718,6 @@ def nonInteractiveMode(self) -> None:
                 if value is not None and value != "":
                     self.setParam(key, value)
                     self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{value}.yml")
-            # Redis
-            elif key == "redis_namespace":
-                if value is not None and value != "":
-                    self.setParam(key, value)
-                    self.setParam("redis_action", "install")
-                    self.setParam("redis_cfg_file", f"/workspace/configs/redis-{value}.yml")
 
             # SLS
             elif key == "license_file":
@@ -1880,14 +1870,6 @@ def nonInteractiveMode(self) -> None:
         if ((self.getParam("mas_app_channel_predict") is not None and self.getParam("mas_app_channel_predict") != "") and 'health' not in self.getParam("mas_appws_components")):
             self.fatalError("--manage-components must include 'health' component when installing Predict")
 
-        # Configure Redis if Collaborate addon is enabled
-        if self.installManage and "collaborate=" in self.getParam("mas_appws_components"):
-            logger.debug("Collaborate addon detected in mas_appws_components, configuring Redis")
-            self.setParam("redis_action", "install")
-            if self.getParam("redis_namespace") == "":
-                self.setParam("redis_namespace", "redis")
-            self.setParam("redis_cfg_file", f"/workspace/configs/redis-{self.getParam('redis_namespace')}.yml")
-
         # Validate ArcGIS installation requirements in non-interactive mode
         if self.installArcgis:
             hasSpatial = self.installManage and "spatial=" in self.getParam("mas_appws_components")

python/src/mas/cli/install/argBuilder.py

@@ -180,11 +180,6 @@ def buildCommand(self) -> str:
         if self.getParam('mongodb_namespace') != "":
             command += f"  --mongodb-namespace \"{self.getParam('mongodb_namespace')}\"{newline}"
 
-        # Redis Configuration
-        # -----------------------------------------------------------------------------
-        if self.getParam('redis_namespace') != "":
-            command += f"  --redis-namespace \"{self.getParam('redis_namespace')}\"{newline}"
-
         # OCP Configuration
         # -----------------------------------------------------------------------------
         if self.getParam('ocp_ingress_tls_secret_name') != "":

python/src/mas/cli/install/argParser.py

@@ -423,18 +423,6 @@ def isValidFile(parser: argparse.ArgumentParser, arg: str) -> str:
     help="Namespace for MongoDB Community Operator"
 )
 
-# Redis Configuration
-# -----------------------------------------------------------------------------
-redisArgGroup = installArgParser.add_argument_group(
-    "Redis",
-    "Configure the namespace for Redis deployment (required for Collaborate addon)."
-)
-redisArgGroup.add_argument(
-    "--redis-namespace",
-    required=False,
-    help="Namespace for Redis deployment (default: redis)"
-)
-
 # OCP Configuration
 # -----------------------------------------------------------------------------
 ocpArgGroup = installArgParser.add_argument_group(

python/src/mas/cli/install/settings/__init__.py

@@ -10,13 +10,12 @@
 
 from .db2Settings import Db2SettingsMixin
 from .mongodbSettings import MongoDbSettingsMixin
-from .redisSettings import RedisSettingsMixin
 from .kafkaSettings import KafkaSettingsMixin
 from .manageSettings import ManageSettingsMixin
 from .additionalConfigs import AdditionalConfigsMixin
 
 
-class InstallSettingsMixin(Db2SettingsMixin, MongoDbSettingsMixin, RedisSettingsMixin, KafkaSettingsMixin, ManageSettingsMixin, AdditionalConfigsMixin):
+class InstallSettingsMixin(Db2SettingsMixin, MongoDbSettingsMixin, KafkaSettingsMixin, ManageSettingsMixin, AdditionalConfigsMixin):
     """
     This class collects all the Mixins providing interactive prompts for mas-install
     """

python/src/mas/cli/install/settings/manageSettings.py

@@ -176,10 +176,6 @@ def manageSettingsComponents(self) -> None:
                     self.params["mas_appws_components"] += ",aip=latest"
                 if self.yesOrNo(" - Vegetation Management"):
                     self.params["mas_appws_components"] += ",vegm=latest"
-                if self.yesOrNo(" - Collaborate"):
-                    self.params["mas_appws_components"] += ",collaborate=latest"
-                    # Configure Redis for Collaborate addon
-                    self.configRedis()
                 logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
 
                 if ",icd=" in self.params["mas_appws_components"]:

python/src/mas/cli/install/summarizer.py

@@ -198,7 +198,6 @@ def manageSummary(self) -> None:
                 self.printSummary("  + Workday Applications", "Enabled" if "workday=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + AIP", "Enabled" if "aip=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + Vegetation Management", "Enabled" if "vegm=" in self.getParam("mas_appws_components") else "Disabled")
-                self.printSummary("  + Collaborate", "Enabled" if "collaborate=" in self.getParam("mas_appws_components") else "Disabled")
 
                 self.printParamSummary("+ Upgrade Type", "mas_appws_upgrade_type")
 
@@ -376,12 +375,6 @@ def mongoSummary(self) -> None:
         else:
             self.fatalError(f"Unexpected value for mongodb_action parameter: {self.getParam('mongodb_action')}")
 
-    def redisSummary(self) -> None:
-        if self.getParam("redis_action") == "install":
-            self.printH2("Redis")
-            self.printSummary("Type", "Redis with Sentinel HA")
-            self.printParamSummary("Install Namespace", "redis_namespace")
-
     def kafkaSummary(self) -> None:
         if self.getParam("kafka_action_system") != "":
             self.printH2("Kafka")
@@ -452,7 +445,6 @@ def displayInstallSummary(self) -> None:
 
         # Application Dependencies
         self.mongoSummary()
-        self.redisSummary()
         self.db2Summary()
         self.cosSummary()
         self.kafkaSummary()

tekton/generate-tekton-tasks.yml

@@ -38,8 +38,6 @@
         - mongodb
         - nvidia-gpu
         - ocs
-        - redis
-        - rhoai-migration
         - sls-registry-update
         - sls
         - turbonomic

tekton/src/params/install.yml.j2

@@ -90,21 +90,6 @@
   type: string
   description: IBM Cloud MongoDb admin password
   default: ""
-# Dependencies - Redis
-# -----------------------------------------------------------------------------
-- name: redis_namespace
-  type: string
-  description: Redis namespace
-  default: ""
-- name: redis_replicas
-  type: string
-  description: Redis replicas
-  default: ""
-- name: redis_action
-  type: string
-  description: Redis action
-  default: ""
-
 
 # Dependencies (Kafka) - General variables
 - name: kafka_action_system

tekton/src/pipelines/mas-install.yml.j2

@@ -107,40 +107,34 @@ spec:
         - cert-manager
         - grafana
 
-    # 2.2 Redis
-    {{ lookup('template', pipeline_src_dir ~ '/taskdefs/dependencies/redis.yml.j2') | indent(4) }}
-      runAfter:
-        - cert-manager
-        - grafana
-
-    # 2.3 Kafka
+    # 2.2 Kafka
     {{ lookup('template', pipeline_src_dir ~ '/taskdefs/dependencies/kafka.yml.j2') | indent(4) }}
       runAfter:
         - grafana
 
-    # 2.4 Db2
-    # 2.4.1 System Db2
+    # 2.3 Db2
+    # 2.3.1 System Db2
     {{ lookup('template', pipeline_src_dir ~ '/taskdefs/dependencies/db2.yml.j2', template_vars={'suffix': 'system'}) | indent(4) }}
       runAfter:
         - cert-manager
 
-    # 2.4.2 Dedicated Manage Db2
+    # 2.3.2 Dedicated Manage Db2
     {{ lookup('template', pipeline_src_dir ~ '/taskdefs/dependencies/db2.yml.j2', template_vars={'suffix': 'manage'}) | indent(4) }}
       runAfter:
         - db2-system
 
-    # 2.4.3 Install Dedicated Db2 for AI Service
+    # 2.3.3 Install Dedicated Db2 for AI Service
     # -------------------------------------------------------------------------
     {{ lookup('template', pipeline_src_dir ~ '/taskdefs/dependencies/db2.yml.j2', template_vars={'suffix': 'aiservice'}) | indent(4) }}
       runAfter:
         - cert-manager
 
-    # 2.5 IBM SLS
+    # 2.4 IBM SLS
     {{ lookup('template', pipeline_src_dir ~ '/taskdefs/dependencies/sls.yml.j2') | indent(4) }}
       runAfter:
         - mongodb
 
-    # 2.6 DRO
+    # 2.5 DRO
     {{ lookup('template', pipeline_src_dir ~ '/taskdefs/dependencies/dro.yml.j2') | indent(4) }}
       runAfter:
         - ibm-catalogs