feat(argocd-image-updater): Add ability to set .Values.namespaceOverride (#2562)
Signed-off-by: Braden Wright <braden.wright@waltlabs.io>
This commit is contained in:
parent
09679ae4d3
commit
fba54d4597
13 changed files with 24 additions and 13 deletions
|
|
@ -24,6 +24,13 @@ If release name contains chart name it will be used as a full name.
|
|||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Override .Release.Namespace
|
||||
*/}}
|
||||
{{- define "argocd-image-updater.namespace" -}}
|
||||
{{- default .Release.Namespace .Values.namespaceOverride }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Create chart name and version as used by the chart label.
|
||||
*/}}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ metadata:
|
|||
labels:
|
||||
{{- include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
name: argocd-image-updater-authscripts
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
data:
|
||||
{{- toYaml .Values.authScripts.scripts | nindent 2}}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
labels:
|
||||
{{- include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
name: argocd-image-updater-ssh-config
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
data:
|
||||
{{- with .Values.config.sshConfig }}
|
||||
{{- toYaml . | nindent 2 }}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ metadata:
|
|||
labels:
|
||||
{{- include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
name: argocd-image-updater-config
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
data:
|
||||
{{- with .Values.config.applicationsAPIKind }}
|
||||
applications_api: {{ . }}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "argocd-image-updater.fullname" . }}
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
labels:
|
||||
{{- include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
spec:
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ metadata:
|
|||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
name: {{ include "argocd-image-updater.fullname" . }}-metrics
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
spec:
|
||||
ports:
|
||||
- name: metrics
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
labels:
|
||||
{{ include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
name: {{ include "argocd-image-updater.fullname" . }}
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ''
|
||||
|
|
@ -39,6 +39,7 @@ metadata:
|
|||
labels:
|
||||
{{ include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
name: {{ include "argocd-image-updater.fullname" . }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: Role
|
||||
|
|
@ -46,5 +47,5 @@ roleRef:
|
|||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: {{ include "argocd-image-updater.serviceAccountName" . }}
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ apiVersion: v1
|
|||
kind: Secret
|
||||
metadata:
|
||||
name: argocd-image-updater-secret
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
labels:
|
||||
{{- include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
type: Opaque
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ apiVersion: v1
|
|||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ include "argocd-image-updater.serviceAccountName" . }}
|
||||
namespace: {{ .Release.Namespace | quote }}
|
||||
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
labels:
|
||||
{{- include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
{{- with .Values.serviceAccount.labels }}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
|
|||
kind: ServiceMonitor
|
||||
metadata:
|
||||
name: {{ include "argocd-image-updater.fullname" . }}-metrics
|
||||
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
|
||||
namespace: {{ default (include "argocd-image-updater.namespace" .) .Values.metrics.serviceMonitor.namespace | quote }}
|
||||
labels:
|
||||
{{- include "argocd-image-updater.labels" . | nindent 4 }}
|
||||
{{- with .Values.metrics.serviceMonitor.selector }}
|
||||
|
|
@ -29,7 +29,7 @@ spec:
|
|||
{{- end }}
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ .Release.Namespace }}
|
||||
- {{ include "argocd-image-updater.namespace" . | quote }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "argocd-image-updater.selectorLabels" . | nindent 6 }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue