Merge branch 'main' into main

Signed-off-by: Aikawa <yu.croco@gmail.com>
This commit is contained in:
Aikawa 2024-06-26 19:29:00 +09:00 committed by GitHub
commit d07a2361a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 13 additions and 7 deletions

View file

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
appVersion: v1.7.0 appVersion: v1.7.1
description: A Helm chart for Argo Rollouts description: A Helm chart for Argo Rollouts
name: argo-rollouts name: argo-rollouts
version: 2.36.3 version: 2.37.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
keywords: keywords:

View file

@ -80,8 +80,12 @@ spec:
{{- toYaml .Values.containerSecurityContext | nindent 10 }} {{- toYaml .Values.containerSecurityContext | nindent 10 }}
resources: resources:
{{- toYaml .Values.controller.resources | nindent 10 }} {{- toYaml .Values.controller.resources | nindent 10 }}
{{- with .Values.controller.volumeMounts }}
volumeMounts: volumeMounts:
- name: plugin-bin
mountPath: /home/argo-rollouts/plugin-bin
- name: tmp
mountPath: /tmp
{{- with .Values.controller.volumeMounts }}
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.controller.extraContainers }} {{- with .Values.controller.extraContainers }}
@ -120,7 +124,11 @@ spec:
{{- with .Values.controller.priorityClassName }} {{- with .Values.controller.priorityClassName }}
priorityClassName: {{ . }} priorityClassName: {{ . }}
{{- end }} {{- end }}
{{- with .Values.controller.volumes }}
volumes: volumes:
- name: plugin-bin
emptyDir: {}
- name: tmp
emptyDir: {}
{{- with .Values.controller.volumes }}
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}

View file

@ -189,7 +189,6 @@ spec:
datadog: datadog:
properties: properties:
aggregator: aggregator:
default: last
enum: enum:
- avg - avg
- min - min

View file

@ -185,7 +185,6 @@ spec:
datadog: datadog:
properties: properties:
aggregator: aggregator:
default: last
enum: enum:
- avg - avg
- min - min

View file

@ -185,7 +185,6 @@ spec:
datadog: datadog:
properties: properties:
aggregator: aggregator:
default: last
enum: enum:
- avg - avg
- min - min

View file

@ -120,6 +120,7 @@ controller:
# limits: # limits:
# cpu: 100m # cpu: 100m
# memory: 128Mi # memory: 128Mi
# ephemeral-storage: 1Gi
# requests: # requests:
# cpu: 50m # cpu: 50m
# memory: 64Mi # memory: 64Mi