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

Merge branch 'main' into add-support-k8s-version-to-argowf

Browse source
This commit is contained in:
yu-croco 2023-07-22 22:34:58 +09:00
commit 0372742009
11 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-cd/Chart.yaml
View file

@ -1,9 +1,9 @@
apiVersion: v2
appVersion: v2.7.7
appVersion: v2.7.8
kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 5.40.0
version: 5.41.1
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
@ -27,4 +27,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Allow configurable metrics in server and repoServer HPAs
description: Update to app version 2.7.8

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

@ -1,4 +1,4 @@
{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:

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

@ -1,5 +1,5 @@
{{- if .Values.applicationSet.enabled }}
{{- if and .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.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
metadata:

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

@ -1,4 +1,4 @@
{{- if and .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:

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

@ -1,4 +1,4 @@
{{- if and .Values.repoServer.metrics.enabled .Values.repoServer.metrics.serviceMonitor.enabled }}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.repoServer.metrics.enabled .Values.repoServer.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:

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

@ -1,4 +1,4 @@
{{- if and .Values.server.metrics.enabled .Values.server.metrics.serviceMonitor.enabled }}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.server.metrics.enabled .Values.server.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:

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

@ -1,4 +1,4 @@
{{- if and .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:

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

@ -1,5 +1,5 @@
{{- $redisHa := (index .Values "redis-ha") -}}
{{- if and .Values.redis.enabled (not $redisHa.enabled) .Values.redis.metrics.enabled .Values.redis.metrics.serviceMonitor.enabled -}}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.redis.enabled (not $redisHa.enabled) .Values.redis.metrics.enabled .Values.redis.metrics.serviceMonitor.enabled -}}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:

8
charts/argo-rollouts/Chart.yaml
View file

@ -1,8 +1,8 @@
apiVersion: v2
appVersion: v1.5.0
appVersion: v1.5.1
description: A Helm chart for Argo Rollouts
name: argo-rollouts
version: 2.31.0
version: 2.31.1
home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
keywords:
@ -18,5 +18,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: added
description: Support Traffic Router Plugins
- kind: changed
description: Update to app version 1.5.1

3
charts/argo-rollouts/templates/crds/rollout-crd.yaml
View file

@ -3328,7 +3328,6 @@ spec:
type: string
required:
- arn
- fullName
- name
type: object
loadBalancer:
@ -3341,7 +3340,6 @@ spec:
type: string
required:
- arn
- fullName
- name
type: object
stableTargetGroup:
@ -3354,7 +3352,6 @@ spec:
type: string
required:
- arn
- fullName
- name
type: object
type: object

4
charts/argo-workflows/Chart.yaml
View file

@ -1,10 +1,10 @@
apiVersion: v2
appVersion: v3.4.8
kubeVersion: ">=1.23.0-0"
appVersion: v3.4.9
name: argo-workflows
description: A Helm chart for Argo Workflows
type: application
version: 0.32.0
version: 0.33.0
icon: https://argoproj.github.io/argo-workflows/assets/logo.png
home: https://github.com/argoproj/argo-helm
sources: