Fix: Resolve conflicts for deployment in diferent namespaces (#5862)

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
This commit is contained in:
Andrei Kvapil
2024-08-05 20:11:07 +02:00
committed by GitHub
parent af85180a44
commit 38befb133d
5 changed files with 10 additions and 10 deletions

View File

@@ -14,6 +14,6 @@ spec:
commonName: "{{ template "seaweedfs.name" . }}-root-ca" commonName: "{{ template "seaweedfs.name" . }}-root-ca"
isCA: true isCA: true
issuerRef: issuerRef:
name: {{ template "seaweedfs.name" . }}-clusterissuer name: {{ template "seaweedfs.name" . }}-issuer
kind: ClusterIssuer kind: Issuer
{{- end }} {{- end }}

View File

@@ -1,8 +1,8 @@
{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}} {{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }} apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
kind: ClusterIssuer kind: Issuer
metadata: metadata:
name: {{ template "seaweedfs.name" . }}-clusterissuer name: {{ template "seaweedfs.name" . }}-issuer
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

View File

@@ -3,7 +3,7 @@
kind: ClusterRole kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: {{ template "seaweedfs.name" . }}-objectstorage-provisioner name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -52,7 +52,7 @@ rules:
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: {{ template "seaweedfs.name" . }}-objectstorage-provisioner name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -60,10 +60,10 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "seaweedfs.name" . }}-objectstorage-provisioner name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
name: {{ template "seaweedfs.name" . }}-objectstorage-provisioner name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
{{- end }} {{- end }}

View File

@@ -49,7 +49,7 @@ spec:
priorityClassName: {{ .Values.cosi.priorityClassName | quote }} priorityClassName: {{ .Values.cosi.priorityClassName | quote }}
{{- end }} {{- end }}
enableServiceLinks: false enableServiceLinks: false
serviceAccountName: {{ template "seaweedfs.name" . }}-objectstorage-provisioner serviceAccountName: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
{{- if .Values.cosi.initContainers }} {{- if .Values.cosi.initContainers }}
initContainers: initContainers:
{{ tpl .Values.cosi.initContainers . | nindent 8 | trim }} {{ tpl .Values.cosi.initContainers . | nindent 8 | trim }}

View File

@@ -2,7 +2,7 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ template "seaweedfs.name" . }}-objectstorage-provisioner name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}