From 5f3045a7e726967e428fea511a6ceccdd6f063ea Mon Sep 17 00:00:00 2001 From: Hector Fernandez Date: Fri, 19 Jul 2019 18:01:17 +0200 Subject: [PATCH] kommander: add conditional to install the CRD --- stable/kommander/Chart.yaml | 2 +- stable/kommander/templates/crd.yaml | 2 ++ stable/kommander/values.yaml | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stable/kommander/Chart.yaml b/stable/kommander/Chart.yaml index f7b924800..1ae2b4fd0 100644 --- a/stable/kommander/Chart.yaml +++ b/stable/kommander/Chart.yaml @@ -3,6 +3,6 @@ name: kommander home: https://github.com/mesosphere/kommander appVersion: "1.47.2" description: Kommander -version: 0.1.10 +version: 0.1.11 maintainers: - name: hectorj2f diff --git a/stable/kommander/templates/crd.yaml b/stable/kommander/templates/crd.yaml index 89d6b521d..82279d6f5 100644 --- a/stable/kommander/templates/crd.yaml +++ b/stable/kommander/templates/crd.yaml @@ -1,3 +1,4 @@ +{{- if (.Values.createObservableClusterCRD) }} --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition @@ -62,3 +63,4 @@ spec: - name: Age type: date JSONPath: .metadata.creationTimestamp +{{ end }} diff --git a/stable/kommander/values.yaml b/stable/kommander/values.yaml index b07d7b77f..14b1c1d66 100644 --- a/stable/kommander/values.yaml +++ b/stable/kommander/values.yaml @@ -8,6 +8,9 @@ logoutRedirectPath: / # Mode must be either production|konvoy mode: production +# Konvoy ui should NOT create the CRD if Kommander already did it +createObservableClusterCRD: true + extraInitContainers: resources: