Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename entities with naming conflict in single application pattern #227

Merged
merged 2 commits into from
Feb 7, 2025
Merged
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 charts/rucio-daemons/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions charts/rucio-daemons/templates/automatic-restart-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/rucio-daemons/templates/automatic-restart-cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion charts/rucio-server/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions charts/rucio-server/templates/automatic-restart-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/rucio-server/templates/automatic-restart-cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
Loading