Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-09 07:27:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/kong] feat!: 💥 Bump cassandra chart to 9.x. (#8527)

Browse Source 
* [bitnami/kong] feat!: 💥 Bump cassandra chart to 9.x.

* [bitnami/kong] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Javier J. Salmerón-García
2021-12-29 16:31:14 +01:00
committed by GitHub
parent 0ba75dcf99
commit 69a875748e
6 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/kong/Chart.lock
View File

@@ -1,12 +1,12 @@
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.13.9
version: 10.14.0
- name: cassandra
repository: https://charts.bitnami.com/bitnami
version: 8.0.6
version: 9.0.10
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.10.3
digest: sha256:b3259d3bbb64000b0f1df64b451de9ab7e69f044865ecbee0a4829075ebead52
generated: "2021-12-01T12:32:42.050814365Z"
digest: sha256:028d5a6d0b0aac7ed51907ec224ddd0eabd5cf165a02ac6713c1580908220c5e
generated: "2021-12-29T13:46:59.238664+01:00"

6
bitnami/kong/Chart.yaml
View File

@@ -1,7 +1,7 @@
annotations:
category: Infrastructure
apiVersion: v2
appVersion: 2.6.0
appVersion: 2.7.0
dependencies:
- condition: postgresql.enabled
name: postgresql
@@ -10,7 +10,7 @@ dependencies:
- condition: cassandra.enabled
name: cassandra
repository: https://charts.bitnami.com/bitnami
version: 8.x.x
version: 9.x.x
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.x.x
@@ -34,4 +34,4 @@ name: kong
sources:
- https://github.com/bitnami/bitnami-docker-kong
- https://konghq.com/
version: 4.1.11
version: 5.0.0

16
bitnami/kong/README.md
View File

@@ -52,7 +52,6 @@ To uninstall/delete the `my-release` deployment:
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` |
### Common parameters
| Name | Description | Value |
@@ -68,7 +67,6 @@ To uninstall/delete the `my-release` deployment:
| `diagnosticMode.command` | Command to override all containers in the deployment | `["sleep"]` |
| `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` |
### Deployment parameters
| Name | Description | Value |
@@ -109,7 +107,6 @@ To uninstall/delete the `my-release` deployment:
| `pdb.enabled` | Deploy a pdb object for the Kong pod | `false` |
| `pdb.maxUnavailable` | Maximum unavailable Kong replicas (expressed in percentage) | `50%` |
### Traffic Exposure Parameters
| Name | Description | Value |
@@ -142,7 +139,6 @@ To uninstall/delete the `my-release` deployment:
| `ingress.extraTls` | The tls configuration for additional hostnames to be covered with this ingress record. | `[]` |
| `ingress.secrets` | If you're providing your own certificates, please use this to add the certificates as secrets | `[]` |
### Kong Container Parameters
| Name | Description | Value |
@@ -173,7 +169,6 @@ To uninstall/delete the `my-release` deployment:
| `kong.resources.limits` | The resources limits for the container | `{}` |
| `kong.resources.requests` | The requested resources for the container | `{}` |
### Kong Migration job Parameters
| Name | Description | Value |
@@ -189,7 +184,6 @@ To uninstall/delete the `my-release` deployment:
| `migration.resources.limits` | The resources limits for the container | `{}` |
| `migration.resources.requests` | The requested resources for the container | `{}` |
### Kong Ingress Controller Container Parameters
| Name | Description | Value |
@@ -228,7 +222,6 @@ To uninstall/delete the `my-release` deployment:
| `ingressController.resources.limits` | The resources limits for the container | `{}` |
| `ingressController.resources.requests` | The requested resources for the container | `{}` |
### PostgreSQL Parameters
| Name | Description | Value |
@@ -242,7 +235,6 @@ To uninstall/delete the `my-release` deployment:
| `postgresql.postgresqlDatabase` | Database name to be used by Kong | `kong` |
| `postgresql.postgresqlUsername` | Username to be created by the PostgreSQL bundled chart | `kong` |
### Cassandra Parameters
| Name | Description | Value |
@@ -256,7 +248,6 @@ To uninstall/delete the `my-release` deployment:
| `cassandra.external.password` | Password of the external cassandra installation | `""` |
| `cassandra.existingSecret` | Use an existing secret file with the Cassandra password (can be used with the bundled chart or with an existing installation) | `""` |
### Metrics Parameters
| Name | Description | Value |
@@ -273,7 +264,6 @@ To uninstall/delete the `my-release` deployment:
| `metrics.serviceMonitor.selector` | Prometheus instance selector labels | `{}` |
| `metrics.serviceMonitor.rbac.enabled` | Whether to enable RBAC | `true` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
```console
@@ -452,6 +442,12 @@ $ helm upgrade my-release bitnami/kong \
> Note: you need to substitute the placeholders _[POSTGRESQL_PASSWORD]_ with the values obtained from instructions in the installation notes.
### To 5.0.0
The `cassandra` sub-chart was upgraded to `9.x.x`. Several values of the sub-chart were changed, so please check the [upgrade notes](https://github.com/bitnami/charts/tree/master/bitnami/cassandra#to-900).
No issues are expected during the upgrade.
### To 3.1.0
Kong Ingress Controller version was bumped to new major version, `1.x.x`. The associated CRDs were updated accordingly.

15
bitnami/kong/templates/_helpers.tpl
View File

@@ -56,7 +56,7 @@ Get Cassandra contact points
{{- define "kong.cassandra.contactPoints" -}}
{{- $global := . -}}
{{- if .Values.cassandra.enabled -}}
{{- $replicas := int .Values.cassandra.cluster.replicaCount -}}
{{- $replicas := int .Values.cassandra.replicaCount -}}
{{- $domain := .Values.clusterDomain -}}
{{- range $i, $e := until $replicas }}
{{- include "kong.cassandra.fullname" $global }}-{{ $i }}.{{ include "kong.cassandra.fullname" $global }}-headless.{{ $global.Release.Namespace }}.svc.{{ $domain }}
@@ -168,6 +168,7 @@ Validate values for kong.
{{- $messages := list -}}
{{- $messages := append $messages (include "kong.validateValues.database" .) -}}
{{- $messages := append $messages (include "kong.validateValues.rbac" .) -}}
{{- $messages := append $messages (include "kong.validateValues.ingressController" .) -}}
{{- $messages := without $messages "" -}}
{{- $message := join "\n" $messages -}}
@@ -204,7 +205,6 @@ NO DATABASE: You disabled the Cassandra sub-chart but did not specify external C
NO DATABASE: You disabled the PostgreSQL sub-chart but did not specify an external PostgreSQL host. Either deploy the PostgreSQL sub-chart by setting postgresql.enabled=true or set a value for postgresql.external.host.
{{- end }}
{{- if and (eq .Values.database "postgresql") .Values.postgresql.enabled .Values.postgresql.external.host -}}
CONFLICT: You specified to deploy the PostgreSQL sub-chart and also specified an external
PostgreSQL instance. Only one of postgresql.enabled (deploy sub-chart) and postgresql.external.host can be set
@@ -215,3 +215,14 @@ CONFLICT: You specified to deploy the Cassandra sub-chart and also specified ext
Cassandra hosts. Only one of cassandra.enabled (deploy sub-chart) and cassandra.external.hosts can be set
{{- end }}
{{- end -}}
{{/*
Function to validate the ingress controller
*/}}
{{- define "kong.validateValues.ingressController" -}}
{{- if (and (eq .Values.database "cassandra") .Values.ingressController.enabled) -}}
INGRESS AND CASANDRA: Cassandra-backed deployments of Kong managed by Kong Ingress Controller are no longer supported. You must migrate to a Postgres-backed deployment or disable Kong Ingress Controller.
{{- end }}
{{- end -}}

2
bitnami/kong/templates/migrate-job.yaml
View File

@@ -46,6 +46,8 @@ spec:
env:
- name: KONG_MIGRATE
value: "yes"
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }}
- name: KONG_EXIT_AFTER_MIGRATE
value: "yes"
{{- if (eq .Values.database "postgresql") }}

4
bitnami/kong/values.yaml
View File

@@ -69,7 +69,7 @@ diagnosticMode:
image:
registry: docker.io
repository: bitnami/kong
tag: 2.6.0-debian-10-r58
tag: 2.7.0-debian-10-r0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -542,7 +542,7 @@ ingressController:
image:
registry: docker.io
repository: bitnami/kong-ingress-controller
tag: 1.3.1-debian-10-r163
tag: 1.3.1-debian-10-r191
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images