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

chore: change var global.kubeCapabilities > kubeVersionOverride

Browse source 
Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Kilchhofer 2021-05-22 15:36:30 +02:00
parent 945e348dac
commit 4bf2b8db02
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
charts/argo-cd/README.md
View file

@ -36,13 +36,14 @@ Changes in the `CustomResourceDefinition` resources shall be fixed easily by cop
### 3.2.* ### 3.2.*
With this minor version we introduced the evaluation for the ingress manifest (depending on the capabilities version), See [Pull Request](https://github.com/argoproj/argo-helm/pull/637). [This Issues](https://github.com/argoproj/argo-helm/issues/703) reported that the capabilities evaluation is not handled correctly on clusters running a cluster version prior to `1.19` (which misses the `Ingress.networking.k8s.io`). With this minor version we introduced the evaluation for the ingress manifest (depending on the capabilities version), See [Pull Request](https://github.com/argoproj/argo-helm/pull/637).
[Issue 703](https://github.com/argoproj/argo-helm/issues/703) reported that the capabilities evaluation is **not handled correctly when deploying the chart via an ArgoCD instance**,
especially deploying on clusters running a cluster version prior to `1.19` (which misses `Ingress` on apiVersion `networking.k8s.io/v1`).
If you are running a cluster version prior to `1.19` you can avoid this issue by directly installing chart version `3.3.0` and setting `global.kubeCapabilities` like: If you are running a cluster version prior to `1.19` you can avoid this issue by directly installing chart version `3.3.0` and setting `kubeVersionOverride` like:
``` ```yaml
global: kubeVersionOverride: "1.18.0"
kubeCapabilities: "1.18.0"
``` ```
Then you should no longer encounter this issue. Then you should no longer encounter this issue.
@ -112,7 +113,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
| global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |
| global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |
| global.kubeCapabilities | Define Capabilities version for kubernetes, which is used to evaluate certain manifests | "" | | kubeVersionOverride | Override the Kubernetes version, which is used to evaluate certain manifests | `""` |
| nameOverride | Provide a name in place of `argocd` | `"argocd"` | | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
| installCRDs | Install CRDs if you are using Helm2. | `true` | | installCRDs | Install CRDs if you are using Helm2. | `true` |
| configs.clusterCredentials | Provide one or multiple [external cluster credentials](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#clusters) | `[]` (See [values.yaml](values.yaml)) | | configs.clusterCredentials | Provide one or multiple [external cluster credentials](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#clusters) | `[]` (See [values.yaml](values.yaml)) |

10
charts/argo-cd/templates/_helpers.tpl
View file

@ -144,9 +144,9 @@ app.kubernetes.io/component: {{ .component }}
Return the appropriate apiVersion for ingress Return the appropriate apiVersion for ingress
*/}} */}}
{{- define "argo-cd.ingress.apiVersion" -}} {{- define "argo-cd.ingress.apiVersion" -}}
{{- if semverCompare "<1.14-0" (include "argo-cd.capabilities" $) -}} {{- if semverCompare "<1.14-0" (include "argo-cd.kubeVersion" $) -}}
{{- print "extensions/v1beta1" -}} {{- print "extensions/v1beta1" -}}
{{- else if semverCompare "<1.19-0" (include "argo-cd.capabilities" $) -}} {{- else if semverCompare "<1.19-0" (include "argo-cd.kubeVersion" $) -}}
{{- print "networking.k8s.io/v1beta1" -}} {{- print "networking.k8s.io/v1beta1" -}}
{{- else -}} {{- else -}}
{{- print "networking.k8s.io/v1" -}} {{- print "networking.k8s.io/v1" -}}
@ -154,9 +154,9 @@ Return the appropriate apiVersion for ingress
{{- end -}} {{- end -}}
{{/* {{/*
Return the appropriate apiVersion for ingress Return the target Kubernetes version
*/}} */}}
{{- define "argo-cd.capabilities" -}} {{- define "argo-cd.kubeVersion" -}}
{{- default (default $.Capabilities.KubeVersion.GitVersion $.Capabilities.KubeVersion.Version) $.Values.global.kubeCapabilities }} {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride }}
{{- end -}} {{- end -}}

2
charts/argo-cd/values.yaml
View file

@ -3,6 +3,7 @@
## ##
nameOverride: argocd nameOverride: argocd
fullnameOverride: "" fullnameOverride: ""
kubeVersionOverride: ""
# Optional CRD installation for those without Helm hooks # Optional CRD installation for those without Helm hooks
installCRDs: true installCRDs: true
@ -21,7 +22,6 @@ global:
# - ip: 10.20.30.40 # - ip: 10.20.30.40
# hostnames: # hostnames:
# - git.myhostname # - git.myhostname
kubeCapabilities: ""
## Controller ## Controller
controller: controller: