From 1dc9281a302443358a30c24e9c4367a78b6e2d97 Mon Sep 17 00:00:00 2001
From: Tom Klapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 5 May 2026 14:17:43 +0100
Subject: [PATCH 1/2] [patch] Ensure uniqueness of aws-db2-user-job role and
 rolebinding resource names

Fixes issue seen when an instance has more than one DB2-DB application attempting to render a role and role binding with the same name in the same namespace, causing ArgoCD SharedResourceWarnings.
---
 .../templates/08-postdelete-db2-user-job-rbac.yaml          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml b/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml
index 011769881..6b022708f 100644
--- a/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml
@@ -16,7 +16,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: aws-db2-user-job-{{ .Values.instance_id }}-role-db2
+  name: aws-db2-user-job-{{ .Values.instance_id }}-{{ .Values.mas_application_id }}-role-db2
   namespace: {{ .Values.db2_namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "121"
@@ -56,7 +56,7 @@ rules:
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: aws-db2-user-job-{{ .Values.instance_id }}-rolebinding-db2
+  name: aws-db2-user-job-{{ .Values.instance_id }}-{{ .Values.mas_application_id }}-rolebinding-db2
   namespace: {{ .Values.db2_namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "122"
@@ -71,6 +71,6 @@ subjects:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: aws-db2-user-job-{{ .Values.instance_id }}-role-db2
+  name: aws-db2-user-job-{{ .Values.instance_id }}-{{ .Values.mas_application_id }}-role-db2
 {{- end }}
 

From b46f8b664ead122b3db2caab49e1d025c79d381b Mon Sep 17 00:00:00 2001
From: Tom Klapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 5 May 2026 14:18:43 +0100
Subject: [PATCH 2/2] sync to mas-gitops

---
 .../templates/08-postdelete-db2-user-job-rbac.yaml               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml b/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml
index 6b022708f..ba8d72ce6 100644
--- a/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/08-postdelete-db2-user-job-rbac.yaml
@@ -73,4 +73,3 @@ roleRef:
   kind: Role
   name: aws-db2-user-job-{{ .Values.instance_id }}-{{ .Values.mas_application_id }}-role-db2
 {{- end }}
-