Prepare deps and chart for release (#3306)

* Fix minor type error Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update UI trivial deps Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update cargo rust deps Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update simple go deps Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update chart deps Signed-off-by: Antonio Gamez Diaz <[email protected]> * Add kubeapps apis to the main values.yaml file Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update build images Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update CI deps Signed-off-by: Antonio Gamez Diaz <[email protected]> * Remove TODOs once the image is being built by bitnami Signed-off-by: Antonio Gamez Diaz <[email protected]> * Enable kubeapps-apis by default in chart Signed-off-by: Antonio Gamez Diaz <[email protected]> * Minor fix in notes.txt Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update buf deps Signed-off-by: Antonio Gamez Diaz <[email protected]> * Sort proxypass and set headers nginx directives Signed-off-by: Antonio Gamez Diaz <[email protected]> * Revert CI change (required until we release) Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update ingress-controller used in CI to v1.0.0 Signed-off-by: Antonio Gamez Diaz <[email protected]> * Revert "Remove TODOs once the image is being built by bitnami" This reverts commit 2ba377c. * Update k8s version in CI to 1.21 Signed-off-by: Antonio Gamez Diaz <[email protected]> * Update GKE k8s versions to match the supported ones Signed-off-by: Antonio Gamez Diaz <[email protected]>
vmware-tanzu · Aug 25, 2021 · 82f7ceb · 82f7ceb
1 parent d3f0970
commit 82f7ceb
Show file tree

Hide file tree

Showing 26 changed files with 1,272 additions and 969 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,13 +2,13 @@ version: 2.1
 parameters:
   GOLANG_VERSION:
     type: string
-    default: "1.16.5"
+    default: "1.16.7"
   NODE_VERSION:
     type: string
     default: "14"
   RUST_VERSION:
     type: string
-    default: "1.53.0"
+    default: "1.54.0"
   DOCKER_VERSION:
     type: string
     default: "20.10.6"
@@ -17,19 +17,19 @@ parameters:
     default: "v3.1.0"
   HELM_VERSION_STABLE:
     type: "string"
-    default: "v3.6.2"
+    default: "v3.6.3"
   OLM_VERSION:
     type: "string"
-    default: "v0.18.2"
+    default: "v0.18.3"
   MKCERT_VERSION:
     type: "string"
     default: "v1.4.3"
   KUBECTL_VERSION:
     type: "string"
-    default: "v1.21.2"
+    default: "v1.22.1"
   GITHUB_VERSION:
     type: "string"
-    default: "1.12.1"
+    default: "1.14.0"
   SEMVER_VERSION:
     type: "string"
     default: "3.2.0"
@@ -38,10 +38,10 @@ parameters:
     default: "v0.11.1"
   K8S_KIND_VERSION:
     type: "string"
-    default: "v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9"
+    default: "v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6"
   POSTGRESQL_VERSION:
     type: "string"
-    default: "11.12.0-debian-10-r43"
+    default: "11.13.0-debian-10-r0"
   IMAGES_TO_PUSH:
     type: "string"
     default: "kubeapps/apprepository-controller kubeapps/dashboard kubeapps/asset-syncer kubeapps/assetsvc kubeapps/kubeops kubeapps/pinniped-proxy kubeapps/kubeapps-apis"
@@ -121,7 +121,7 @@ workflows:
             - build_pinniped_proxy
       - sync_chart_from_bitnami:
           <<: *build_on_master
-      - GKE_1_18_MASTER:
+      - GKE_1_20_MASTER:
           <<: *build_on_tag
           requires:
             - test_go
@@ -130,7 +130,7 @@ workflows:
             - build_dashboard
             - build_pinniped_proxy
             - sync_chart_from_bitnami
-      - GKE_1_18_LATEST_RELEASE:
+      - GKE_1_20_LATEST_RELEASE:
           <<: *build_on_tag
           requires:
             - test_go
@@ -165,16 +165,16 @@ workflows:
           <<: *build_on_tag
           requires:
             - local_e2e_tests
-            - GKE_1_18_MASTER
-            - GKE_1_18_LATEST_RELEASE
+            - GKE_1_20_MASTER
+            - GKE_1_20_LATEST_RELEASE
             - GKE_1_19_MASTER
             - GKE_1_19_LATEST_RELEASE
       - release:
           <<: *build_on_tag
           requires:
             - local_e2e_tests
-            - GKE_1_18_MASTER
-            - GKE_1_18_LATEST_RELEASE
+            - GKE_1_20_MASTER
+            - GKE_1_20_LATEST_RELEASE
             - GKE_1_19_MASTER
             - GKE_1_19_LATEST_RELEASE
 
@@ -635,17 +635,17 @@ jobs:
       number:
         type: string
     <<: *local_e2e_steps
-  GKE_1_18_MASTER:
+  GKE_1_20_MASTER:
     <<: *gke_test
     environment:
-      GKE_BRANCH: "1.18"
+      GKE_BRANCH: "1.20"
       KUBEAPPS_DB: "postgresql"
       USE_MULTICLUSTER_OIDC_ENV: "false"
       <<: *common_envars
-  GKE_1_18_LATEST_RELEASE:
+  GKE_1_20_LATEST_RELEASE:
     <<: *gke_test
     environment:
-      GKE_BRANCH: "1.18"
+      GKE_BRANCH: "1.20"
       KUBEAPPS_DB: "postgresql"
       TEST_LATEST_RELEASE: 1
       USE_MULTICLUSTER_OIDC_ENV: "false"

diff --git a/chart/kubeapps/Chart.lock b/chart/kubeapps/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 1.8.0
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.9.1
+  version: 10.9.3
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 14.8.8
-digest: sha256:b0002bc04297a33e3a4e0ec757bac11eeffa8b231d2e20f64f345af38d2313d0
-generated: "2021-08-09T15:21:51.755809076+02:00"
+  version: 14.8.11
+digest: sha256:9662a5adfb8a36dc08b3c7cfdbcc71d55ef796c7b563f500070a17942ac34408
+generated: "2021-08-24T22:52:22.712559871+02:00"
diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: kubeapps
 sources:
   - https://github.com/kubeapps/kubeapps
-version: 7.2.2-dev0
+version: 7.3.0-dev0
diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md
diff --git a/chart/kubeapps/templates/NOTES.txt b/chart/kubeapps/templates/NOTES.txt
@@ -67,7 +67,7 @@ To access Kubeapps from outside your K8s cluster, follow the steps below:
 ##########################################################################################################
 {{- end }}
 
-{{ if and (.Values.featureFlags.kubeappsAPIsServer) (not .Values.redis.existingSecret) (empty .Values.redis.redisPassword) -}}
+{{ if and (.Values.redis.enabled) (not .Values.redis.existingSecret) (empty .Values.redis.redisPassword) -}}
 ##########################################################################################################
 ### WARNING: You did not provide a value for the redisPassword so one has been generated randomly      ###
 ##########################################################################################################

diff --git a/chart/kubeapps/templates/frontend/configmap.yaml b/chart/kubeapps/templates/frontend/configmap.yaml
@@ -111,14 +111,15 @@ data:
         rewrite ^ $request_uri; # pass the encoded url downstream as is,
         rewrite /api/assetsvc([^?]*) /assetsvc$1?$args break;
 
+    {{- if .Values.frontend.proxypassExtraSetHeader }}
+        proxy_set_header {{ .Values.frontend.proxypassExtraSetHeader }};
+    {{- end }}
+
     {{- if .Values.frontend.proxypassAccessTokenAsBearer }}
         # Google Kubernetes Engine requires the access_token as the Bearer when talking to the k8s api server.
         proxy_set_header Authorization "Bearer $http_x_forwarded_access_token";
     {{- end }}
 
-    {{- if .Values.frontend.proxypassExtraSetHeader }}
-        proxy_set_header {{ .Values.frontend.proxypassExtraSetHeader }};
-    {{- end }}
         proxy_pass {{ include "kubeapps.frontend-config.proxy_pass" . -}};
       }
 
@@ -128,30 +129,35 @@ data:
         proxy_read_timeout 10m;
         rewrite /api/kubeops/(.*) /$1 break;
         rewrite /api/kubeops / break;
+
     {{- if .Values.frontend.proxypassExtraSetHeader }}
         proxy_set_header {{ .Values.frontend.proxypassExtraSetHeader }};
     {{- end }}
-        proxy_pass {{ include "kubeapps.frontend-config.proxy_pass" . -}};
 
     {{- if .Values.frontend.proxypassAccessTokenAsBearer }}
         # Google Kubernetes Engine requires the access_token as the Bearer when talking to the k8s api server.
         proxy_set_header Authorization "Bearer $http_x_forwarded_access_token";
     {{- end }}
+
+        proxy_pass {{ include "kubeapps.frontend-config.proxy_pass" . -}};
       }
 
     {{- if .Values.featureFlags.kubeappsAPIsServer }}
       location ~* /apis {
         rewrite ^ $request_uri; # pass the encoded url downstream as is,
-        rewrite /apis([^?]*) $1 break;
+        rewrite /apis/([^?]*) /$1 break;
+        rewrite /apis / break;
+
     {{- if .Values.frontend.proxypassExtraSetHeader }}
         proxy_set_header {{ .Values.frontend.proxypassExtraSetHeader }};
     {{- end }}
-        proxy_pass {{ include "kubeapps.kubeappsapis.proxy_pass" . -}};
 
     {{- if .Values.frontend.proxypassAccessTokenAsBearer }}
         # Google Kubernetes Engine requires the access_token as the Bearer when talking to the k8s api server.
         proxy_set_header Authorization "Bearer $http_x_forwarded_access_token";
     {{- end }}
+
+        proxy_pass {{ include "kubeapps.kubeappsapis.proxy_pass" . -}};
       }
     {{- end }}
 
@@ -160,14 +166,15 @@ data:
         rewrite /api/(.*) /backend/$1 break;
         rewrite /api/ /backend break;
 
+    {{- if .Values.frontend.proxypassExtraSetHeader }}
+        proxy_set_header {{ .Values.frontend.proxypassExtraSetHeader }};
+    {{- end }}
+
     {{- if .Values.frontend.proxypassAccessTokenAsBearer }}
         # Google Kubernetes Engine requires the access_token as the Bearer when talking to the k8s api server.
         proxy_set_header Authorization "Bearer $http_x_forwarded_access_token";
     {{- end }}
 
-    {{- if .Values.frontend.proxypassExtraSetHeader }}
-        proxy_set_header {{ .Values.frontend.proxypassExtraSetHeader }};
-    {{- end }}
         proxy_pass {{ include "kubeapps.frontend-config.proxy_pass" . -}};
       }