Merge branch 'stable' into update-250206

Author: anilprajapatiibm

.gitignore

@@ -8,6 +8,7 @@ dist
 *.egg-info
 pandoc-*-amd64.deb
 pandoc-*-windows-x86_64.msi
+pandoc-*-x86_64-macOS.pkg
 README.rst
 
 # Environments
@@ -16,4 +17,4 @@ venv/
 
 # Other
 kubectl.exe
-/build
+/build

CONTRIBUTING.md

@@ -38,3 +38,15 @@ Manually run the pre-commit hooks against all files
 ```bash
 pre-commit run -a
 ```
+
+Building locally
+-------------------------------------------------------------------------------
+Clone the python-devops repository locally. From the top level directory, run
+```
+make install build
+```
+
+NOTE: if building on MacOS you will need to first install pandoc:
+```
+brew install pandoc
+```

setup.py

@@ -55,12 +55,12 @@ def get_version(rel_path):
     description='Python for Maximo Application Suite Dev/Ops',
     long_description=long_description,
     install_requires=[
-        'pyyaml',         # MIT License
-        'openshift',      # Apache Software License
-        'kubernetes',     # Apache Software License
-        'kubeconfig',     # BSD License
-        'jinja2',         # BSD License
-        'jinja2-base64-filters'  # MIT License
+        'pyyaml',                  # MIT License
+        'openshift',               # Apache Software License
+        'kubernetes',              # Apache Software License
+        'kubeconfig',              # BSD License
+        'jinja2',                  # BSD License
+        'jinja2-base64-filters'    # MIT License
     ],
     extras_require={
         'dev': [

src/mas/devops/ocp.py

@@ -61,6 +61,22 @@ def connect(server: str, token: str, skipVerify: bool = False) -> bool:
     return True
 
 
+def getNamespace(dynClient: DynamicClient, namespace: str) -> dict:
+    """
+    Get a namespace
+    """
+    namespaceAPI = dynClient.resources.get(api_version="v1", kind="Namespace")
+
+    try:
+        ns = namespaceAPI.get(name=namespace)
+        logger.debug(f"Namespace {namespace} exists")
+        return ns
+    except NotFoundError:
+        logger.debug(f"Namespace {namespace} does not exist")
+
+    return {}
+
+
 def createNamespace(dynClient: DynamicClient, namespace: str) -> bool:
     """
     Create a namespace if it does not exist

src/mas/devops/sls.py

@@ -0,0 +1,46 @@
+# *****************************************************************************
+# Copyright (c) 2025 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+import logging
+from openshift.dynamic import DynamicClient
+from openshift.dynamic.exceptions import NotFoundError, ResourceNotFoundError, UnauthorizedError
+
+logger = logging.getLogger(__name__)
+
+
+def listSLSInstances(dynClient: DynamicClient) -> list:
+    """
+    Get a list of SLS instances on the cluster
+    """
+    try:
+        slsAPI = dynClient.resources.get(api_version="sls.ibm.com/v1", kind="LicenseService")
+        return slsAPI.get().to_dict()['items']
+    except NotFoundError:
+        logger.info("There are no SLS instances installed on this cluster")
+        return []
+    except ResourceNotFoundError:
+        logger.info("LicenseService CRD not found on cluster")
+        return []
+    except UnauthorizedError:
+        logger.error("Error: Unable to verify SLS instances due to failed authorization: {e}")
+        return []
+
+
+def findSLSByNamespace(namespace: str, instances: list = None, dynClient: DynamicClient = None):
+    if not instances and not dynClient:
+        return False
+
+    if not instances and dynClient:
+        instances = listSLSInstances(dynClient)
+
+    for instance in instances:
+        if namespace in instance['metadata']['namespace']:
+            return True
+    return False

src/mas/devops/tekton.py

@@ -148,7 +148,7 @@ def preparePipelinesNamespace(dynClient: DynamicClient, instanceId: str = None,
                 sleep(15)
 
 
-def prepareInstallSecrets(dynClient: DynamicClient, instanceId: str, slsLicenseFile: str, additionalConfigs: dict = None, certs: str = None, podTemplates: str = None) -> None:
+def prepareInstallSecrets(dynClient: DynamicClient, instanceId: str, slsLicenseFile: str = None, additionalConfigs: dict = None, certs: str = None, podTemplates: str = None) -> None:
     namespace = f"mas-{instanceId}-pipelines"
     secretsAPI = dynClient.resources.get(api_version="v1", kind="Secret")
 
@@ -178,10 +178,16 @@ def prepareInstallSecrets(dynClient: DynamicClient, instanceId: str, slsLicenseF
     except NotFoundError:
         pass
 
-    # TODO: Convert this to using secretsAPI.create()
-    result = kubectl.run(subcmd_args=['-n', namespace, 'create', 'secret', 'generic', 'pipeline-sls-entitlement', '--from-file', slsLicenseFile])
-    for line in result.split("\n"):
-        logger.debug(line)
+    if slsLicenseFile is None:
+        slsLicenseFile = {
+            "apiVersion": "v1",
+            "kind": "Secret",
+            "type": "Opaque",
+            "metadata": {
+                "name": "pipeline-sls-entitlement"
+            }
+        }
+    secretsAPI.create(body=slsLicenseFile, namespace=namespace)
 
     # 3. Secret/pipeline-certificates
     # -------------------------------------------------------------------------

src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -278,14 +278,22 @@ spec:
       value: "{{ cpd_install_openscale }}"
     - name: cpd_install_cognos
       value: "{{ cpd_install_cognos }}"
+    - name: cpd_install_ws
+      value: "{{ cpd_install_ws }}"
+    - name: cpd_install_wml
+      value: "{{ cpd_install_wml }}"
+    - name: cpd_install_ae
+      value: "{{ cpd_install_ae }}"
 {%- endif %}
 
     # Dependencies - SLS
     # -------------------------------------------------------------------------
     - name: sls_channel
       value: '3.x'
+{%- if sls_entitlement_file is defined and sls_entitlement_file != "" %}
     - name: sls_entitlement_file
       value: "{{ sls_entitlement_file }}"
+{%- endif %}
 {%- if sls_namespace is defined and sls_namespace != "" %}
     - name: sls_namespace
       value: "{{ sls_namespace }}"
@@ -298,6 +306,11 @@ spec:
     - name: sls_mongodb_cfg_file
       value: "{{ sls_mongodb_cfg_file }}"
 {%- endif %}
+{%- if sls_action is defined and sls_action != "" %}
+    - name: sls_action
+      value: "{{ sls_action }}"
+{%- endif %}
+
 
     # Dependencies - UDS/DRO (Required)
     # -------------------------------------------------------------------------