DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add suggested change

Browse source 
Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
This commit is contained in:
Ludovic Ortega 2024-04-20 11:04:33 +02:00
parent 84c3fb7d16
commit c7c3ddea12
No known key found for this signature in database
GPG key ID: 87471466EB186A4C
11 changed files with 48 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
charts/argo-cd/templates/argocd-application-controller/metrics.yaml
View file

@ -23,12 +23,11 @@ spec:
type: {{ .Values.controller.metrics.service.type }} type: {{ .Values.controller.metrics.service.type }}
{{- if and .Values.controller.metrics.service.clusterIP (eq .Values.controller.metrics.service.type "ClusterIP") }} {{- if and .Values.controller.metrics.service.clusterIP (eq .Values.controller.metrics.service.type "ClusterIP") }}
clusterIP: {{ .Values.controller.metrics.service.clusterIP }} clusterIP: {{ .Values.controller.metrics.service.clusterIP }}
{{- with .Values.controller.metrics.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.controller.metrics.service.ipFamilyPolicy }} {{- with .Values.controller.metrics.service.ipFamilies }}
ipFamilyPolicy: {{ .Values.controller.metrics.service.ipFamilyPolicy }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.controller.metrics.service.ipFamilies }}
ipFamilies: {{ .Values.controller.metrics.service.ipFamilies | toYaml | nindent 2 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.controller.metrics.service.portName }} - name: {{ .Values.controller.metrics.service.portName }}

9
charts/argo-cd/templates/argocd-applicationset/metrics.yaml
View file

@ -23,12 +23,11 @@ spec:
type: {{ .Values.applicationSet.metrics.service.type }} type: {{ .Values.applicationSet.metrics.service.type }}
{{- if and .Values.applicationSet.metrics.service.clusterIP (eq .Values.applicationSet.metrics.service.type "ClusterIP") }} {{- if and .Values.applicationSet.metrics.service.clusterIP (eq .Values.applicationSet.metrics.service.type "ClusterIP") }}
clusterIP: {{ .Values.applicationSet.metrics.service.clusterIP }} clusterIP: {{ .Values.applicationSet.metrics.service.clusterIP }}
{{- with .Values.applicationSet.metrics.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.applicationSet.metrics.service.ipFamilyPolicy }} {{- with .Values.applicationSet.metrics.service.ipFamilies }}
ipFamilyPolicy: {{ .Values.applicationSet.metrics.service.ipFamilyPolicy }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.applicationSet.metrics.service.ipFamilies }}
ipFamilies: {{ .Values.applicationSet.metrics.service.ipFamilies | toYaml | nindent 2 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.applicationSet.metrics.service.portName }} - name: {{ .Values.applicationSet.metrics.service.portName }}

8
charts/argo-cd/templates/argocd-applicationset/service.yaml
View file

@ -17,11 +17,11 @@ metadata:
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.applicationSet.service.type }} type: {{ .Values.applicationSet.service.type }}
{{- if .Values.applicationSet.service.ipFamilyPolicy }} {{- with .Values.applicationSet.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.applicationSet.service.ipFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.applicationSet.service.ipFamilies }} {{- with .Values.applicationSet.service.ipFamilies }}
ipFamilies: {{ .Values.applicationSet.service.ipFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.applicationSet.service.portName }} - name: {{ .Values.applicationSet.service.portName }}

8
charts/argo-cd/templates/argocd-notifications/metrics.yaml
View file

@ -24,11 +24,11 @@ spec:
{{- if and .Values.notifications.metrics.service.clusterIP (eq .Values.notifications.metrics.service.type "ClusterIP") }} {{- if and .Values.notifications.metrics.service.clusterIP (eq .Values.notifications.metrics.service.type "ClusterIP") }}
clusterIP: {{ .Values.notifications.metrics.service.clusterIP }} clusterIP: {{ .Values.notifications.metrics.service.clusterIP }}
{{- end }} {{- end }}
{{- if .Values.notifications.metrics.service.ipFamilyPolicy }} {{- with .Values.notifications.metrics.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.notifications.metrics.service.ipFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.notifications.metrics.service.ipFamilies }} {{- with .Values.notifications.metrics.service.ipFamilies }}
ipFamilies: {{ .Values.notifications.metrics.service.ipFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
selector: selector:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }}

8
charts/argo-cd/templates/argocd-repo-server/metrics.yaml
View file

@ -24,11 +24,11 @@ spec:
{{- if and .Values.repoServer.metrics.service.clusterIP (eq .Values.repoServer.metrics.service.type "ClusterIP") }} {{- if and .Values.repoServer.metrics.service.clusterIP (eq .Values.repoServer.metrics.service.type "ClusterIP") }}
clusterIP: {{ .Values.repoServer.metrics.service.clusterIP }} clusterIP: {{ .Values.repoServer.metrics.service.clusterIP }}
{{- end }} {{- end }}
{{- if .Values.repoServer.metrics.service.ipFamilyPolicy }} {{- with .Values.repoServer.metrics.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.repoServer.metrics.service.ipFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.repoServer.metrics.service.ipFamilies }} {{- with .Values.repoServer.metrics.service.ipFamilies }}
ipFamilies: {{ .Values.repoServer.metrics.service.ipFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.repoServer.metrics.service.portName }} - name: {{ .Values.repoServer.metrics.service.portName }}

8
charts/argo-cd/templates/argocd-repo-server/service.yaml
View file

@ -15,11 +15,11 @@ metadata:
name: {{ template "argo-cd.repoServer.fullname" . }} name: {{ template "argo-cd.repoServer.fullname" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
spec: spec:
{{- if .Values.repoServer.service.ipFamilyPolicy }} {{- with .Values.repoServer.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.repoServer.service.ipFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.repoServer.service.ipFamilies }} {{- with .Values.repoServer.service.ipFamilies }}
ipFamilies: {{ .Values.repoServer.service.ipFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.repoServer.service.portName }} - name: {{ .Values.repoServer.service.portName }}

12
charts/argo-cd/templates/argocd-server/aws/service.yaml
View file

@ -9,12 +9,12 @@ metadata:
name: {{ template "argo-cd.server.fullname" . }}-grpc name: {{ template "argo-cd.server.fullname" . }}-grpc
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
spec: spec:
{{- if .Values.server.service.ipFamilyPolicy }} {{- with .Values.server.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.server.service.ipFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.server.service.ipFamilies }} {{- with .Values.server.service.ipFamilies }}
ipFamilies: {{ .Values.server.service.ipFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.server.service.servicePortHttpName }} - name: {{ .Values.server.service.servicePortHttpName }}
protocol: TCP protocol: TCP

8
charts/argo-cd/templates/argocd-server/metrics.yaml
View file

@ -24,11 +24,11 @@ spec:
{{- if and .Values.server.metrics.service.clusterIP (eq .Values.server.metrics.service.type "ClusterIP") }} {{- if and .Values.server.metrics.service.clusterIP (eq .Values.server.metrics.service.type "ClusterIP") }}
clusterIP: {{ .Values.server.metrics.service.clusterIP }} clusterIP: {{ .Values.server.metrics.service.clusterIP }}
{{- end }} {{- end }}
{{- if .Values.server.metrics.service.ipFamilyPolicy }} {{- with .Values.server.metrics.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.server.metrics.service.ipFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.server.metrics.service.ipFamilies }} {{- with .Values.server.metrics.service.ipFamilies }}
ipFamilies: {{ .Values.server.metrics.service.ipFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.server.metrics.service.portName }} - name: {{ .Values.server.metrics.service.portName }}

12
charts/argo-cd/templates/argocd-server/service.yaml
View file

@ -16,12 +16,12 @@ metadata:
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.server.service.type }} type: {{ .Values.server.service.type }}
{{- if .Values.server.service.ipFamilyPolicy }} {{- with .Values.server.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.server.service.ipFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.server.service.ipFamilies }} {{- with .Values.server.service.ipFamilies }}
ipFamilies: {{ .Values.server.service.ipFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.server.service.servicePortHttpName }} - name: {{ .Values.server.service.servicePortHttpName }}
protocol: TCP protocol: TCP

8
charts/argo-cd/templates/dex/service.yaml
View file

@ -16,11 +16,11 @@ metadata:
{{- toYaml .Values.dex.metrics.service.labels | nindent 4 }} {{- toYaml .Values.dex.metrics.service.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.dex.serviceIpFamilyPolicy }} {{- with .Values.dex.serviceIpFamilyPolicy }}
ipFamilyPolicy: {{ .Values.dex.serviceIpFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.dex.serviceIpFamilies }} {{- with .Values.dex.serviceIpFamilies }}
ipFamilies: {{ .Values.dex.serviceIpFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: {{ .Values.dex.servicePortHttpName }} - name: {{ .Values.dex.servicePortHttpName }}

8
charts/argo-cd/templates/redis/service.yaml
View file

@ -17,11 +17,11 @@ metadata:
{{- end }} {{- end }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.redis.serviceIpFamilyPolicy }} {{- with .Values.redis.serviceIpFamilyPolicy }}
ipFamilyPolicy: {{ .Values.redis.serviceIpFamilyPolicy }} ipFamilyPolicy: {{ . }}
{{- end }} {{- end }}
{{- if .Values.redis.serviceIpFamilies }} {{- with .Values.redis.serviceIpFamilies }}
ipFamilies: {{ .Values.redis.serviceIpFamilies | toYaml | nindent 2 }} ipFamilies: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: redis - name: redis