From adcf7d98f3eca68fd3cd422b986d2bffe0189142 Mon Sep 17 00:00:00 2001 From: kubernetes-bitnami Date: Tue, 14 Jul 2020 16:22:32 +0000 Subject: [PATCH] kubeapps: bump chart version to 3.7.4 --- bitnami/kubeapps/Chart.yaml | 4 +++- bitnami/kubeapps/templates/apprepositories.yaml | 3 +++ .../kubeapps/templates/dashboard-config.yaml | 1 + .../templates/kubeapps-frontend-config.yaml | 1 + .../kubeapps/templates/tests/test-assetsvc.yaml | 17 +++++++++++++++-- bitnami/kubeapps/values.yaml | 16 ++++++++++------ 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml index 1f39f5dbf..e64d3e24e 100644 --- a/bitnami/kubeapps/Chart.yaml +++ b/bitnami/kubeapps/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: kubeapps -version: 3.7.1 +version: 3.7.4 appVersion: v1.10.3 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 @@ -17,3 +17,5 @@ maintainers: email: containers@bitnami.com # 2.14+ required https://github.com/kubeapps/kubeapps/issues/1185 tillerVersion: ">=2.14.0" +annotations: + category: Infrastructure diff --git a/bitnami/kubeapps/templates/apprepositories.yaml b/bitnami/kubeapps/templates/apprepositories.yaml index f0f80808c..33448eb4a 100644 --- a/bitnami/kubeapps/templates/apprepositories.yaml +++ b/bitnami/kubeapps/templates/apprepositories.yaml @@ -3,6 +3,9 @@ apiVersion: kubeapps.com/v1alpha1 kind: AppRepository metadata: name: {{ .name }} +{{- if .namespace }} + namespace: {{ .namespace }} +{{- end }} annotations: "helm.sh/hook": post-install labels:{{ include "kubeapps.extraAppLabels" $ | nindent 4 }} diff --git a/bitnami/kubeapps/templates/dashboard-config.yaml b/bitnami/kubeapps/templates/dashboard-config.yaml index 863ca8d1a..93a273430 100644 --- a/bitnami/kubeapps/templates/dashboard-config.yaml +++ b/bitnami/kubeapps/templates/dashboard-config.yaml @@ -8,6 +8,7 @@ data: vhost.conf: |- server { listen 8080; + listen [::]:8080; server_name _; gzip on; diff --git a/bitnami/kubeapps/templates/kubeapps-frontend-config.yaml b/bitnami/kubeapps/templates/kubeapps-frontend-config.yaml index 991f0ad1b..a965236a2 100644 --- a/bitnami/kubeapps/templates/kubeapps-frontend-config.yaml +++ b/bitnami/kubeapps/templates/kubeapps-frontend-config.yaml @@ -40,6 +40,7 @@ data: server { listen 8080; + listen [::]:8080; server_name _; location /healthz { diff --git a/bitnami/kubeapps/templates/tests/test-assetsvc.yaml b/bitnami/kubeapps/templates/tests/test-assetsvc.yaml index e4a9762ed..39df745b8 100644 --- a/bitnami/kubeapps/templates/tests/test-assetsvc.yaml +++ b/bitnami/kubeapps/templates/tests/test-assetsvc.yaml @@ -14,7 +14,20 @@ spec: - name: ASSETSVC_PORT value: "{{ .Values.assetsvc.service.port }}" command: - - sh + - bash - -c - - curl -o /tmp/output $ASSETSVC_HOST:$ASSETSVC_PORT/v1/ns/{{ .Release.Namespace }}/charts && cat /tmp/output && cat /tmp/output | grep wordpress + # We are requesting the "wordpress" chart to the chartsvc to check that everything works as expected + # Also, we retry several times in case the repository is being populated at the time of executing this test + - | + n=0 + until [ "$n" -ge 5 ]; do + if curl -o /tmp/output $ASSETSVC_HOST:$ASSETSVC_PORT/v1/ns/{{ .Release.Namespace }}/charts && cat /tmp/output && cat /tmp/output | grep wordpress; then + break + fi + sleep 10 + ((n+=1)) + done + if [ "$n" -eq 5 ]; then + exit 1 + fi restartPolicy: Never diff --git a/bitnami/kubeapps/values.yaml b/bitnami/kubeapps/values.yaml index cfba88c1d..32f005cd1 100644 --- a/bitnami/kubeapps/values.yaml +++ b/bitnami/kubeapps/values.yaml @@ -193,7 +193,7 @@ apprepository: image: registry: docker.io repository: bitnami/kubeapps-apprepository-controller - tag: 1.10.2-scratch-r0 + tag: 1.10.3-scratch-r0 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -205,7 +205,7 @@ apprepository: syncImage: registry: docker.io repository: bitnami/kubeapps-asset-syncer - tag: 1.10.2-scratch-r0 + tag: 1.10.3-scratch-r0 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -240,6 +240,8 @@ apprepository: # # It should start with -----BEGIN CERTIFICATE----- or # # -----BEGIN RSA PRIVATE KEY----- # caCert: + # # Create this apprepository in a custom namespace + # namespace: # https://github.com/kubeapps/kubeapps/issues/478#issuecomment-422979262 ## AppRepository Controller containers' resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ @@ -303,7 +305,7 @@ kubeops: image: registry: docker.io repository: bitnami/kubeapps-kubeops - tag: 1.10.2-scratch-r0 + tag: 1.10.3-scratch-r0 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -350,7 +352,7 @@ tillerProxy: image: registry: docker.io repository: bitnami/kubeapps-tiller-proxy - tag: 1.10.2-scratch-r0 + tag: 1.10.3-scratch-r0 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -428,7 +430,7 @@ assetsvc: image: registry: docker.io repository: bitnami/kubeapps-assetsvc - tag: 1.10.2-scratch-r0 + tag: 1.10.3-scratch-r0 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -493,7 +495,7 @@ dashboard: image: registry: docker.io repository: bitnami/kubeapps-dashboard - tag: 1.10.2-debian-10-r21 + tag: 1.10.3-debian-10-r0 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -699,3 +701,5 @@ featureFlags: # - name: second-cluster # apiServiceURL: https://second-cluster:6443 # certificateAuthorityData: LS0tLS1CRUdJ... + # ui is a WIP feature for the migration to Clarity design system. + ui: hex