Use crd.version value and add ability to specify crd creation job sa

This commit is contained in:
Ilya Sotkov 2018-08-26 20:01:06 +03:00
parent b6588e85b8
commit 0baedaf867
3 changed files with 6 additions and 3 deletions

View file

@ -1,6 +1,6 @@
{{- define "sensor-crd-json" }} {{- define "sensor-crd-json" }}
{ {
"apiVersion": "apiextensions.k8s.io/v1beta1", "apiVersion": "apiextensions.k8s.io/{{ .Values.crd.version }}",
"kind": "CustomResourceDefinition", "kind": "CustomResourceDefinition",
"metadata": { "metadata": {
"name": "sensors.argoproj.io" "name": "sensors.argoproj.io"

View file

@ -10,6 +10,7 @@ spec:
activeDeadlineSeconds: 100 activeDeadlineSeconds: 100
template: template:
spec: spec:
serviceAccountName: {{ .Values.crd.jobServiceAccount }}
containers: containers:
- name: kubectl-apply - name: kubectl-apply
image: lachlanevenson/k8s-kubectl image: lachlanevenson/k8s-kubectl

View file

@ -2,7 +2,9 @@ registry: argoproj
imagePullPolicy: Always imagePullPolicy: Always
# Version of the Sensor CRD # Version of the Sensor CRD
crdVersion: v1alpha1 crd:
version: v1beta1
jobServiceAccount: default
# If set to true then chart set controller instance id to release name # If set to true then chart set controller instance id to release name
useReleaseAsInstanceID: true useReleaseAsInstanceID: true