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 7.3.1) #3319

Merged
merged 2 commits into from
Aug 27, 2021
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions chart/kubeapps/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ dependencies:
version: 1.8.0
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.9.3
version: 10.9.4
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 14.8.11
digest: sha256:9662a5adfb8a36dc08b3c7cfdbcc71d55ef796c7b563f500070a17942ac34408
generated: "2021-08-24T22:52:22.712559871+02:00"
version: 15.0.1
digest: sha256:1f04423073d4a65192c94e188f23e3e1ee5eab39988a2b747ab4d5589129d4f8
generated: "2021-08-26T15:20:41.709491535Z"
4 changes: 2 additions & 2 deletions chart/kubeapps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
# other plugins only.
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 14.x.x
version: 15.x.x
condition: redis.enabled
description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
home: https://kubeapps.com
Expand All @@ -33,4 +33,4 @@ maintainers:
name: kubeapps
sources:
- https://github.com/kubeapps/kubeapps
version: 7.3.0-dev0
version: 7.3.2-dev0
28 changes: 17 additions & 11 deletions chart/kubeapps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,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.21.1-debian-10-r24` |
| `frontend.image.tag` | NGINX image tag (immutable tags are recommended) | `1.21.1-debian-10-r46` |
| `frontend.image.pullPolicy` | NGINX image pull policy | `IfNotPresent` |
| `frontend.image.pullSecrets` | NGINX image pull secrets | `[]` |
| `frontend.image.debug` | Enable image debug mode | `false` |
Expand Down Expand Up @@ -392,7 +392,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.1.3-debian-10-r79` |
| `authProxy.image.tag` | OAuth2 Proxy image tag (immutable tags are recommended) | `7.1.3-debian-10-r100` |
| `authProxy.image.pullPolicy` | OAuth2 Proxy image pull policy | `IfNotPresent` |
| `authProxy.image.pullSecrets` | OAuth2 Proxy image pull secrets | `[]` |
| `authProxy.external` | Use an external Auth Proxy instead of deploying its own one | `false` |
Expand Down Expand Up @@ -451,7 +451,7 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
| `rbac.create` | Specifies whether RBAC resources should be created | `true` |
| `testImage.registry` | NGINX image registry | `docker.io` |
| `testImage.repository` | NGINX image repository | `bitnami/nginx` |
| `testImage.tag` | NGINX image tag (immutable tags are recommended) | `1.21.1-debian-10-r24` |
| `testImage.tag` | NGINX image tag (immutable tags are recommended) | `1.21.1-debian-10-r46` |
| `testImage.pullPolicy` | NGINX image pull policy | `IfNotPresent` |
| `testImage.pullSecrets` | NGINX image pull secrets | `[]` |

Expand Down Expand Up @@ -486,8 +486,8 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
| `kubeappsapis.replicaCount` | Number of frontend replicas to deploy | `1` |
| `kubeappsapis.terminationGracePeriodSeconds` | The grace time period for sig term | `300` |
| `kubeappsapis.extraEnvVars` | Array with extra environment variables to add to the KubeappsAPIs container | `[]` |
| `kubeappsapis.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for the KubeappsAPIs container | `nil` |
| `kubeappsapis.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for the KubeappsAPIs container | `nil` |
| `kubeappsapis.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for the KubeappsAPIs container | `""` |
| `kubeappsapis.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for the KubeappsAPIs container | `""` |
| `kubeappsapis.containerPort` | KubeappsAPIs HTTP container port | `50051` |
| `kubeappsapis.resources.limits.cpu` | The CPU limits for the KubeappsAPIs container | `250m` |
| `kubeappsapis.resources.limits.memory` | The memory limits for the KubeappsAPIs container | `256Mi` |
Expand All @@ -498,13 +498,13 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
| `kubeappsapis.containerSecurityContext.enabled` | Enabled KubeappsAPIs containers' Security Context | `true` |
| `kubeappsapis.containerSecurityContext.runAsUser` | Set KubeappsAPIs container's Security Context runAsUser | `1001` |
| `kubeappsapis.containerSecurityContext.runAsNonRoot` | Set KubeappsAPIs container's Security Context runAsNonRoot | `true` |
| `kubeappsapis.livenessProbe.enabled` | Enable livenessProbe | `false` |
| `kubeappsapis.livenessProbe.enabled` | Enable livenessProbe | `true` |
| `kubeappsapis.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `60` |
| `kubeappsapis.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` |
| `kubeappsapis.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` |
| `kubeappsapis.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `6` |
| `kubeappsapis.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` |
| `kubeappsapis.readinessProbe.enabled` | Enable readinessProbe | `false` |
| `kubeappsapis.readinessProbe.enabled` | Enable readinessProbe | `true` |
| `kubeappsapis.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `0` |
| `kubeappsapis.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` |
| `kubeappsapis.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `5` |
Expand All @@ -523,13 +523,19 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
| `kubeappsapis.affinity` | Affinity for pod assignment | `{}` |
| `kubeappsapis.nodeSelector` | Node labels for pod assignment | `{}` |
| `kubeappsapis.tolerations` | Tolerations for pod assignment | `[]` |
| `kubeappsapis.priorityClassName` | Priority class name for KubeappsAPIs pods | `nil` |
| `kubeappsapis.priorityClassName` | Priority class name for KubeappsAPIs pods | `""` |
| `kubeappsapis.hostAliases` | Custom host aliases for KubeappsAPIs pods | `[]` |
| `kubeappsapis.service.port` | KubeappsAPIs service HTTP port | `8080` |
| `kubeappsapis.service.annotations` | Additional custom annotations for KubeappsAPIs service | `{}` |
| `redis.redisPassword` | Password used in Redis™ | `""` |
| `redis.enabled` | Enable the redis deployment when deploying Kubeapps APIs. | `false` |
| `redis.replica.replicaCount` | Number of Redis™ replicas to deploy | `0` |


### Redis™ chart configuration

| Name | Description | Value |
| ---------------------------- | ---------------------------------------------------------------- | ------- |
| `redis.redisPassword` | Password used in Redis™ | `""` |
| `redis.enabled` | Enable the Redis™ deployment when deploying Kubeapps APIs. | `false` |
| `redis.replica.replicaCount` | Number of Redis™ replicas to deploy | `0` |


Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
Expand Down
17 changes: 9 additions & 8 deletions chart/kubeapps/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ frontend:
image:
registry: docker.io
repository: bitnami/nginx
tag: 1.21.1-debian-10-r24
tag: 1.21.1-debian-10-r46
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down Expand Up @@ -1260,7 +1260,7 @@ authProxy:
image:
registry: docker.io
repository: bitnami/oauth2-proxy
tag: 7.1.3-debian-10-r79
tag: 7.1.3-debian-10-r100
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down Expand Up @@ -1479,7 +1479,7 @@ rbac:
testImage:
registry: docker.io
repository: bitnami/nginx
tag: 1.21.1-debian-10-r24
tag: 1.21.1-debian-10-r46
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down Expand Up @@ -1593,10 +1593,10 @@ kubeappsapis:
extraEnvVars: []
## @param kubeappsapis.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for the KubeappsAPIs container
##
extraEnvVarsCM:
extraEnvVarsCM: ""
## @param kubeappsapis.extraEnvVarsSecret Name of existing Secret containing extra env vars for the KubeappsAPIs container
##
extraEnvVarsSecret:
extraEnvVarsSecret: ""
## @param kubeappsapis.containerPort KubeappsAPIs HTTP container port
##
containerPort: 50051
Expand Down Expand Up @@ -1729,7 +1729,7 @@ kubeappsapis:
tolerations: []
## @param kubeappsapis.priorityClassName Priority class name for KubeappsAPIs pods
##
priorityClassName:
priorityClassName: ""
## @param kubeappsapis.hostAliases Custom host aliases for KubeappsAPIs pods
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
Expand All @@ -1743,15 +1743,16 @@ kubeappsapis:
## @param kubeappsapis.service.annotations Additional custom annotations for KubeappsAPIs service
##
annotations: {}
## Redis™ chart configuration

## @section Redis™ chart configuration
## ref: https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml
##
redis:
## @param redis.redisPassword Password used in Redis™
## ref: https://github.com/bitnami/bitnami-docker-redis/blob/master/README.md#setting-the-server-password-on-first-run
##
redisPassword: ""
## @param redis.enabled Enable the redis deployment when deploying Kubeapps APIs.
## @param redis.enabled Enable the Redis™ deployment when deploying Kubeapps APIs.
## We currently have the situation that Redis is required for the fluxv2 plugin only.
## Until such a point that we're releasing with the fluxv2 plugin enabled, or the
## plugin cache support has been generalised so all plugins use Redis, we'll need
Expand Down