Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
cat ${GITHUB_WORKSPACE}/src/mas/devops/__init__.py
python -m pip install --upgrade pip
pip install .[dev]
python -m pytest
python -m pytest -m "not openshift"

- name: Lint with flake8
run: |
Expand Down
40 changes: 21 additions & 19 deletions src/mas/devops/tekton.py
Original file line number Diff line number Diff line change
Expand Up @@ -983,16 +983,33 @@ def prepareUpdateSecrets(
namespaceAPI = dynClient.resources.get(api_version="v1", kind="Namespace")
namespaceAPI.get(name=namespace)
except NotFoundError:
logger.warning(f"Namespace {namespace} does not exist, skipping slack secret creation")
logger.warning(f"Namespace {namespace} does not exist, skipping secret creation")
return

# Only create secret if both slack_token and slack_channel are provided
secretsAPI = dynClient.resources.get(api_version="v1", kind="Secret")

# Always create pipeline-db2-license secret — required by the PipelineRun workspace
# binding regardless of whether a license file was provided or Slack is configured
try:
secretsAPI.delete(name="pipeline-db2-license", namespace=namespace)
except NotFoundError:
pass

if db2LicenseFile is None:
db2LicenseFile = {
"apiVersion": "v1",
"kind": "Secret",
"type": "Opaque",
"metadata": {"name": "pipeline-db2-license"},
}
secretsAPI.create(body=db2LicenseFile, namespace=namespace)
logger.info(f"Created pipeline-db2-license secret in namespace {namespace}")

# Only create mas-devops-slack secret if both slack_token and slack_channel are provided
if not slack_token or not slack_channel:
logger.debug("Slack token or channel not provided, skipping slack secret creation")
return

secretsAPI = dynClient.resources.get(api_version="v1", kind="Secret")

# Delete existing secret if it exists
try:
secretsAPI.delete(name="mas-devops-slack", namespace=namespace)
Expand All @@ -1019,21 +1036,6 @@ def prepareUpdateSecrets(
secretsAPI.create(body=mas_devops_secret, namespace=namespace)
logger.info(f"Created mas-devops-slack secret in namespace {namespace}")

try:
secretsAPI.delete(name="pipeline-db2-license", namespace=namespace)
except NotFoundError:
pass

if db2LicenseFile is None:
db2LicenseFile = {
"apiVersion": "v1",
"kind": "Secret",
"type": "Opaque",
"metadata": {"name": "pipeline-db2-license"},
}
secretsAPI.create(body=db2LicenseFile, namespace=namespace)
logger.info(f"Created pipeline-db2-license secret in namespace {namespace}")


def testCLI() -> None:
pass
Expand Down
Loading