[major] Use DynamicClient to install Tekton Resources

Author: durera

.flake8

@@ -1,5 +1,5 @@
 [flake8]
 # These rules are ignored
 # - E501 line too long
-ignore = E501
+extend-ignore = E501 D
 max-line-length = 120

.gitignore

@@ -17,3 +17,5 @@ kubectl.exe
 /build
 /.vscode
 /site
+/.bob/.bob-errors
+/.bob/notes

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 default_language_version:
     python: python
 repos:
-  - repo: https://github.com/hhatto/autopep8
-    rev: v2.3.2
+  - repo: https://github.com/psf/black
+    rev: 26.5.1
     hooks:
-    -   id: autopep8
+      - id: black
   - repo: https://github.com/PyCQA/flake8
     rev: 7.3.0
     hooks:

README.md

@@ -1,6 +1,6 @@
 mas.devops
 ===============================================================================
-[![Code style: PEP8](https://img.shields.io/badge/code%20style-PEP--8-blue.svg)](https://peps.python.org/pep-0008/)
+[![Code Style: Black](https://img.shields.io/badge/Code%20Style-Black-000000.svg)](https://github.com/psf/black)
 [![Flake8: checked](https://img.shields.io/badge/flake8-checked-blueviolet)](https://flake8.pycqa.org/en/latest/)
 ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/ibm-mas/python-devops/python-release.yml)
 [![PyPI - Version](https://img.shields.io/pypi/v/mas.devops)](https://pypi.org/project/mas-devops)
@@ -31,7 +31,7 @@ installOpenShiftPipelines(dynamicClient)
 
 # Create the pipelines namespace and install the MAS tekton definitions
 createNamespace(dynamicClient, pipelinesNamespace)
-updateTektonDefinitions(pipelinesNamespace, "/mascli/templates/ibm-mas-tekton.yaml")
+updateTektonDefinitions(dynamicClient, pipelinesNamespace, "/mascli/templates/ibm-mas-tekton.yaml")
 
 # Launch the upgrade pipeline and print the URL to view the pipeline run
 pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId)
@@ -73,7 +73,7 @@ mas-devops-create-initial-users-for-saas \
     --manage-api-port 8443 \
     --coreapi-port 8444 \
     --admin-dashboard-port 8445
-    
+
 
 mas-devops-create-initial-users-for-saas \
     --mas-instance-id tgk01 \

docs/getting-started/quickstart.md

@@ -56,7 +56,7 @@ print("OpenShift Pipelines installed successfully")
 pipelinesNamespace = "mas-myinstance-pipelines"
 tektonYamlPath = "/path/to/ibm-mas-tekton.yaml"
 
-updateTektonDefinitions(pipelinesNamespace, tektonYamlPath)
+updateTektonDefinitions(dynClient, pipelinesNamespace, tektonYamlPath)
 print("Tekton definitions updated successfully")
 ```
 
@@ -96,7 +96,7 @@ createNamespace(dynClient, pipelinesNamespace)
 
 # Update Tekton definitions
 print("Updating Tekton definitions...")
-updateTektonDefinitions(pipelinesNamespace, tektonYamlPath)
+updateTektonDefinitions(dynClient, pipelinesNamespace, tektonYamlPath)
 
 # Launch upgrade pipeline
 print("Launching upgrade pipeline...")

docs/index.md

@@ -45,7 +45,7 @@ installOpenShiftPipelines(dynamicClient)
 
 # Create the pipelines namespace and install the MAS tekton definitions
 createNamespace(dynamicClient, pipelinesNamespace)
-updateTektonDefinitions(pipelinesNamespace, "/mascli/templates/ibm-mas-tekton.yaml")
+updateTektonDefinitions(dynamicClient, pipelinesNamespace, "/mascli/templates/ibm-mas-tekton.yaml")
 
 # Launch the upgrade pipeline and print the URL to view the pipeline run
 pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId)

src/mas/devops/aiservice.py

@@ -10,7 +10,11 @@
 
 import logging
 from openshift.dynamic import DynamicClient
-from openshift.dynamic.exceptions import NotFoundError, ResourceNotFoundError, UnauthorizedError
+from openshift.dynamic.exceptions import (
+    NotFoundError,
+    ResourceNotFoundError,
+    UnauthorizedError,
+)
 
 from .ocp import listInstances
 from .olm import getSubscription
@@ -53,7 +57,9 @@ def verifyAiServiceInstance(dynClient: DynamicClient, instanceId: str) -> bool:
               or authorization fails.
     """
     try:
-        aiserviceAPI = dynClient.resources.get(api_version="aiservice.ibm.com/v1", kind="AIServiceApp")
+        aiserviceAPI = dynClient.resources.get(
+            api_version="aiservice.ibm.com/v1", kind="AIServiceApp"
+        )
         aiserviceAPI.get(name=instanceId, namespace=f"aiservice-{instanceId}")
         return True
     except NotFoundError:
@@ -64,7 +70,9 @@ def verifyAiServiceInstance(dynClient: DynamicClient, instanceId: str) -> bool:
         print("RESOURCE NOT FOUND")
         return False
     except UnauthorizedError as e:
-        logger.error(f"Error: Unable to verify AI Service instance due to failed authorization: {e}")
+        logger.error(
+            f"Error: Unable to verify AI Service instance due to failed authorization: {e}"
+        )
         return False
 
 
@@ -85,7 +93,9 @@ def listAiServiceTenantInstances(dynClient: DynamicClient) -> list:
     return listInstances(dynClient, "aiservice.ibm.com/v1", "AIServiceTenant")
 
 
-def verifyAiServiceTenantInstance(dynClient: DynamicClient, instanceId: str, tenantId: str) -> bool:
+def verifyAiServiceTenantInstance(
+    dynClient: DynamicClient, instanceId: str, tenantId: str
+) -> bool:
     """
     Verify that a specific AI Service Tenant exists in the cluster.
 
@@ -104,8 +114,13 @@ def verifyAiServiceTenantInstance(dynClient: DynamicClient, instanceId: str, ten
               or authorization fails.
     """
     try:
-        aiserviceTenantAPI = dynClient.resources.get(api_version="aiservice.ibm.com/v1", kind="AIServiceTenant")
-        aiserviceTenantAPI.get(name=f"aiservice-{instanceId}-{tenantId}", namespace=f"aiservice-{instanceId}")
+        aiserviceTenantAPI = dynClient.resources.get(
+            api_version="aiservice.ibm.com/v1", kind="AIServiceTenant"
+        )
+        aiserviceTenantAPI.get(
+            name=f"aiservice-{instanceId}-{tenantId}",
+            namespace=f"aiservice-{instanceId}",
+        )
         return True
     except NotFoundError:
         print("NOT FOUND")
@@ -115,7 +130,9 @@ def verifyAiServiceTenantInstance(dynClient: DynamicClient, instanceId: str, ten
         print("RESOURCE NOT FOUND")
         return False
     except UnauthorizedError as e:
-        logger.error(f"Error: Unable to verify AI Service Tenant due to failed authorization: {e}")
+        logger.error(
+            f"Error: Unable to verify AI Service Tenant due to failed authorization: {e}"
+        )
         return False
 
 
@@ -134,7 +151,9 @@ def getAiserviceChannel(dynClient: DynamicClient, instanceId: str) -> str | None
         str: The channel name (e.g., "v1.0", "stable") if the subscription exists,
              None if the subscription is not found.
     """
-    aiserviceSubscription = getSubscription(dynClient, f"aiservice-{instanceId}", "ibm-aiservice")
+    aiserviceSubscription = getSubscription(
+        dynClient, f"aiservice-{instanceId}", "ibm-aiservice"
+    )
     if aiserviceSubscription is None:
         return None
     else: