kubeapps: bump chart version to 0.7.0

sriharsha986 · Oct 16, 2018 · c0833c4 · c0833c4
1 parent 78a98b6
commit c0833c4
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 20 deletions.
diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kubeapps
-version: 0.6.1
+version: 0.7.0
 appVersion: v1.0.0-beta.2
 description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
 icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png

diff --git a/bitnami/kubeapps/README.md b/bitnami/kubeapps/README.md
@@ -115,6 +115,7 @@ apprepository:
 EOF
 $ helm install --name kubeapps --namespace kubeapps bitnami/kubeapps -f custom-values.yaml
 ```
+
 ### Configuring connection to a custom namespace Tiller instance
 
 By default, Kubeapps connects to the Tiller Service in the `kube-system` namespace, the default install location for Helm.

diff --git a/bitnami/kubeapps/templates/_helpers.tpl b/bitnami/kubeapps/templates/_helpers.tpl
@@ -28,7 +28,22 @@ If release name contains chart name it will be used as a full name.
 Render image reference
 */}}
 {{- define "kubeapps.image" -}}
-{{ .registry }}/{{ .repository }}:{{ .tag }}
+{{- $image := index . 0 -}}
+{{- $global := index . 1 -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if $global -}}
+    {{- if $global.imageRegistry -}}
+        {{ $global.imageRegistry }}/{{ $image.repository }}:{{ $image.tag }}
+    {{- else -}}
+        {{ $image.registry }}/{{ $image.repository }}:{{ $image.tag }}
+    {{- end -}}
+{{- else -}}
+    {{ $image.registry }}/{{ $image.repository }}:{{ $image.tag }}
+{{- end -}}
 {{- end -}}
 
 {{/*

diff --git a/bitnami/kubeapps/templates/apprepository-deployment.yaml b/bitnami/kubeapps/templates/apprepository-deployment.yaml
@@ -22,12 +22,12 @@ spec:
       serviceAccountName: {{ template "kubeapps.apprepository.fullname" . }}
       containers:
       - name: controller
-        image: {{ template "kubeapps.image" .Values.apprepository.image }}
+        image: {{ template "kubeapps.image" (list .Values.apprepository.image .Values.global) }}
         command:
         - /apprepository-controller
         args:
         - --logtostderr
-        - --repo-sync-image={{ template "kubeapps.image" .Values.apprepository.syncImage }}
+        - --repo-sync-image={{ template "kubeapps.image" (list .Values.apprepository.syncImage .Values.global) }}
         - --namespace={{ .Release.Namespace }}
         - --mongo-url={{ template "kubeapps.mongodb.fullname" . }}
         - --mongo-secret-name={{ .Values.mongodb.existingSecret }}

diff --git a/bitnami/kubeapps/templates/apprepository-jobs-bootstrap.yaml b/bitnami/kubeapps/templates/apprepository-jobs-bootstrap.yaml
@@ -19,11 +19,11 @@ spec:
     spec:
       containers:
       - name: kubectl
-        image: {{ template "kubeapps.image" .Values.hooks.image }}
+        image: {{ template "kubeapps.image" (list .Values.hooks.image .Values.global) }}
         command:
         - kubectl
-        - apply 
-        - -f 
+        - apply
+        - -f
         - /tmp/apprepositories/apprepositories.yaml
         volumeMounts:
         - mountPath: /tmp/apprepositories

diff --git a/bitnami/kubeapps/templates/apprepository-jobs-cleanup.yaml b/bitnami/kubeapps/templates/apprepository-jobs-cleanup.yaml
@@ -20,13 +20,13 @@ spec:
     spec:
       containers:
       - name: kubectl
-        image: {{ template "kubeapps.image" .Values.hooks.image }}
+        image: {{ template "kubeapps.image" (list .Values.hooks.image .Values.global) }}
         command:
         - kubectl
         - delete
         - apprepositories.kubeapps.com
         - -n
-        - {{ .Release.Namespace }} 
+        - {{ .Release.Namespace }}
         - --all
       restartPolicy: OnFailure
       serviceAccountName: {{ template "kubeapps.apprepository-jobs-cleanup.fullname" . }}

diff --git a/bitnami/kubeapps/templates/chartsvc-deployment.yaml b/bitnami/kubeapps/templates/chartsvc-deployment.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: chartsvc
-        image: {{ template "kubeapps.image" .Values.chartsvc.image }}
+        image: {{ template "kubeapps.image" (list .Values.chartsvc.image .Values.global) }}
         command:
         - /chartsvc
         args:

diff --git a/bitnami/kubeapps/templates/dashboard-deployment.yaml b/bitnami/kubeapps/templates/dashboard-deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: dashboard
-        image: {{ template "kubeapps.image" .Values.dashboard.image }}
+        image: {{ template "kubeapps.image" (list .Values.dashboard.image .Values.global) }}
         livenessProbe:
 {{ toYaml .Values.dashboard.livenessProbe | indent 10 }}
         readinessProbe:

diff --git a/bitnami/kubeapps/templates/kubeapps-frontend-deployment.yaml b/bitnami/kubeapps/templates/kubeapps-frontend-deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: {{ template "kubeapps.image" .Values.frontend.image }}
+        image: {{ template "kubeapps.image" (list .Values.frontend.image .Values.global) }}
         livenessProbe:
 {{ toYaml .Values.frontend.livenessProbe | indent 10 }}
         readinessProbe:

diff --git a/bitnami/kubeapps/templates/kubeapps-jobs-upgrade.yaml b/bitnami/kubeapps/templates/kubeapps-jobs-upgrade.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: kubectl
-        image: {{ template "kubeapps.image" .Values.hooks.image }}
+        image: {{ template "kubeapps.image" (list .Values.hooks.image .Values.global) }}
         command:
         - /bin/sh
         - -c

diff --git a/bitnami/kubeapps/templates/mongodb-jobs-cleanup.yaml b/bitnami/kubeapps/templates/mongodb-jobs-cleanup.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: kubectl
-        image: {{ template "kubeapps.image" .Values.hooks.image }}
+        image: {{ template "kubeapps.image" (list .Values.hooks.image .Values.global) }}
         command:
         - /bin/sh
         args:

diff --git a/bitnami/kubeapps/templates/tiller-proxy-deployment.yaml b/bitnami/kubeapps/templates/tiller-proxy-deployment.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: {{ template "kubeapps.tiller-proxy.fullname" . }}
       containers:
       - name: proxy
-        image: {{ template "kubeapps.image" .Values.tillerProxy.image }}
+        image: {{ template "kubeapps.image" (list .Values.tillerProxy.image .Values.global) }}
         command:
         - /proxy
         args:
@@ -53,7 +53,7 @@ spec:
       {{- if .Values.tillerProxy.tls }}
       volumes:
       - name: tiller-certs
-        secret: 
+        secret:
           secretName: {{ template "kubeapps.tiller-proxy.fullname" . }}
       {{- end }}
     {{- with .Values.tillerProxy.nodeSelector }}

diff --git a/bitnami/kubeapps/values.yaml b/bitnami/kubeapps/values.yaml
@@ -1,3 +1,8 @@
+## Global Docker image registry
+## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
+# global:
+#   imageRegistry:
+
 # The frontend service is the main reverse proxy used to access the Kubeapps UI
 # To expose Kubeapps externally either configure the ingress object below or
 # set frontend.service.type=LoadBalancer in the frontend configuration.
@@ -59,8 +64,8 @@ apprepository:
   # Image used to perform chart repository syncs
   syncImage:
     registry: docker.io
-    repository: kubeapps/chart-repo
-    tag: v1.0.0-beta.2
+    repository: quay.io/helmpack/chart-repo
+    tag: v1.0.0
   initialRepos:
   - name: stable
     url: https://kubernetes-charts.storage.googleapis.com
@@ -127,8 +132,8 @@ chartsvc:
   replicaCount: 2
   image:
     registry: docker.io
-    repository: kubeapps/chartsvc
-    tag: v1.0.0-beta.2
+    repository: quay.io/helmpack/chartsvc
+    tag: v1.0.0
   service:
     port: 8080
   # https://github.com/kubeapps/kubeapps/issues/478#issuecomment-422979262
@@ -190,6 +195,11 @@ dashboard:
   tolerations: []
   affinity: {}
 
+##
+## MongoDB chart configuration
+##
+## https://github.com/helm/charts/blob/master/stable/mongodb/values.yaml
+##
 mongodb:
   # Kubeapps uses MongoDB as a cache and persistence is not required
   persistence:
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,6 +115,7 @@ apprepository: @@
     EOF
     $ helm install --name kubeapps --namespace kubeapps bitnami/kubeapps -f custom-values.yaml
     ```
     ### Configuring connection to a custom namespace Tiller instance
     By default, Kubeapps connects to the Tiller Service in the `kube-system` namespace, the default install location for Helm.
@@ Expand Down @@