From 07f14950fd263b41b98fefe350f15cdec560354a Mon Sep 17 00:00:00 2001 From: kubeapps-bot Date: Sat, 22 Apr 2023 04:03:38 +0000 Subject: [PATCH 1/4] bump chart version to 12.3.1 Signed-off-by: kubeapps-bot --- chart/kubeapps/Chart.lock | 14 +++---- chart/kubeapps/Chart.yaml | 8 ++-- chart/kubeapps/README.md | 39 +++++++++---------- .../templates/kubeappsapis/deployment.yaml | 14 +++---- chart/kubeapps/values.yaml | 14 +++---- 5 files changed, 43 insertions(+), 46 deletions(-) diff --git a/chart/kubeapps/Chart.lock b/chart/kubeapps/Chart.lock index 7e3639ee1fa..1b02a978bb8 100644 --- a/chart/kubeapps/Chart.lock +++ b/chart/kubeapps/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: redis - repository: https://charts.bitnami.com/bitnami - version: 17.9.2 + repository: oci://registry-1.docker.io/bitnamicharts + version: 17.9.5 - name: postgresql - repository: https://charts.bitnami.com/bitnami - version: 12.2.6 + repository: oci://registry-1.docker.io/bitnamicharts + version: 12.2.8 - name: common - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts version: 2.2.4 -digest: sha256:100d72abb6667931438d6f9faba698629bec2479fe22baa20f5e80ef17c57fd5 -generated: "2023-04-01T12:52:51.580008183Z" +digest: sha256:338f8dd541bfc32ea3a472a2d3aa5251bcf9dcb4f5a12abf136c8d4b009874b1 +generated: "2023-04-20T09:33:25.255469+02:00" diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml index 6040a8c464f..23e05b1714c 100644 --- a/chart/kubeapps/Chart.yaml +++ b/chart/kubeapps/Chart.yaml @@ -6,14 +6,14 @@ appVersion: DEVEL dependencies: - condition: packaging.flux.enabled name: redis - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts version: 17.x.x - condition: packaging.helm.enabled name: postgresql - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts version: 12.x.x - name: common - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts tags: - bitnami-common version: 2.x.x @@ -32,4 +32,4 @@ maintainers: name: kubeapps sources: - https://github.com/vmware-tanzu/kubeapps -version: 12.2.10-dev0 +version: 12.3.1 diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md index fb3b1e1d23d..f156539602e 100644 --- a/chart/kubeapps/README.md +++ b/chart/kubeapps/README.md @@ -1,3 +1,4 @@ + # Kubeapps packaged by Bitnami @@ -8,8 +9,7 @@ Kubeapps is a web-based UI for launching and managing applications on Kubernetes ## TL;DR ```console -helm repo add my-repo https://charts.bitnami.com/bitnami -helm install my-release my-repo/kubeapps --namespace kubeapps --create-namespace +helm install my-release oci://registry-1.docker.io/bitnamicharts/kubeapps --namespace kubeapps --create-namespace ``` > Check out the [getting started](https://github.com/vmware-tanzu/kubeapps/blob/main/site/content/docs/latest/tutorials/getting-started.md) to start deploying apps with Kubeapps. @@ -43,8 +43,7 @@ It also packages the [Bitnami PostgreSQL chart](https://github.com/bitnami/chart To install the chart with the release name `my-release`: ```console -helm repo add my-repo https://charts.bitnami.com/bitnami -helm install my-release my-repo/kubeapps --namespace kubeapps --create-namespace +helm install my-release oci://registry-1.docker.io/bitnamicharts/kubeapps --namespace kubeapps --create-namespace ``` The command deploys Kubeapps on the Kubernetes cluster in the `kubeapps` namespace. The [Parameters](#parameters) section lists the parameters that can be configured during installation. @@ -111,7 +110,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | ------------------------------------------------ | ----------------------------------------------------------------------------------------------------- | --------------------- | | `frontend.image.registry` | NGINX image registry | `docker.io` | | `frontend.image.repository` | NGINX image repository | `bitnami/nginx` | -| `frontend.image.tag` | NGINX image tag (immutable tags are recommended) | `1.23.4-debian-11-r0` | +| `frontend.image.tag` | NGINX image tag (immutable tags are recommended) | `1.23.4-debian-11-r7` | | `frontend.image.digest` | NGINX image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `frontend.image.pullPolicy` | NGINX image pull policy | `IfNotPresent` | | `frontend.image.pullSecrets` | NGINX image pull secrets | `[]` | @@ -195,7 +194,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `dashboard.enabled` | Specifies whether Kubeapps Dashboard should be deployed or not | `true` | | `dashboard.image.registry` | Dashboard image registry | `docker.io` | | `dashboard.image.repository` | Dashboard image repository | `kubeapps/dashboard` | -| `dashboard.image.tag` | Dashboard image tag (immutable tags are recommended) | `latest` | +| `dashboard.image.tag` | Dashboard image tag (immutable tags are recommended) | `2.7.0-debian-11-r0` | | `dashboard.image.digest` | Dashboard image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `dashboard.image.pullPolicy` | Dashboard image pull policy | `IfNotPresent` | | `dashboard.image.pullSecrets` | Dashboard image pull secrets | `[]` | @@ -274,13 +273,13 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | ----------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | | `apprepository.image.registry` | Kubeapps AppRepository Controller image registry | `docker.io` | | `apprepository.image.repository` | Kubeapps AppRepository Controller image repository | `kubeapps/apprepository-controller` | -| `apprepository.image.tag` | Kubeapps AppRepository Controller image tag (immutable tags are recommended) | `latest` | +| `apprepository.image.tag` | Kubeapps AppRepository Controller image tag (immutable tags are recommended) | `2.7.0-scratch-r0` | | `apprepository.image.digest` | Kubeapps AppRepository Controller image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `apprepository.image.pullPolicy` | Kubeapps AppRepository Controller image pull policy | `IfNotPresent` | | `apprepository.image.pullSecrets` | Kubeapps AppRepository Controller image pull secrets | `[]` | | `apprepository.syncImage.registry` | Kubeapps Asset Syncer image registry | `docker.io` | | `apprepository.syncImage.repository` | Kubeapps Asset Syncer image repository | `kubeapps/asset-syncer` | -| `apprepository.syncImage.tag` | Kubeapps Asset Syncer image tag (immutable tags are recommended) | `latest` | +| `apprepository.syncImage.tag` | Kubeapps Asset Syncer image tag (immutable tags are recommended) | `2.7.0-scratch-r0` | | `apprepository.syncImage.digest` | Kubeapps Asset Syncer image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `apprepository.syncImage.pullPolicy` | Kubeapps Asset Syncer image pull policy | `IfNotPresent` | | `apprepository.syncImage.pullSecrets` | Kubeapps Asset Syncer image pull secrets | `[]` | @@ -342,7 +341,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `authProxy.enabled` | Specifies whether Kubeapps should configure OAuth login/logout | `false` | | `authProxy.image.registry` | OAuth2 Proxy image registry | `docker.io` | | `authProxy.image.repository` | OAuth2 Proxy image repository | `bitnami/oauth2-proxy` | -| `authProxy.image.tag` | OAuth2 Proxy image tag (immutable tags are recommended) | `7.4.0-debian-11-r52` | +| `authProxy.image.tag` | OAuth2 Proxy image tag (immutable tags are recommended) | `7.4.0-debian-11-r59` | | `authProxy.image.digest` | OAuth2 Proxy image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `authProxy.image.pullPolicy` | OAuth2 Proxy image pull policy | `IfNotPresent` | | `authProxy.image.pullSecrets` | OAuth2 Proxy image pull secrets | `[]` | @@ -382,7 +381,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `pinnipedProxy.enabled` | Specifies whether Kubeapps should configure Pinniped Proxy | `false` | | `pinnipedProxy.image.registry` | Pinniped Proxy image registry | `docker.io` | | `pinnipedProxy.image.repository` | Pinniped Proxy image repository | `kubeapps/pinniped-proxy` | -| `pinnipedProxy.image.tag` | Pinniped Proxy image tag (immutable tags are recommended) | `latest` | +| `pinnipedProxy.image.tag` | Pinniped Proxy image tag (immutable tags are recommended) | `2.7.0-debian-11-r0` | | `pinnipedProxy.image.digest` | Pinniped Proxy image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `pinnipedProxy.image.pullPolicy` | Pinniped Proxy image pull policy | `IfNotPresent` | | `pinnipedProxy.image.pullSecrets` | Pinniped Proxy image pull secrets | `[]` | @@ -462,7 +461,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `kubeappsapis.pluginConfig.resources.packages.v1alpha1.trustedNamespaces.headerPattern` | Optional header pattern for trusted namespaces | `""` | | `kubeappsapis.image.registry` | Kubeapps-APIs image registry | `docker.io` | | `kubeappsapis.image.repository` | Kubeapps-APIs image repository | `kubeapps/kubeapps-apis` | -| `kubeappsapis.image.tag` | Kubeapps-APIs image tag (immutable tags are recommended) | `latest` | +| `kubeappsapis.image.tag` | Kubeapps-APIs image tag (immutable tags are recommended) | `2.7.0-debian-11-r0` | | `kubeappsapis.image.digest` | Kubeapps-APIs image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `kubeappsapis.image.pullPolicy` | Kubeapps-APIs image pull policy | `IfNotPresent` | | `kubeappsapis.image.pullSecrets` | Kubeapps-APIs image pull secrets | `[]` | @@ -553,7 +552,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith ```console helm install kubeapps --namespace kubeapps \ --set ingress.enabled=true \ - my-repo/kubeapps + oci://registry-1.docker.io/bitnamicharts/kubeapps ``` The above command enables an Ingress Rule to expose Kubeapps. @@ -561,7 +560,7 @@ The above command enables an Ingress Rule to expose Kubeapps. Alternatively, a YAML file that specifies the values for parameters can be provided while installing the chart. For example, ```console -helm install kubeapps --namespace kubeapps -f custom-values.yaml my-repo/kubeapps +helm install kubeapps --namespace kubeapps -f custom-values.yaml oci://registry-1.docker.io/bitnamicharts/kubeapps ``` ## Configuration and installation details @@ -652,7 +651,7 @@ Now upgrade Kubeapps: ```console export RELEASE_NAME=kubeapps -helm upgrade $RELEASE_NAME my-repo/kubeapps +helm upgrade $RELEASE_NAME oci://registry-1.docker.io/bitnamicharts/kubeapps ``` If you find issues upgrading Kubeapps, check the [troubleshooting](#error-while-upgrading-the-chart) section. @@ -716,7 +715,7 @@ Have a look at the [dashboard documentation](https://github.com/vmware-tanzu/kub The example below will match the URL `http://example.com` to the Kubeapps dashboard. For further configuration, please refer to your specific Ingress configuration docs (e.g., [NGINX](https://github.com/kubernetes/ingress-nginx) or [HAProxy](https://github.com/haproxytech/kubernetes-ingress)). ```console -helm install kubeapps my-repo/kubeapps \ +helm install kubeapps oci://registry-1.docker.io/bitnamicharts/kubeapps \ --namespace kubeapps \ --set ingress.enabled=true \ --set ingress.hostname=example.com \ @@ -738,7 +737,7 @@ You can work around this problem by setting the following Nginx ingress annotati You may want to serve Kubeapps with a subpath, for instance `http://example.com/subpath`, you have to set the proper Ingress configuration. If you are using the ingress configuration provided by the Kubeapps chart, you will have to set the `ingress.hostname` and `path` parameters: ```console -helm install kubeapps my-repo/kubeapps \ +helm install kubeapps oci://registry-1.docker.io/bitnamicharts/kubeapps \ --namespace kubeapps \ --set ingress.enabled=true \ --set ingress.hostname=example.com \ @@ -749,7 +748,7 @@ helm install kubeapps my-repo/kubeapps \ Besides, if you are using the OAuth2/OIDC login (more information at the [using an OIDC provider documentation](https://github.com/vmware-tanzu/kubeapps/blob/main/site/content/docs/latest/tutorials/using-an-OIDC-provider.md)), you will need, also, to configure the different URLs: ```console -helm install kubeapps my-repo/kubeapps \ +helm install kubeapps oci://registry-1.docker.io/bitnamicharts/kubeapps \ --namespace kubeapps \ # ... other OIDC and ingress flags --set authProxy.oauthLoginURI="/subpath/oauth2/login" \ @@ -866,7 +865,7 @@ kubectl api-versions If the above command does not include entries for `rbac.authorization.k8s.io` you should perform the chart installation by setting `rbac.create=false`: ```console -helm install --name kubeapps --namespace kubeapps my-repo/kubeapps --set rbac.create=false +helm install --name kubeapps --namespace kubeapps oci://registry-1.docker.io/bitnamicharts/kubeapps --set rbac.create=false ``` ### Error while upgrading the Chart @@ -909,7 +908,7 @@ It is possible that when upgrading Kubeapps an error appears. That can be caused ```console helm repo update - helm install --name kubeapps --namespace kubeapps my-repo/kubeapps + helm install --name kubeapps --namespace kubeapps oci://registry-1.docker.io/bitnamicharts/kubeapps ``` 6. (Optional) Restore any repositories you backed up in the first step: @@ -970,7 +969,7 @@ After that, you will be able to upgrade Kubeapps to 2.3.1 using the existing dat > **WARNING**: Make sure that the variable `$POSTGRESQL_PASSWORD` is properly populated. Setting a wrong (or empty) password will corrupt the release. ```console -helm upgrade kubeapps my-repo/kubeapps -n kubeapps --set postgresql.postgresqlPassword=$POSTGRESQL_PASSWORD +helm upgrade kubeapps oci://registry-1.docker.io/bitnamicharts/kubeapps -n kubeapps --set postgresql.postgresqlPassword=$POSTGRESQL_PASSWORD ``` ### Upgrading to 2.0.1 (Chart 5.0.0) diff --git a/chart/kubeapps/templates/kubeappsapis/deployment.yaml b/chart/kubeapps/templates/kubeappsapis/deployment.yaml index f36c2d2c42c..471e58e2cdc 100644 --- a/chart/kubeapps/templates/kubeappsapis/deployment.yaml +++ b/chart/kubeapps/templates/kubeappsapis/deployment.yaml @@ -181,20 +181,18 @@ spec: {{- if .Values.kubeappsapis.customLivenessProbe }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customLivenessProbe "context" $) | nindent 12 }} {{- else if .Values.kubeappsapis.livenessProbe.enabled }} - # Replace with the built-in gRPC container probes once we're - # supporting >= 1.24 only. https://kubernetes.io/blog/2022/05/13/grpc-probes-now-in-beta/ livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.livenessProbe "enabled") "context" $) | nindent 12 }} - exec: - command: ["/bin/grpc_health_probe", "-addr=:{{ .Values.kubeappsapis.containerPorts.http }}"] - initialDelaySeconds: 10 + httpGet: + path: /core/plugins/v1alpha1/configured-plugins + port: grpc-http {{- end }} {{- if .Values.kubeappsapis.customReadinessProbe }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customReadinessProbe "context" $) | nindent 12 }} {{- else if .Values.kubeappsapis.readinessProbe.enabled }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.readinessProbe "enabled") "context" $) | nindent 12 }} - exec: - command: ["/bin/grpc_health_probe", "-addr=:{{ .Values.kubeappsapis.containerPorts.http }}"] - initialDelaySeconds: 5 + httpGet: + path: /core/plugins/v1alpha1/configured-plugins + port: grpc-http {{- end }} {{- if .Values.kubeappsapis.customStartupProbe }} startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customStartupProbe "context" $) | nindent 12 }} diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml index 282591d70bd..f109b9f16c1 100644 --- a/chart/kubeapps/values.yaml +++ b/chart/kubeapps/values.yaml @@ -205,7 +205,7 @@ frontend: image: registry: docker.io repository: bitnami/nginx - tag: 1.23.4-debian-11-r0 + tag: 1.23.4-debian-11-r7 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -524,7 +524,7 @@ dashboard: image: registry: docker.io repository: kubeapps/dashboard - tag: latest + tag: 2.7.0-debian-11-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -831,7 +831,7 @@ apprepository: image: registry: docker.io repository: kubeapps/apprepository-controller - tag: latest + tag: 2.7.0-scratch-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -858,7 +858,7 @@ apprepository: syncImage: registry: docker.io repository: kubeapps/asset-syncer - tag: latest + tag: 2.7.0-scratch-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1142,7 +1142,7 @@ authProxy: image: registry: docker.io repository: bitnami/oauth2-proxy - tag: 7.4.0-debian-11-r52 + tag: 7.4.0-debian-11-r59 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1280,7 +1280,7 @@ pinnipedProxy: image: registry: docker.io repository: kubeapps/pinniped-proxy - tag: latest + tag: 2.7.0-debian-11-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1573,7 +1573,7 @@ kubeappsapis: image: registry: docker.io repository: kubeapps/kubeapps-apis - tag: latest + tag: 2.7.0-debian-11-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' From 181a182428ee42b2a5098e50288ba12ea6a95746 Mon Sep 17 00:00:00 2001 From: Michael Nelson Date: Wed, 26 Apr 2023 06:36:33 +1000 Subject: [PATCH 2/4] Merge while ensuring dev changes are not reverted. Signed-off-by: Michael Nelson --- chart/kubeapps/Chart.yaml | 2 +- chart/kubeapps/README.md | 13 ++++++------- .../templates/kubeappsapis/deployment.yaml | 14 ++++++++------ chart/kubeapps/values.yaml | 12 ++++++------ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml index 23e05b1714c..2f19e3c01c0 100644 --- a/chart/kubeapps/Chart.yaml +++ b/chart/kubeapps/Chart.yaml @@ -32,4 +32,4 @@ maintainers: name: kubeapps sources: - https://github.com/vmware-tanzu/kubeapps -version: 12.3.1 +version: 12.3.2-dev0 diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md index f156539602e..a0e658e5689 100644 --- a/chart/kubeapps/README.md +++ b/chart/kubeapps/README.md @@ -1,4 +1,3 @@ - # Kubeapps packaged by Bitnami @@ -194,7 +193,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `dashboard.enabled` | Specifies whether Kubeapps Dashboard should be deployed or not | `true` | | `dashboard.image.registry` | Dashboard image registry | `docker.io` | | `dashboard.image.repository` | Dashboard image repository | `kubeapps/dashboard` | -| `dashboard.image.tag` | Dashboard image tag (immutable tags are recommended) | `2.7.0-debian-11-r0` | +| `dashboard.image.tag` | Dashboard image tag (immutable tags are recommended) | `latest` | | `dashboard.image.digest` | Dashboard image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `dashboard.image.pullPolicy` | Dashboard image pull policy | `IfNotPresent` | | `dashboard.image.pullSecrets` | Dashboard image pull secrets | `[]` | @@ -273,13 +272,13 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | ----------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | | `apprepository.image.registry` | Kubeapps AppRepository Controller image registry | `docker.io` | | `apprepository.image.repository` | Kubeapps AppRepository Controller image repository | `kubeapps/apprepository-controller` | -| `apprepository.image.tag` | Kubeapps AppRepository Controller image tag (immutable tags are recommended) | `2.7.0-scratch-r0` | +| `apprepository.image.tag` | Kubeapps AppRepository Controller image tag (immutable tags are recommended) | `latest` | | `apprepository.image.digest` | Kubeapps AppRepository Controller image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `apprepository.image.pullPolicy` | Kubeapps AppRepository Controller image pull policy | `IfNotPresent` | | `apprepository.image.pullSecrets` | Kubeapps AppRepository Controller image pull secrets | `[]` | | `apprepository.syncImage.registry` | Kubeapps Asset Syncer image registry | `docker.io` | | `apprepository.syncImage.repository` | Kubeapps Asset Syncer image repository | `kubeapps/asset-syncer` | -| `apprepository.syncImage.tag` | Kubeapps Asset Syncer image tag (immutable tags are recommended) | `2.7.0-scratch-r0` | +| `apprepository.syncImage.tag` | Kubeapps Asset Syncer image tag (immutable tags are recommended) | `latest` | | `apprepository.syncImage.digest` | Kubeapps Asset Syncer image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `apprepository.syncImage.pullPolicy` | Kubeapps Asset Syncer image pull policy | `IfNotPresent` | | `apprepository.syncImage.pullSecrets` | Kubeapps Asset Syncer image pull secrets | `[]` | @@ -341,7 +340,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `authProxy.enabled` | Specifies whether Kubeapps should configure OAuth login/logout | `false` | | `authProxy.image.registry` | OAuth2 Proxy image registry | `docker.io` | | `authProxy.image.repository` | OAuth2 Proxy image repository | `bitnami/oauth2-proxy` | -| `authProxy.image.tag` | OAuth2 Proxy image tag (immutable tags are recommended) | `7.4.0-debian-11-r59` | +| `authProxy.image.tag` | OAuth2 Proxy image tag (immutable tags are recommended) | `latest` | | `authProxy.image.digest` | OAuth2 Proxy image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `authProxy.image.pullPolicy` | OAuth2 Proxy image pull policy | `IfNotPresent` | | `authProxy.image.pullSecrets` | OAuth2 Proxy image pull secrets | `[]` | @@ -381,7 +380,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `pinnipedProxy.enabled` | Specifies whether Kubeapps should configure Pinniped Proxy | `false` | | `pinnipedProxy.image.registry` | Pinniped Proxy image registry | `docker.io` | | `pinnipedProxy.image.repository` | Pinniped Proxy image repository | `kubeapps/pinniped-proxy` | -| `pinnipedProxy.image.tag` | Pinniped Proxy image tag (immutable tags are recommended) | `2.7.0-debian-11-r0` | +| `pinnipedProxy.image.tag` | Pinniped Proxy image tag (immutable tags are recommended) | `latest` | | `pinnipedProxy.image.digest` | Pinniped Proxy image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `pinnipedProxy.image.pullPolicy` | Pinniped Proxy image pull policy | `IfNotPresent` | | `pinnipedProxy.image.pullSecrets` | Pinniped Proxy image pull secrets | `[]` | @@ -461,7 +460,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `kubeappsapis.pluginConfig.resources.packages.v1alpha1.trustedNamespaces.headerPattern` | Optional header pattern for trusted namespaces | `""` | | `kubeappsapis.image.registry` | Kubeapps-APIs image registry | `docker.io` | | `kubeappsapis.image.repository` | Kubeapps-APIs image repository | `kubeapps/kubeapps-apis` | -| `kubeappsapis.image.tag` | Kubeapps-APIs image tag (immutable tags are recommended) | `2.7.0-debian-11-r0` | +| `kubeappsapis.image.tag` | Kubeapps-APIs image tag (immutable tags are recommended) | `latest` | | `kubeappsapis.image.digest` | Kubeapps-APIs image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `kubeappsapis.image.pullPolicy` | Kubeapps-APIs image pull policy | `IfNotPresent` | | `kubeappsapis.image.pullSecrets` | Kubeapps-APIs image pull secrets | `[]` | diff --git a/chart/kubeapps/templates/kubeappsapis/deployment.yaml b/chart/kubeapps/templates/kubeappsapis/deployment.yaml index 471e58e2cdc..51b4229d5ed 100644 --- a/chart/kubeapps/templates/kubeappsapis/deployment.yaml +++ b/chart/kubeapps/templates/kubeappsapis/deployment.yaml @@ -181,18 +181,20 @@ spec: {{- if .Values.kubeappsapis.customLivenessProbe }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customLivenessProbe "context" $) | nindent 12 }} {{- else if .Values.kubeappsapis.livenessProbe.enabled }} + # Replace with the built-in gRPC container probes once we're + # supporting >= 1.24 only. https://kubernetes.io/blog/2022/05/13/grpc-probes-now-in-beta livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.livenessProbe "enabled") "context" $) | nindent 12 }} - httpGet: - path: /core/plugins/v1alpha1/configured-plugins - port: grpc-http + exec: + command: ["/bin/grpc_health_probe", "-addr=:{{ .Values.kubeappsapis.containerPorts.http }}"] + initialDelaySeconds: 10 {{- end }} {{- if .Values.kubeappsapis.customReadinessProbe }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customReadinessProbe "context" $) | nindent 12 }} {{- else if .Values.kubeappsapis.readinessProbe.enabled }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.readinessProbe "enabled") "context" $) | nindent 12 }} - httpGet: - path: /core/plugins/v1alpha1/configured-plugins - port: grpc-http + exec: + command: ["/bin/grpc_health_probe", "-addr=:{{ .Values.kubeappsapis.containerPorts.http }}"] + initialDelaySeconds: 5 {{- end }} {{- if .Values.kubeappsapis.customStartupProbe }} startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customStartupProbe "context" $) | nindent 12 }} diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml index f109b9f16c1..15f7b0516d5 100644 --- a/chart/kubeapps/values.yaml +++ b/chart/kubeapps/values.yaml @@ -524,7 +524,7 @@ dashboard: image: registry: docker.io repository: kubeapps/dashboard - tag: 2.7.0-debian-11-r0 + tag: latest digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -831,7 +831,7 @@ apprepository: image: registry: docker.io repository: kubeapps/apprepository-controller - tag: 2.7.0-scratch-r0 + tag: latest digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -858,7 +858,7 @@ apprepository: syncImage: registry: docker.io repository: kubeapps/asset-syncer - tag: 2.7.0-scratch-r0 + tag: latest digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1142,7 +1142,7 @@ authProxy: image: registry: docker.io repository: bitnami/oauth2-proxy - tag: 7.4.0-debian-11-r59 + tag: latest digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1280,7 +1280,7 @@ pinnipedProxy: image: registry: docker.io repository: kubeapps/pinniped-proxy - tag: 2.7.0-debian-11-r0 + tag: latest digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1573,7 +1573,7 @@ kubeappsapis: image: registry: docker.io repository: kubeapps/kubeapps-apis - tag: 2.7.0-debian-11-r0 + tag: latest digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' From 23f82bb8ab3b2f3bbe39251825562934b833ecd6 Mon Sep 17 00:00:00 2001 From: Michael Nelson Date: Wed, 26 Apr 2023 06:41:24 +1000 Subject: [PATCH 3/4] Fix oauth2-proxy tag updated to latest by mistake. Signed-off-by: Michael Nelson --- chart/kubeapps/README.md | 2 +- chart/kubeapps/templates/kubeappsapis/deployment.yaml | 2 +- chart/kubeapps/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md index a0e658e5689..81f86a28c3e 100644 --- a/chart/kubeapps/README.md +++ b/chart/kubeapps/README.md @@ -340,7 +340,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith | `authProxy.enabled` | Specifies whether Kubeapps should configure OAuth login/logout | `false` | | `authProxy.image.registry` | OAuth2 Proxy image registry | `docker.io` | | `authProxy.image.repository` | OAuth2 Proxy image repository | `bitnami/oauth2-proxy` | -| `authProxy.image.tag` | OAuth2 Proxy image tag (immutable tags are recommended) | `latest` | +| `authProxy.image.tag` | OAuth2 Proxy image tag (immutable tags are recommended) | `7.4.0-debian-11-r59` | | `authProxy.image.digest` | OAuth2 Proxy image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `authProxy.image.pullPolicy` | OAuth2 Proxy image pull policy | `IfNotPresent` | | `authProxy.image.pullSecrets` | OAuth2 Proxy image pull secrets | `[]` | diff --git a/chart/kubeapps/templates/kubeappsapis/deployment.yaml b/chart/kubeapps/templates/kubeappsapis/deployment.yaml index 51b4229d5ed..f36c2d2c42c 100644 --- a/chart/kubeapps/templates/kubeappsapis/deployment.yaml +++ b/chart/kubeapps/templates/kubeappsapis/deployment.yaml @@ -182,7 +182,7 @@ spec: livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customLivenessProbe "context" $) | nindent 12 }} {{- else if .Values.kubeappsapis.livenessProbe.enabled }} # Replace with the built-in gRPC container probes once we're - # supporting >= 1.24 only. https://kubernetes.io/blog/2022/05/13/grpc-probes-now-in-beta + # supporting >= 1.24 only. https://kubernetes.io/blog/2022/05/13/grpc-probes-now-in-beta/ livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.livenessProbe "enabled") "context" $) | nindent 12 }} exec: command: ["/bin/grpc_health_probe", "-addr=:{{ .Values.kubeappsapis.containerPorts.http }}"] diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml index 15f7b0516d5..11cc43d8e19 100644 --- a/chart/kubeapps/values.yaml +++ b/chart/kubeapps/values.yaml @@ -1142,7 +1142,7 @@ authProxy: image: registry: docker.io repository: bitnami/oauth2-proxy - tag: latest + tag: 7.4.0-debian-11-r59 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' From 9f486122791da962ebbb15b2a9f3234441cc18b3 Mon Sep 17 00:00:00 2001 From: Michael Nelson Date: Wed, 26 Apr 2023 06:54:58 +1000 Subject: [PATCH 4/4] Update minimum helm cli to 3.8 with OCI support. Signed-off-by: Michael Nelson --- .github/workflows/kubeapps-general.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml index 8f4422b32e4..8a01542a205 100644 --- a/.github/workflows/kubeapps-general.yaml +++ b/.github/workflows/kubeapps-general.yaml @@ -36,8 +36,8 @@ env: README_GENERATOR_REPO: "bitnami-labs/readme-generator-for-helm" DOCKER_REGISTRY_VERSION: "2.8.1" GOLANG_VERSION: "1.19.8" - HELM_VERSION_MIN: "v3.2.0" - HELM_VERSION_STABLE: "v3.11.0" + HELM_VERSION_MIN: "v3.8.0" + HELM_VERSION_STABLE: "v3.11.3" GITHUB_VERSION: "2.27.0" IMAGES_TO_PUSH: "apprepository-controller dashboard asset-syncer pinniped-proxy kubeapps-apis" # IMG_DEV_TAG is the tags used for the Kubeapps docker images. Ideally there should be an IMG_PROD_TAG