[minor] Support db2 v12 upgrade

image/cli/install/pre-install-rbac.sh

@@ -44,18 +44,18 @@ else
     PREINSTALL_BRANCH="${GITHUB_REF_NAME}"
     echo "Attempting to clone matching branch: ${PREINSTALL_BRANCH}"
   else
-    # For tag builds, use main branch
-    PREINSTALL_BRANCH="main"
-    echo "Using main branch for tag build"
+    # For tag builds, use master branch
+    PREINSTALL_BRANCH="master"
+    echo "Using master branch for tag build"
   fi
 
   # Clone the repository
   cd /tmp/install
   if git clone --depth 1 --branch "${PREINSTALL_BRANCH}" https://github.com/ibm-mas/pre-install.git 2>/dev/null; then
     echo "Successfully cloned pre-install repository (branch: ${PREINSTALL_BRANCH})"
   else
-    echo "Branch ${PREINSTALL_BRANCH} not found, falling back to main branch"
-    git clone --depth 1 --branch main https://github.com/ibm-mas/pre-install.git
+    echo "Branch ${PREINSTALL_BRANCH} not found, falling back to master branch"
+    git clone --depth 1 --branch master https://github.com/ibm-mas/pre-install.git
   fi
 
   PREINSTALL_SOURCE="/tmp/install/pre-install"

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

@@ -215,6 +215,7 @@ def interactiveMode(self, simplified: bool, advanced: bool) -> None:
 
         self.storageClassProvider = "custom"
         self.slsLicenseFileLocal = None
+        self.db2LicenseFileLocal = None
 
         # Catalog
         self.configCatalog()
@@ -243,6 +244,11 @@ def interactiveMode(self, simplified: bool, advanced: bool) -> None:
         self.configMongoDb()
         self.setDB2DefaultChannel()
         self.setDB2DefaultSettings()
+        self.printDescription([
+            "Db2 Universal Operator for v12 onwards requires to add a License activation key",
+            "If you don't have a license press enter to continue."
+        ])
+        self.db2LicenseFileLocal = self.promptForFile("Db2 License file", envVar="DB2_LICENSE_FILE", default="", mustExist=False)
         # Permission mode prompt (especially in dev mode)
         if isVersionEqualOrAfter('9.2.0', self.getParam("aiservice_channel")):
             self.configPermissionMode()
@@ -258,6 +264,7 @@ def nonInteractiveMode(self) -> None:
 
         self.storageClassProvider = "custom"
         self.slsLicenseFileLocal = None
+        self.db2LicenseFileLocal = None
 
         self.aiserviceTenantSchedulingConfigFileLocal = None
 
@@ -374,6 +381,9 @@ def nonInteractiveMode(self) -> None:
                 if value is not None and value != "":
                     self.slsLicenseFileLocal = value
                     self.setParam("sls_action", "install")
+            elif key == "db2_license_file":
+                if value is not None and value != "":
+                    self.db2LicenseFileLocal = value
             elif key == "dedicated_sls":
                 if value:
                     self.setParam("sls_namespace", f"mas-{self.args.aiservice_instance_id}-sls")
@@ -533,8 +543,9 @@ def install(self, argv):
 
         self.evaluatePreInstallRBACAccess()
 
-        # Set up the sls license file
+        # Set up the sls and db2 license file
         self.slsLicenseFile()
+        self.db2LicenseFile()
 
         self.aiserviceConfig()
 
@@ -582,6 +593,7 @@ def install(self, argv):
                     dynClient=self.dynamicClient,
                     namespace=pipelinesNamespace,
                     slsLicenseFile=self.slsLicenseFileSecret,
+                    db2LicenseFile=self.db2LicenseFileSecret,
                     additionalConfigs=self.additionalConfigsSecret,
                     podTemplates=self.podTemplatesSecret,
                     certs=self.certsSecret,

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

@@ -190,6 +190,8 @@ def buildCommand(self) -> str:
 
         if self.getParam('db2_channel') != "":
             command += f"  --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
+        if self.db2LicenseFileLocal:
+            command += f"  --db2-license-file \"{self.db2LicenseFileLocal}\""
 
         command += "  --accept-license --no-confirm"
         return command

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

@@ -481,7 +481,11 @@ def isValidFile(parser, arg) -> str:
     required=False,
     help="Subscription channel for Db2u"
 )
-
+db2ArgGroup.add_argument(
+    "--db2-license-file",
+    required=False,
+    help="Db2 License File for Db2"
+)
 
 # Development Mode
 # -----------------------------------------------------------------------------

python/src/mas/cli/aiservice/install/params.py

@@ -40,6 +40,7 @@
     "db2_timezone",
     "db2_namespace",
     "db2_channel",
+    "db2_license_file",
     "db2_affinity_key",
     "db2_affinity_value",
     "db2_tolerate_key",

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

@@ -1749,6 +1749,7 @@ def nonInteractiveMode(self) -> None:
         self.db2SetTolerations = False
         self.installAIService = False
         self.slsLicenseFileLocal = None
+        self.db2LicenseFileLocal = None
         self.aiserviceTenantSchedulingConfigFileLocal = None
 
         self.approvals: Dict[str, Dict[str, Any]] = {
@@ -1915,6 +1916,9 @@ def nonInteractiveMode(self) -> None:
                 if value is not None and value != "":
                     self.slsLicenseFileLocal = value
                     self.setParam("sls_action", "install")
+            elif key == "db2_license_file":
+                if value is not None and value != "":
+                    self.db2LicenseFileLocal = value
             elif key == "dedicated_sls":
                 if value:
                     self.setParam("sls_namespace", f"mas-{self.args.mas_instance_id}-sls")
@@ -2210,10 +2214,11 @@ def install(self, argv):
         if self.deployCP4D:
             self.configCP4D()
 
-        # Set up the secrets for additional configs, podtemplates, sls license file and manual certificates
+        # Set up the secrets for additional configs, podtemplates, sls license file, db2 license file and manual certificates
         self.additionalConfigs()
         self.podTemplates()
         self.slsLicenseFile()
+        self.db2LicenseFile()
         self.manualCertificates()
         self.aiserviceConfig()
 
@@ -2392,6 +2397,7 @@ def install(self, argv):
                     dynClient=self.dynamicClient,
                     namespace=pipelinesNamespace,
                     slsLicenseFile=self.slsLicenseFileSecret,
+                    db2LicenseFile=self.db2LicenseFileSecret,
                     additionalConfigs=self.additionalConfigsSecret,
                     podTemplates=self.podTemplatesSecret,
                     certs=self.certsSecret,

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

@@ -462,6 +462,8 @@ def buildCommand(self) -> str:
                 command += f"  --db2-type \"{self.getParam('db2_type')}\"{newline}"
             if self.getParam('db2_timezone') != "":
                 command += f"  --db2-timezone \"{self.getParam('db2_timezone')}\"{newline}"
+            if self.db2LicenseFileLocal != "":
+                command += f"  --db2-license-file \"{self.db2LicenseFileLocal}\"{newline}"
 
             if self.getParam('db2_affinity_key') != "":
                 command += f"  --db2-affinity-key \"{self.getParam('db2_affinity_key')}\"{newline}"

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

@@ -1225,6 +1225,11 @@ def isValidFile(parser: argparse.ArgumentParser, arg: str) -> str:
     required=False,
     help="Timezone for Db2 instance"
 )
+db2ArgGroup.add_argument(
+    "--db2-license-file",
+    required=False,
+    help="Db2 License File for Db2"
+)
 db2ArgGroup.add_argument(
     "--db2-affinity-key",
     required=False,

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

@@ -32,12 +32,14 @@ class AdditionalConfigsMixin():
         noConfirm: bool
         templatesDir: str
         slsLicenseFileLocal: str | None
+        db2LicenseFileLocal: str | None
         manualCertsDir: str | None
         showAdvancedOptions: bool
         aiserviceTenantSchedulingConfigFileLocal: str | None
         additionalConfigsSecret: Dict[str, Any] | None
         podTemplatesSecret: Dict[str, Any] | None
         slsLicenseFileSecret: Dict[str, Any] | None
+        db2LicenseFileSecret: Dict[str, Any] | None
         certsSecret: Dict[str, Any] | None
         aiserviceConfigSecret: Dict[str, Any] | None
 
@@ -289,6 +291,21 @@ def aiserviceConfig(self) -> None:
             self.setParam("tenant_scheduling_config_file", f"/workspace/aiservice/{path.basename(self.aiserviceTenantSchedulingConfigFileLocal)}")
             self.aiserviceConfigSecret = self.addFilesToSecret(aiserviceConfigSecret, self.aiserviceTenantSchedulingConfigFileLocal, 'yaml')
 
+    def db2LicenseFile(self) -> None:
+        if self.db2LicenseFileLocal:
+            db2LicenseFileSecret = {
+                "apiVersion": "v1",
+                "kind": "Secret",
+                "type": "Opaque",
+                "metadata": {
+                    "name": "pipeline-db2-license"
+                }
+            }
+            self.setParam("db2_license_file", f"/workspace/db2/{path.basename(self.db2LicenseFileLocal)}")
+            self.db2LicenseFileSecret = self.addFilesToSecret(db2LicenseFileSecret, self.db2LicenseFileLocal, '')
+        else:
+            self.db2LicenseFileSecret = None
+
     def addFilesToSecret(self, secretDict: dict, configPath: str, extension: str, keyPrefix: str = '') -> dict:
         """
         Add file (or files) to pipeline-additional-configs

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

@@ -78,6 +78,15 @@ def promptForListSelect(
         ) -> str:
             ...
 
+        def promptForFile(
+            self,
+            message: str,
+            mustExist: bool = True,
+            default: str = "",
+            envVar: str = ""
+        ) -> str:
+            ...
+
         # Methods from ConfigGeneratorMixin or InstallSettingsMixin
         def selectLocalConfigDir(self) -> None:
             ...
@@ -241,6 +250,11 @@ def configDb2(self, silentMode=False) -> None:
 
         # Do we need to configure Db2u?
         if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install" or self.getParam("db2_action_facilities") == "install":
+            self.printDescription([
+                "Db2 Universal Operator for v12 onwards requires to add a License activation key",
+                "If you don't have a license press enter to continue."
+            ])
+            self.db2LicenseFileLocal = self.promptForFile("Db2 License file", envVar="DB2_LICENSE_FILE", default="", mustExist=False)
             if self.showAdvancedOptions:
                 self.printH2("Installation Namespace")
                 self.promptForString("Install namespace", "db2_namespace", default="db2u")