From 530741830847c19a9fa4ba2c2cd3a2e38105c73a Mon Sep 17 00:00:00 2001
From: Luis Antonio Obis Aparicio <luis.antonio.obis@gmail.com>
Date: Thu, 6 Feb 2025 08:47:34 +0100
Subject: [PATCH 1/2] all: rename entities with naming conflict in single
 application pattern #226

---
 .../rucio-daemons/templates/automatic-restart-account.yaml  | 6 +++---
 .../rucio-daemons/templates/automatic-restart-cronjob.yaml  | 4 ++--
 .../rucio-server/templates/automatic-restart-account.yaml   | 6 +++---
 .../rucio-server/templates/automatic-restart-cronjob.yaml   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/rucio-daemons/templates/automatic-restart-account.yaml b/charts/rucio-daemons/templates/automatic-restart-account.yaml
index 144cc5ab..f97b52c3 100644
--- a/charts/rucio-daemons/templates/automatic-restart-account.yaml
+++ b/charts/rucio-daemons/templates/automatic-restart-account.yaml
@@ -2,16 +2,16 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Release.Name }}-rucio-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Release.Name }}-rucio-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
   namespace: {{ .Release.Namespace }}
 subjects:
 - kind: ServiceAccount
-  name: {{ .Release.Name }}-rucio-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
   namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
diff --git a/charts/rucio-daemons/templates/automatic-restart-cronjob.yaml b/charts/rucio-daemons/templates/automatic-restart-cronjob.yaml
index 391f9843..ab564f73 100644
--- a/charts/rucio-daemons/templates/automatic-restart-cronjob.yaml
+++ b/charts/rucio-daemons/templates/automatic-restart-cronjob.yaml
@@ -2,14 +2,14 @@
 apiVersion: {{ template "rucio.kubeApiVersion.cronjob" . }}
 kind: CronJob
 metadata:
-  name: {{ .Release.Name }}-automatic-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-automatic-restart
 spec:
   schedule: "{{ .Values.automaticRestart.schedule }}"
   jobTemplate:
     spec:
       template:
         spec:
-          serviceAccountName: {{ .Release.Name }}-rucio-restart
+          serviceAccountName: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
           containers:
             - name: restart-pods
               image: "{{ .Values.automaticRestart.image.repository }}:{{ .Values.automaticRestart.image.tag }}"
diff --git a/charts/rucio-server/templates/automatic-restart-account.yaml b/charts/rucio-server/templates/automatic-restart-account.yaml
index 144cc5ab..f97b52c3 100644
--- a/charts/rucio-server/templates/automatic-restart-account.yaml
+++ b/charts/rucio-server/templates/automatic-restart-account.yaml
@@ -2,16 +2,16 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Release.Name }}-rucio-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Release.Name }}-rucio-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
   namespace: {{ .Release.Namespace }}
 subjects:
 - kind: ServiceAccount
-  name: {{ .Release.Name }}-rucio-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
   namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
diff --git a/charts/rucio-server/templates/automatic-restart-cronjob.yaml b/charts/rucio-server/templates/automatic-restart-cronjob.yaml
index 391f9843..ab564f73 100644
--- a/charts/rucio-server/templates/automatic-restart-cronjob.yaml
+++ b/charts/rucio-server/templates/automatic-restart-cronjob.yaml
@@ -2,14 +2,14 @@
 apiVersion: {{ template "rucio.kubeApiVersion.cronjob" . }}
 kind: CronJob
 metadata:
-  name: {{ .Release.Name }}-automatic-restart
+  name: {{ .Release.Name }}-{{ template "rucio.name" . }}-automatic-restart
 spec:
   schedule: "{{ .Values.automaticRestart.schedule }}"
   jobTemplate:
     spec:
       template:
         spec:
-          serviceAccountName: {{ .Release.Name }}-rucio-restart
+          serviceAccountName: {{ .Release.Name }}-{{ template "rucio.name" . }}-rucio-restart
           containers:
             - name: restart-pods
               image: "{{ .Values.automaticRestart.image.repository }}:{{ .Values.automaticRestart.image.tag }}"

From 0c81e937ecc1acee1cf2b4198e63de1bc789f5cb Mon Sep 17 00:00:00 2001
From: Luis Antonio Obis Aparicio <luis.antonio.obis@gmail.com>
Date: Thu, 6 Feb 2025 08:54:12 +0100
Subject: [PATCH 2/2] bump daemons and server version to 36.0.1

---
 charts/rucio-daemons/Chart.yaml | 2 +-
 charts/rucio-server/Chart.yaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/rucio-daemons/Chart.yaml b/charts/rucio-daemons/Chart.yaml
index 2f6bc551..e7c04231 100644
--- a/charts/rucio-daemons/Chart.yaml
+++ b/charts/rucio-daemons/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-daemons
-version: 36.0.0
+version: 36.0.1
 apiVersion: v1
 description: A Helm chart to deploy daemons for Rucio
 keywords:
diff --git a/charts/rucio-server/Chart.yaml b/charts/rucio-server/Chart.yaml
index bb29f082..a34e7dc7 100644
--- a/charts/rucio-server/Chart.yaml
+++ b/charts/rucio-server/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-server
-version: 36.0.0
+version: 36.0.1
 apiVersion: v1
 description: A Helm chart to deploy servers for Rucio
 keywords: