Make API version configable for CRD

Signed-off-by: zdtsw <ericchou19831101@msn.com>
This commit is contained in:
zdtsw 2020-11-23 13:16:06 +01:00
parent ab8f54d3c2
commit 1cdf3eb161
26 changed files with 32 additions and 26 deletions

View file

@ -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 | `[]` | | 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"` | | 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` |
| CRD.version | API version for CustomResourceDefinition to use. | `"apiextensions.k8s.io/v1beta1"` |
| configs.knownHostsAnnotations | Known Hosts configmap annotations | `{}` | | configs.knownHostsAnnotations | Known Hosts configmap annotations | `{}` |
| configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) | | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |
| configs.secret.annotations | Annotations for argocd-secret | `{}` | | configs.secret.annotations | Annotations for argocd-secret | `{}` |

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels:

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels:

View file

@ -6,6 +6,8 @@ fullnameOverride: ""
# Optional CRD installation for those without Helm hooks # Optional CRD installation for those without Helm hooks
installCRDs: true installCRDs: true
CRD:
version: apiextensions.k8s.io/v1beta1
global: global:
image: image:

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventbus.argoproj.io name: eventbus.argoproj.io

View file

@ -1,5 +1,5 @@
--- ---
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventsources.argoproj.io name: eventsources.argoproj.io

View file

@ -1,5 +1,5 @@
--- ---
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: sensors.argoproj.io name: sensors.argoproj.io

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }} {{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventbus.argoproj.io name: eventbus.argoproj.io

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }} {{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventsources.argoproj.io name: eventsources.argoproj.io

View file

@ -1,6 +1,6 @@
{{- if .Values.installCRD }} {{- if .Values.installCRD }}
# Define a "sensor" custom resource definition # Define a "sensor" custom resource definition
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: sensors.argoproj.io name: sensors.argoproj.io

View file

@ -42,6 +42,7 @@ $ helm install --name my-release argo/argo-rollouts
| controller.metrics.serviceMonitor.enabled | bool | `false` | | | controller.metrics.serviceMonitor.enabled | bool | `false` | |
| imagePullSecrets | list | `[]` | | | imagePullSecrets | list | `[]` | |
| installCRDs | bool | `true` | | | installCRDs | bool | `true` | |
| CRD.version | API version for CustomResourceDefinition to use. | string | `"apiextensions.k8s.io/v1beta1"` | |
| podAnnotations | object | `{}` | | | podAnnotations | object | `{}` | |
| podLabels | object | `{}` | | | podLabels | object | `{}` | |
| serviceAccount.name | string | `"argo-rollouts"` | | | serviceAccount.name | string | `"argo-rollouts"` | |

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRDs }} {{- if .Values.installCRDs }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRDs }} {{- if .Values.installCRDs }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRDs }} {{- if .Values.installCRDs }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRDs }} {{- if .Values.installCRDs }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRDs }} {{- if .Values.installCRDs }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:

View file

@ -1,4 +1,6 @@
installCRDs: true installCRDs: true
CRD:
version: apiextensions.k8s.io/v1beta1
clusterInstall: true clusterInstall: true

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: clusterworkflowtemplates.argoproj.io name: clusterworkflowtemplates.argoproj.io

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: cronworkflows.argoproj.io name: cronworkflows.argoproj.io

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: workflows.argoproj.io name: workflows.argoproj.io

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: workfloweventbindings.argoproj.io name: workfloweventbindings.argoproj.io

View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: workflowtemplates.argoproj.io name: workflowtemplates.argoproj.io

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }} {{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: clusterworkflowtemplates.argoproj.io name: clusterworkflowtemplates.argoproj.io

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }} {{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: cronworkflows.argoproj.io name: cronworkflows.argoproj.io

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }} {{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: workflows.argoproj.io name: workflows.argoproj.io

View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }} {{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: {{ .Values.CRD.version }}
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: workflowtemplates.argoproj.io name: workflowtemplates.argoproj.io