Skip to content

Commit 34401ac

Browse files
Merge branch 'monthlyupdate' into ocp422
2 parents 48e7408 + 6d4d085 commit 34401ac

2 files changed

Lines changed: 22 additions & 19 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@ Example of initial_users secret:
8989
```json
9090
{"john.smith1@example.com":"primary,john1,smith1","john.smith2@example.com":"primary,john2,smith2","john.smith3@example.com":"secondary,john3,smith3"}
9191
```
92+

src/mas/devops/tekton.py

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -983,16 +983,33 @@ def prepareUpdateSecrets(
983983
namespaceAPI = dynClient.resources.get(api_version="v1", kind="Namespace")
984984
namespaceAPI.get(name=namespace)
985985
except NotFoundError:
986-
logger.warning(f"Namespace {namespace} does not exist, skipping slack secret creation")
986+
logger.warning(f"Namespace {namespace} does not exist, skipping secret creation")
987987
return
988988

989-
# Only create secret if both slack_token and slack_channel are provided
989+
secretsAPI = dynClient.resources.get(api_version="v1", kind="Secret")
990+
991+
# Always create pipeline-db2-license secret — required by the PipelineRun workspace
992+
# binding regardless of whether a license file was provided or Slack is configured
993+
try:
994+
secretsAPI.delete(name="pipeline-db2-license", namespace=namespace)
995+
except NotFoundError:
996+
pass
997+
998+
if db2LicenseFile is None:
999+
db2LicenseFile = {
1000+
"apiVersion": "v1",
1001+
"kind": "Secret",
1002+
"type": "Opaque",
1003+
"metadata": {"name": "pipeline-db2-license"},
1004+
}
1005+
secretsAPI.create(body=db2LicenseFile, namespace=namespace)
1006+
logger.info(f"Created pipeline-db2-license secret in namespace {namespace}")
1007+
1008+
# Only create mas-devops-slack secret if both slack_token and slack_channel are provided
9901009
if not slack_token or not slack_channel:
9911010
logger.debug("Slack token or channel not provided, skipping slack secret creation")
9921011
return
9931012

994-
secretsAPI = dynClient.resources.get(api_version="v1", kind="Secret")
995-
9961013
# Delete existing secret if it exists
9971014
try:
9981015
secretsAPI.delete(name="mas-devops-slack", namespace=namespace)
@@ -1019,21 +1036,6 @@ def prepareUpdateSecrets(
10191036
secretsAPI.create(body=mas_devops_secret, namespace=namespace)
10201037
logger.info(f"Created mas-devops-slack secret in namespace {namespace}")
10211038

1022-
try:
1023-
secretsAPI.delete(name="pipeline-db2-license", namespace=namespace)
1024-
except NotFoundError:
1025-
pass
1026-
1027-
if db2LicenseFile is None:
1028-
db2LicenseFile = {
1029-
"apiVersion": "v1",
1030-
"kind": "Secret",
1031-
"type": "Opaque",
1032-
"metadata": {"name": "pipeline-db2-license"},
1033-
}
1034-
secretsAPI.create(body=db2LicenseFile, namespace=namespace)
1035-
logger.info(f"Created pipeline-db2-license secret in namespace {namespace}")
1036-
10371039

10381040
def testCLI() -> None:
10391041
pass

0 commit comments

Comments
 (0)