diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index b58434e2..b188a33c 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -68,6 +68,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | | nameOverride | Provide a name in place of `argocd` | `"argocd"` | | installCRDs | Install CRDs if you are using Helm2. | `true` | +| CRD.version | API version for CustomResourceDefinition to use. | `"apiextensions.k8s.io/v1beta1"` | | configs.knownHostsAnnotations | Known Hosts configmap annotations | `{}` | | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) | | configs.secret.annotations | Annotations for argocd-secret | `{}` | @@ -330,4 +331,4 @@ through `xxx.extraArgs` | redis-ha.haproxy.metrics.enabled | HAProxy enable prometheus metric scraping | `true` | | redis-ha.image.tag | Redis tag | `"5.0.8-alpine"` | -[gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/ \ No newline at end of file +[gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/ diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/crds/crd-application.yaml index 5a08d884..f7999fd0 100644 --- a/charts/argo-cd/crds/crd-application.yaml +++ b/charts/argo-cd/crds/crd-application.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: labels: @@ -1654,4 +1654,4 @@ spec: versions: - name: v1alpha1 served: true - storage: true \ No newline at end of file + storage: true diff --git a/charts/argo-cd/crds/crd-project.yaml b/charts/argo-cd/crds/crd-project.yaml index 35d9dde9..97fca5a8 100644 --- a/charts/argo-cd/crds/crd-project.yaml +++ b/charts/argo-cd/crds/crd-project.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: labels: @@ -228,4 +228,4 @@ spec: versions: - name: v1alpha1 served: true - storage: true \ No newline at end of file + storage: true diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 57095815..f20a8358 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -6,6 +6,8 @@ fullnameOverride: "" # Optional CRD installation for those without Helm hooks installCRDs: true +CRD: + version: apiextensions.k8s.io/v1beta1 global: image: diff --git a/charts/argo-events/crds/eventbus-crd.yml b/charts/argo-events/crds/eventbus-crd.yml index 340d4989..25198bfd 100644 --- a/charts/argo-events/crds/eventbus-crd.yml +++ b/charts/argo-events/crds/eventbus-crd.yml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: eventbus.argoproj.io diff --git a/charts/argo-events/crds/eventsource-crd.yml b/charts/argo-events/crds/eventsource-crd.yml index 2ed64f2e..3d623a78 100644 --- a/charts/argo-events/crds/eventsource-crd.yml +++ b/charts/argo-events/crds/eventsource-crd.yml @@ -1,5 +1,5 @@ --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: eventsources.argoproj.io diff --git a/charts/argo-events/crds/sensor-crd.yml b/charts/argo-events/crds/sensor-crd.yml index b38207f7..7701bdf1 100644 --- a/charts/argo-events/crds/sensor-crd.yml +++ b/charts/argo-events/crds/sensor-crd.yml @@ -1,5 +1,5 @@ --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: sensors.argoproj.io diff --git a/charts/argo-events/templates/eventbus-crd.yaml b/charts/argo-events/templates/eventbus-crd.yaml index 175e2e60..7fa11d22 100644 --- a/charts/argo-events/templates/eventbus-crd.yaml +++ b/charts/argo-events/templates/eventbus-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: eventbus.argoproj.io diff --git a/charts/argo-events/templates/eventsource-crd.yaml b/charts/argo-events/templates/eventsource-crd.yaml index e791608b..ef5cec40 100644 --- a/charts/argo-events/templates/eventsource-crd.yaml +++ b/charts/argo-events/templates/eventsource-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: eventsources.argoproj.io diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml index cf3793c4..1cbdf3e2 100644 --- a/charts/argo-events/templates/sensor-crd.yaml +++ b/charts/argo-events/templates/sensor-crd.yaml @@ -1,6 +1,6 @@ {{- if .Values.installCRD }} # Define a "sensor" custom resource definition -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: sensors.argoproj.io diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md index 37ea661b..86347a38 100644 --- a/charts/argo-rollouts/README.md +++ b/charts/argo-rollouts/README.md @@ -42,6 +42,7 @@ $ helm install --name my-release argo/argo-rollouts | controller.metrics.serviceMonitor.enabled | bool | `false` | | | imagePullSecrets | list | `[]` | | | installCRDs | bool | `true` | | +| CRD.version | API version for CustomResourceDefinition to use. | string | `"apiextensions.k8s.io/v1beta1"` | | | podAnnotations | object | `{}` | | | podLabels | object | `{}` | | | serviceAccount.name | string | `"argo-rollouts"` | | diff --git a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml index 3a4caef4..8dda46eb 100644 --- a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRDs }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: annotations: diff --git a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml index c559fae1..7010dd76 100644 --- a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRDs }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: annotations: diff --git a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml index 9a768072..9e06d175 100644 --- a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRDs }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: annotations: diff --git a/charts/argo-rollouts/templates/crds/experiment-crd.yaml b/charts/argo-rollouts/templates/crds/experiment-crd.yaml index bd435156..02135f3e 100644 --- a/charts/argo-rollouts/templates/crds/experiment-crd.yaml +++ b/charts/argo-rollouts/templates/crds/experiment-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRDs }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: annotations: diff --git a/charts/argo-rollouts/templates/crds/rollout-crd.yaml b/charts/argo-rollouts/templates/crds/rollout-crd.yaml index 18afb92b..8293fe27 100644 --- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml +++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRDs }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: annotations: diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml index a488e6ec..97c24a1e 100644 --- a/charts/argo-rollouts/values.yaml +++ b/charts/argo-rollouts/values.yaml @@ -1,4 +1,6 @@ installCRDs: true +CRD: + version: apiextensions.k8s.io/v1beta1 clusterInstall: true diff --git a/charts/argo/crds/cluster-workflow-template-crd.yaml b/charts/argo/crds/cluster-workflow-template-crd.yaml index a189f17c..e76c960f 100644 --- a/charts/argo/crds/cluster-workflow-template-crd.yaml +++ b/charts/argo/crds/cluster-workflow-template-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: clusterworkflowtemplates.argoproj.io diff --git a/charts/argo/crds/cron-workflow-crd.yaml b/charts/argo/crds/cron-workflow-crd.yaml index abd50b30..ec2a7c2e 100644 --- a/charts/argo/crds/cron-workflow-crd.yaml +++ b/charts/argo/crds/cron-workflow-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: cronworkflows.argoproj.io diff --git a/charts/argo/crds/workflow-crd.yaml b/charts/argo/crds/workflow-crd.yaml index 24f6abc2..331a3dbc 100644 --- a/charts/argo/crds/workflow-crd.yaml +++ b/charts/argo/crds/workflow-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: workflows.argoproj.io diff --git a/charts/argo/crds/workflow-eventbinding-crd.yaml b/charts/argo/crds/workflow-eventbinding-crd.yaml index a58de8e7..3d2fd855 100644 --- a/charts/argo/crds/workflow-eventbinding-crd.yaml +++ b/charts/argo/crds/workflow-eventbinding-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: workfloweventbindings.argoproj.io diff --git a/charts/argo/crds/workflow-template-crd.yaml b/charts/argo/crds/workflow-template-crd.yaml index 0be13451..7a047a86 100644 --- a/charts/argo/crds/workflow-template-crd.yaml +++ b/charts/argo/crds/workflow-template-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: workflowtemplates.argoproj.io diff --git a/charts/argo/templates/cluster-workflow-template-crd.yaml b/charts/argo/templates/cluster-workflow-template-crd.yaml index c9c1cb52..e68e35ca 100644 --- a/charts/argo/templates/cluster-workflow-template-crd.yaml +++ b/charts/argo/templates/cluster-workflow-template-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: clusterworkflowtemplates.argoproj.io diff --git a/charts/argo/templates/cron-workflow-crd.yaml b/charts/argo/templates/cron-workflow-crd.yaml index 8bf36ab3..af90f5e0 100644 --- a/charts/argo/templates/cron-workflow-crd.yaml +++ b/charts/argo/templates/cron-workflow-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: cronworkflows.argoproj.io @@ -16,4 +16,4 @@ spec: - cwf scope: Namespaced version: v1alpha1 -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/argo/templates/workflow-crd.yaml b/charts/argo/templates/workflow-crd.yaml index dca2e1bc..face5fc8 100644 --- a/charts/argo/templates/workflow-crd.yaml +++ b/charts/argo/templates/workflow-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: workflows.argoproj.io diff --git a/charts/argo/templates/workflow-template-crd.yaml b/charts/argo/templates/workflow-template-crd.yaml index 55c940d5..dc693c64 100644 --- a/charts/argo/templates/workflow-template-crd.yaml +++ b/charts/argo/templates/workflow-template-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: {{ .Values.CRD.version }} kind: CustomResourceDefinition metadata: name: workflowtemplates.argoproj.io