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

Release consolidated chart as kong 3.0.0-rc1 #1105

Open
wants to merge 14 commits into
base: release/kong-3.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 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
4 changes: 0 additions & 4 deletions .github/workflows/release-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
matrix:
chart-name:
- kong
- ingress
- gateway-operator
steps:
- name: Checkout
Expand Down Expand Up @@ -93,7 +92,6 @@ jobs:
- "1.30.0"
chart-name:
- kong
- ingress
- gateway-operator
steps:
- name: Checkout
Expand Down Expand Up @@ -135,7 +133,6 @@ jobs:
- "3.2"
chart-name:
- kong
- ingress
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -174,7 +171,6 @@ jobs:
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo add kong https://charts.konghq.com
helm dependency build charts/kong
helm dependency build charts/ingress

- name: run golden tests
run: make test.golden
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
matrix:
chart-name:
- kong
- ingress
- gateway-operator
steps:
- name: Checkout
Expand Down
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ lint.shellcheck:

.PHONY: test.golden
test.golden:
@ $(MAKE) _chartsnap.kong && $(MAKE) _chartsnap.ingress || \
@ $(MAKE) _chartsnap.kong || \
(echo "$$GOLDEN_TEST_FAILURE_MSG" && exit 1)

.PHONY: test.golden.update
test.golden.update:
@ $(MAKE) _chartsnap.kong CHARTSNAP_ARGS="-u"
@ $(MAKE) _chartsnap.ingress CHARTSNAP_ARGS="-u"

# Defining multi-line strings to echo: https://stackoverflow.com/a/649462/7958339
define GOLDEN_TEST_FAILURE_MSG
Expand All @@ -50,13 +49,7 @@ _chartsnap.kong:
@ $(MAKE) _chartsnap GOLDEN_TEST_CHART=kong GOLDEN_TEST_CHART_VALUES_DIR=./charts/kong/ci/ \
CHARTSNAP_ARGS=$(CHARTSNAP_ARGS)

.PHONY: _chartsnap.ingress
_chartsnap.ingress:
@ $(MAKE) _chartsnap GOLDEN_TEST_CHART=ingress GOLDEN_TEST_CHART_VALUES_DIR=./charts/ingress/ci/ \
CHARTSNAP_ARGS=$(CHARTSNAP_ARGS)

.PHONY: _chartsnap
_chartsnap: chartsnap
@ helm repo update
@ helm dependencies update charts/ingress
@ helm chartsnap -c ./charts/$(GOLDEN_TEST_CHART) -f $(GOLDEN_TEST_CHART_VALUES_DIR) $(CHARTSNAP_ARGS)
7 changes: 7 additions & 0 deletions charts/ingress/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

The 3.x `kong` chart consolidates the functionality provided by the `ingress`
and 2.x `kong` charts into a single chart. `ingress` users should upgrade to
`kong` 3.x following the [upgrade guide](https://github.com/Kong/charts/blob/main/charts/kong/UPGRADE.md#300).
The 3.x `kong` chart is currently a release candidate. The `kong` chart
[changelog](https://github.com/Kong/charts/blob/main/charts/kong/CHANGELOG.md)
will track updates in preparation for a final release.

## 0.12.0

### Improvements
Expand Down
9 changes: 0 additions & 9 deletions charts/ingress/Chart.lock

This file was deleted.

23 changes: 0 additions & 23 deletions charts/ingress/Chart.yaml

This file was deleted.

21 changes: 4 additions & 17 deletions charts/ingress/README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
## Kong Ingress Controller
# Migrate to consolidated chart

[Kong for Kubernetes](https://github.com/Kong/kubernetes-ingress-controller)
is an open-source Ingress Controller for Kubernetes that offers
API management capabilities with a plugin architecture.
The 3.x `kong` chart consolidates the functionality provided by the `ingress`

This is a meta chart that deploys an opinionated Kong Ingress Controller with
Kong Gateway using [Helm](https://helm.sh) package manager.

## Usage

```bash
helm repo add kong https://charts.konghq.com
helm repo update

helm install kong kong/ingress -n kong
```

If you need more control over what is deployed, see the [kong/kong chart](https://github.com/Kong/charts/blob/main/charts/kong/README.md). Any `values.yaml` setting can be specified in the `controller` or `gateway` section of your `values.yaml` using this chart.
and 2.x `kong` charts into a single chart. `ingress` users should upgrade to
`kong` 3.x following the [upgrade guide](https://github.com/Kong/charts/blob/main/charts/kong/UPGRADE.md#300).
40 changes: 0 additions & 40 deletions charts/ingress/ci/.chartsnap.yaml

This file was deleted.

Loading
Loading