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.

Sign up for GitHub

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 with kong-2.33.1 #335

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Sync with kong-2.33.1 #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

## [Unreleased]

### Changes

- Align with upstream chart version [2.33.1](https://github.com/Kong/charts/releases/tag/kong-2.33.1) ([Changes in upstream repository](https://github.com/Kong/charts/compare/kong-2.33.0...kong-2.33.1))

## [3.6.0] - 2023-12-07

### Changes
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Giant Swarm offers a Kong Managed App which can be installed in workload cluster

| Giant Swarm Chart Release | Upstream Chart Release | Kong Version | Kong IC Version | Kong-Gateway Enterprise container tag |
| --- | --- | --- | --- | --- |
| Unreleased | [2.33.0](https://github.com/Kong/charts/blob/main/charts/kong/CHANGELOG.md#2330) | [3.5.0](https://github.com/Kong/kong/blob/3.5.0/changelog/3.5.0/3.5.0.md) | [3.0.1](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md#301) | 3.5.0.1-debian |
| Unreleased | [2.33.1](https://github.com/Kong/charts/blob/main/charts/kong/CHANGELOG.md#2331) | [3.5.0](https://github.com/Kong/kong/blob/3.5.0/changelog/3.5.0/3.5.0.md) | [3.0.1](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md#301) | 3.5.0.1-debian |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is Kong-Gateway Enterprise container tag taken from?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kong announces new versions in the gateway changelog: https://docs.konghq.com/gateway/changelog/#3501
We then manually add the debian variant to retagger: https://github.com/giantswarm/retagger/blob/main/images/skopeo-docker-io.yaml#L73

| [v3.6.0](https://github.com/giantswarm/kong-app/blob/main/CHANGELOG.md#360---2023-12-07) | [2.33.0](https://github.com/Kong/charts/blob/main/charts/kong/CHANGELOG.md#2330) | [3.5.0](https://github.com/Kong/kong/blob/3.5.0/changelog/3.5.0/3.5.0.md) | [3.0.1](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md#301) | 3.5.0.1-debian |
| [v3.5.0](https://github.com/giantswarm/kong-app/blob/main/CHANGELOG.md#350---2023-10-16) | [2.29.0](https://github.com/Kong/charts/blob/main/charts/kong/CHANGELOG.md#2290) | [3.4.2](https://github.com/Kong/kong/blob/3.4.2/CHANGELOG.md#342) | [2.12.0](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md#2111) | 3.4.1.1-debian |
| [v3.4.0](https://github.com/giantswarm/kong-app/blob/main/CHANGELOG.md#340---2023-08-22) | [2.23.0](https://github.com/Kong/charts/blob/main/charts/kong/CHANGELOG.md#2230) | [3.3.1](https://github.com/Kong/kong/blob/3.3.1/CHANGELOG.md#331) | [2.10.4](https://github.com/Kong/kubernetes-ingress-controller/blob/v2.10.4/CHANGELOG.md#2103) | 3.3.1.0-debian |
Expand Down
9 changes: 9 additions & 0 deletions helm/kong-app/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 2.33.1

### Fixed

* Use changed `incubator.ingress-controller.konghq.com` API group name in `KongServiceFacade`
RBAC rules. Refer to [KIC#5302](https://github.com/Kong/kubernetes-ingress-controller/pull/5302)
for rename reasoning.
[#968](https://github.com/Kong/charts/pull/968)

## 2.33.0

### Improvements
Expand Down
4 changes: 2 additions & 2 deletions helm/kong-app/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,15 +1266,15 @@ resource roles into their separate templates.
{{- if and (semverCompare ">= 3.1.0" (include "kong.effectiveVersion" .Values.ingressController.image))
(contains (print .Values.ingressController.env.feature_gates) "KongServiceFacade=true") }}
- apiGroups:
- incubator.konghq.com
- incubator.ingress-controller.konghq.com
resources:
- kongservicefacades
verbs:
- get
- list
- watch
- apiGroups:
- incubator.konghq.com
- incubator.ingress-controller.konghq.com
resources:
- kongservicefacades/status
verbs:
Expand Down
2 changes: 1 addition & 1 deletion helm/kong-app/templates/migrations-post-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
image: {{ include "kong.getRepoTag" .Values.image }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{ toYaml .Values.containerSecurityContext | nindent 10 }}
{{ toYaml .Values.containerSecurityContext | nindent 10 }}
env:
{{- include "kong.no_daemon_env" . | nindent 8 }}
args: [ "kong", "migrations", "finish" ]
Expand Down
2 changes: 1 addition & 1 deletion helm/kong-app/templates/migrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
image: {{ include "kong.getRepoTag" .Values.image }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{ toYaml .Values.containerSecurityContext | nindent 10 }}
{{ toYaml .Values.containerSecurityContext | nindent 10 }}
env:
{{- include "kong.no_daemon_env" . | nindent 8 }}
args: [ "kong", "migrations", "bootstrap" ]
Expand Down
4 changes: 2 additions & 2 deletions vendir.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ directories:
- contents:
- git:
commitTitle: Merge branch 'upstream-main'
sha: 1b5d16d55b1ed63f34eb8330c13b4a050d745989
sha: 8698c4742d4c2b6ffe6e909c2041493b8ee3fc30
tags:
- kong-2.33.0-71-g1b5d16d
- kong-2.33.1-69-g8698c47
path: kong
path: vendor
- contents:
Expand Down