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

fix(argo-cd): Always create ApplicationSet as following upstream (#2688)

Browse source
This commit is contained in:
yuki.kitakata 2024-05-13 13:31:48 +09:00 • committed by GitHub
parent 3693ed4270
commit 510261328f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 14 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/templates/argocd-applicationset/deployment.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: apps/v1
kind: Deployment
metadata:
@ -332,4 +331,3 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
dnsPolicy: {{ .Values.applicationSet.dnsPolicy }}
{{- end }}

2
charts/argo-cd/templates/argocd-applicationset/ingress.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.ingress.enabled -}}
{{- if .Values.applicationSet.ingress.enabled -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:

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

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.metrics.enabled }}
{{- if .Values.applicationSet.metrics.enabled }}
apiVersion: v1
kind: Service
metadata:

2
charts/argo-cd/templates/argocd-applicationset/networkpolicy.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.global.networkPolicy.create (or .Values.applicationSet.metrics.enabled .Values.applicationSet.ingress.enabled) }}
{{- if and .Values.global.networkPolicy.create (or .Values.applicationSet.metrics.enabled .Values.applicationSet.ingress.enabled) }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:

2
charts/argo-cd/templates/argocd-applicationset/pdb.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.pdb.enabled }}
{{- if .Values.applicationSet.pdb.enabled }}
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:

2
charts/argo-cd/templates/argocd-applicationset/role.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
@ -86,4 +85,3 @@ rules:
- patch
- update
- watch
{{- end }}

2
charts/argo-cd/templates/argocd-applicationset/rolebinding.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
@ -14,4 +13,3 @@ subjects:
- kind: ServiceAccount
name: {{ include "argo-cd.applicationSet.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}

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

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: v1
kind: Service
metadata:
@ -23,4 +22,3 @@ spec:
targetPort: webhook
selector:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 4 }}
{{- end }}

2
charts/argo-cd/templates/argocd-applicationset/serviceaccount.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.serviceAccount.create }}
{{- if .Values.applicationSet.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
automountServiceAccountToken: {{ .Values.applicationSet.serviceAccount.automountServiceAccountToken }}

2
charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
@ -49,4 +48,3 @@ spec:
matchLabels:
{{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.applicationSet.name "name" "metrics") | nindent 6 }}
{{- end }}
{{- end }}