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

fix(argo-workflows): Fix Helm chart to correctly reference Kubernetes version in conditional check for HPA apiVersion (#2029)

Browse source 
* add a fix for argo workflows hpa

Signed-off-by: ryanpark0203 <108246291+ryanpark0203@users.noreply.github.com>

* add description for the fix

Signed-off-by: ryanpark0203 <108246291+ryanpark0203@users.noreply.github.com>

* update readme

Signed-off-by: ryanpark0203 <108246291+ryanpark0203@users.noreply.github.com>

* remove apiVersionOverrides from readme

Signed-off-by: ryanpark0203 <108246291+ryanpark0203@users.noreply.github.com>

* fix linting

Signed-off-by: ryanpark0203 <108246291+ryanpark0203@users.noreply.github.com>

---------

Signed-off-by: ryanpark0203 <108246291+ryanpark0203@users.noreply.github.com>
Co-authored-by: Aikawa <yu.croco@gmail.com>
Co-authored-by: Jason Meridth <jmeridth@gmail.com>
This commit is contained in:
ryanpark0203 2023-05-09 13:41:54 +10:00 committed by GitHub
parent 395abc5435
commit c8b47cf060
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ appVersion: v3.4.7
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.26.2 version: 0.26.3
icon: https://argoproj.github.io/argo-workflows/assets/logo.png icon: https://argoproj.github.io/argo-workflows/assets/logo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
sources: sources:
@ -14,4 +14,4 @@ maintainers:
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - kind: fixed
description: Use correct artifacthub kind and get latest chart version to artifacthub description: Fix Helm chart to correctly reference Kubernetes version in conditional check for HPA apiVersion

1
charts/argo-workflows/README.md
View file

@ -101,6 +101,7 @@ Fields to note:
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| apiVersionOverrides.autoscaling | string | `""` | String to override apiVersion of autoscaling rendered by this helm chart |
| crds.annotations | object | `{}` | Annotations to be added to all CRDs | | crds.annotations | object | `{}` | Annotations to be added to all CRDs |
| crds.install | bool | `true` | Install and upgrade CRDs | | crds.install | bool | `true` | Install and upgrade CRDs |
| crds.keep | bool | `true` | Keep CRDs on chart uninstall | | crds.keep | bool | `true` | Keep CRDs on chart uninstall |

2
charts/argo-workflows/templates/_helpers.tpl
View file

@ -160,7 +160,7 @@ Return the appropriate apiVersion for autoscaling
{{- define "argo-workflows.apiVersion.autoscaling" -}} {{- define "argo-workflows.apiVersion.autoscaling" -}}
{{- if .Values.apiVersionOverrides.autoscaling -}} {{- if .Values.apiVersionOverrides.autoscaling -}}
{{- print .Values.apiVersionOverrides.autoscaling -}} {{- print .Values.apiVersionOverrides.autoscaling -}}
{{- else if semverCompare "<1.23-0" (include "argo-cd.kubeVersion" .) -}} {{- else if semverCompare "<1.23-0" (include "argo-workflows.kubeVersion" .) -}}
{{- print "autoscaling/v2beta1" -}} {{- print "autoscaling/v2beta1" -}}
{{- else -}} {{- else -}}
{{- print "autoscaling/v2" -}} {{- print "autoscaling/v2" -}}

2
charts/argo-workflows/templates/server/server-deployment-hpa.yaml
View file

@ -1,5 +1,5 @@
{{- if and .Values.server.enabled .Values.server.autoscaling.enabled }} {{- if and .Values.server.enabled .Values.server.autoscaling.enabled }}
apiVersion: autoscaling/v2beta1 apiVersion: {{ include "argo-workflows.apiVersion.autoscaling" . }}
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
name: {{ template "argo-workflows.server.fullname" . }} name: {{ template "argo-workflows.server.fullname" . }}

5
charts/argo-workflows/values.yaml
View file

@ -29,6 +29,11 @@ fullnameOverride:
# -- Override the Kubernetes version, which is used to evaluate certain manifests # -- Override the Kubernetes version, which is used to evaluate certain manifests
kubeVersionOverride: "" kubeVersionOverride: ""
# Override APIVersions
apiVersionOverrides:
# -- String to override apiVersion of autoscaling rendered by this helm chart
autoscaling: "" # autoscaling/v2
# -- Restrict Argo to operate only in a single namespace (the namespace of the # -- Restrict Argo to operate only in a single namespace (the namespace of the
# Helm release) by apply Roles and RoleBindings instead of the Cluster # Helm release) by apply Roles and RoleBindings instead of the Cluster
# equivalents, and start workflow-controller with the --namespaced flag. Use it # equivalents, and start workflow-controller with the --namespaced flag. Use it