kommander: deploy catalog as a subchart in kommander (#271)

mesosphere · Nov 19, 2019 · fa7de01 · fa7de01
1 parent d53cb13
commit fa7de01
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 4 deletions.
diff --git a/stable/kommander/Chart.yaml b/stable/kommander/Chart.yaml
@@ -3,7 +3,7 @@ name: kommander
 home: https://github.com/mesosphere/kommander
 appVersion: "1.149.77"
 description: Kommander
-version: 0.2.14
+version: 0.2.15
 maintainers:
   - name: hectorj2f
   - name: alejandroEsc

diff --git a/stable/kommander/charts/kommander-karma-0.2.0.tgz b/stable/kommander/charts/kommander-karma-0.2.0.tgz
diff --git a/stable/kommander/charts/kommander-thanos-0.1.4.tgz b/stable/kommander/charts/kommander-thanos-0.1.4.tgz
diff --git a/stable/kommander/charts/kubeaddons-catalog-0.1.3.tgz b/stable/kommander/charts/kubeaddons-catalog-0.1.3.tgz
diff --git a/stable/kommander/charts/kubefed-0.0.2.tgz b/stable/kommander/charts/kubefed-0.0.2.tgz
diff --git a/stable/kommander/requirements.lock b/stable/kommander/requirements.lock
@@ -2,6 +2,9 @@ dependencies:
 - name: kubefed
   repository: https://mesosphere.github.io/charts/staging
   version: 0.0.2
+- name: kubeaddons-catalog
+  repository: https://mesosphere.github.io/charts/staging
+  version: 0.1.3
 - name: kommander-cluster-lifecycle
   repository: https://mesosphere.github.io/kommander-cluster-lifecycle/charts
   version: v0.2.3
@@ -14,5 +17,5 @@ dependencies:
 - name: grafana
   repository: https://kubernetes-charts.storage.googleapis.com
   version: 3.8.19
-digest: sha256:b02e9bd85293d0f0ebec76bb2e8938a3dcc2577d2bbb23ffc22ca2e24ea4e5b8
-generated: 2019-11-17T21:04:30.563094+01:00
+digest: sha256:dd396c941541ea141f0a49c0606f850729082b56859650443e6e9ded0fdc7ec1
+generated: "2019-11-18T11:56:47.087747-08:00"
diff --git a/stable/kommander/requirements.yaml b/stable/kommander/requirements.yaml
@@ -3,6 +3,10 @@ dependencies:
   version: "0.0.2"
   repository: "https://mesosphere.github.io/charts/staging"
   condition: kubefed.enabled, global.kubefed.enabled
+- name: kubeaddons-catalog
+  version: "0.1.3"
+  repository: "https://mesosphere.github.io/charts/staging"
+  condition: kubeaddons-catalog.enabled
 - name: kommander-cluster-lifecycle
   version: "0.2.3"
   repository: "https://mesosphere.github.io/kommander-cluster-lifecycle/charts"

diff --git a/stable/kommander/values.yaml b/stable/kommander/values.yaml
@@ -98,6 +98,14 @@ kommander-karma:
   enabled: true
   alertmanagerAddress: "prometheus-kubeaddons-prom-alertmanager.kubeaddons.svc.cluster.local:9093"
 
+kubeaddons-catalog:
+  enabled: true
+
+  image:
+    repository: mesosphere/kubeaddons-catalog
+    tag: "v0.5.3"
+    pullPolicy: IfNotPresent
+
 grafana:
   enabled: true
 

diff --git a/stable/opsportal/Chart.yaml b/stable/opsportal/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.0.0"
 home: https://github.com/mesosphere/charts
 description: OpsPortal Chart
 name: opsportal
-version: 0.1.16
+version: 0.1.17
 maintainers:
   - name: hectorj2f
   - name: alejandroEsc
diff --git a/stable/opsportal/values.yaml b/stable/opsportal/values.yaml
@@ -134,6 +134,9 @@ kommander:
   kommander-karma:
     enabled: false
 
+  kubeaddons-catalog:
+    enabled: false
+
 # BUG due to 2.14 helm
 # this is not seen for 2.15, so when we move to 2.15 remove below
 kommander-cluster-lifecycle:
@@ -150,3 +153,6 @@ kommander-thanos:
 
 kommander-karma:
   enabled: false
+
+kubeaddons-catalog:
+  enabled: false