Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync chart with bitnami/kubeapps chart (version 12.3.1) #6224

Merged
merged 4 commits into from
Apr 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/kubeapps-general.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions chart/kubeapps/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 4 additions & 4 deletions chart/kubeapps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,4 +32,4 @@ maintainers:
name: kubeapps
sources:
- https://github.com/vmware-tanzu/kubeapps
version: 12.2.10-dev0
version: 12.3.2-dev0
28 changes: 13 additions & 15 deletions chart/kubeapps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,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.
Expand Down Expand Up @@ -43,8 +42,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.
Expand Down Expand Up @@ -111,7 +109,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 | `[]` |
Expand Down Expand Up @@ -342,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-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 | `[]` |
Expand Down Expand Up @@ -553,15 +551,15 @@ 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.

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
Expand Down Expand Up @@ -652,7 +650,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.
Expand Down Expand Up @@ -716,7 +714,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 \
Expand All @@ -738,7 +736,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 \
Expand All @@ -749,7 +747,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" \
Expand Down Expand Up @@ -866,7 +864,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
Expand Down Expand Up @@ -909,7 +907,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:
Expand Down Expand Up @@ -970,7 +968,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)
Expand Down
4 changes: 2 additions & 2 deletions chart/kubeapps/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down