Release consolidated chart as kong 3.0.0-rc1

.github/workflows/release-pr.yaml

@@ -42,7 +42,6 @@ jobs:
       matrix:
         chart-name:
           - kong
-          - ingress
           - gateway-operator
     steps:
       - name: Checkout
@@ -93,7 +92,6 @@ jobs:
           - "1.30.0"
         chart-name:
           - kong
-          - ingress
           - gateway-operator
     steps:
       - name: Checkout
@@ -135,7 +133,6 @@ jobs:
           - "3.2"
         chart-name:
           - kong
-          - ingress
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -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

.github/workflows/release-push.yaml

@@ -14,7 +14,6 @@ jobs:
       matrix:
         chart-name:
           - kong
-          - ingress
           - gateway-operator
     steps:
       - name: Checkout

Makefile

@@ -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
@@ -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)

charts/ingress/CHANGELOG.md

@@ -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

charts/ingress/README.md

@@ -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).