From a3a2a8cb4d2af8b6ad35d1d4cca47f0d84051703 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 1 Jun 2025 14:38:12 +0200 Subject: [PATCH 1/7] feat: Support Kubernetes 1.33 --- .github/workflows/test.yml | 2 +- Makefile | 2 +- README.md | 2 +- test/setup/kind/v1.31/kind-config.yml | 4 ++-- test/setup/kind/v1.32/kind-config.yml | 4 ++-- test/setup/kind/{v1.30 => v1.33}/kind-config.yml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename test/setup/kind/{v1.30 => v1.33}/kind-config.yml (81%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6325f9e..3f5e2ad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: name: Integration Tests strategy: matrix: - k8s_version: [v1.30, v1.31, v1.32] + k8s_version: [v1.31, v1.32, v1.33] permissions: contents: read uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main diff --git a/Makefile b/Makefile index 7ccc1f1..e95c099 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION=v1.32 +K8S_VERSION=v1.33 # Build package configuration build: package diff --git a/README.md b/README.md index 474d193..2cc32b7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ A cloud native platform aimed at supporting application developers with paved pa ### Prerequisites -* Kubernetes 1.30+ +* Kubernetes 1.31+ * Carvel [`kctrl`](https://carvel.dev/kapp-controller/docs/latest/install/#installing-kapp-controller-cli-kctrl) CLI. * Carvel [kapp-controller](https://carvel.dev/kapp-controller) deployed in your Kubernetes cluster. You can install it with Carvel [`kapp`](https://carvel.dev/kapp/docs/latest/install) (recommended choice) or `kubectl`. diff --git a/test/setup/kind/v1.31/kind-config.yml b/test/setup/kind/v1.31/kind-config.yml index 03d6c08..9f396f7 100644 --- a/test/setup/kind/v1.31/kind-config.yml +++ b/test/setup/kind/v1.31/kind-config.yml @@ -3,9 +3,9 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.31.6 + image: kindest/node:v1.31.9 - role: worker - image: kindest/node:v1.31.6 + image: kindest/node:v1.31.9 extraPortMappings: - containerPort: 80 hostPort: 80 diff --git a/test/setup/kind/v1.32/kind-config.yml b/test/setup/kind/v1.32/kind-config.yml index 6fcbd02..3d935ae 100644 --- a/test/setup/kind/v1.32/kind-config.yml +++ b/test/setup/kind/v1.32/kind-config.yml @@ -3,9 +3,9 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.32.3 + image: kindest/node:v1.32.5 - role: worker - image: kindest/node:v1.32.3 + image: kindest/node:v1.32.5 extraPortMappings: - containerPort: 80 hostPort: 80 diff --git a/test/setup/kind/v1.30/kind-config.yml b/test/setup/kind/v1.33/kind-config.yml similarity index 81% rename from test/setup/kind/v1.30/kind-config.yml rename to test/setup/kind/v1.33/kind-config.yml index c4ce3f4..9ea11da 100644 --- a/test/setup/kind/v1.30/kind-config.yml +++ b/test/setup/kind/v1.33/kind-config.yml @@ -3,9 +3,9 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.30.8 + image: kindest/node:v1.33.1 - role: worker - image: kindest/node:v1.30.8 + image: kindest/node:v1.33.1 extraPortMappings: - containerPort: 80 hostPort: 80 From 24a7cf9eb740970be93ce67915998799b0d785e2 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 1 Jun 2025 14:40:20 +0200 Subject: [PATCH 2/7] deps: Update component dependencies --- package/config/components/cert-manager.yml | 2 +- package/config/components/contour.yml | 2 +- package/config/components/crossplane.yml | 2 +- package/config/components/dapr.yml | 2 +- package/config/components/dependency-track.yml | 2 +- package/config/components/developer-portal.yml | 2 +- package/config/components/flux.yml | 2 +- package/config/components/knative-serving.yml | 2 +- package/config/components/kyverno.yml | 2 +- package/config/components/postgresql-operator.yml | 2 +- package/config/components/rabbitmq-operator.yml | 2 +- package/config/components/secretgen-controller.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/config/components/cert-manager.yml b/package/config/components/cert-manager.yml index 2ef1927..4539d94 100644 --- a/package/config/components/cert-manager.yml +++ b/package/config/components/cert-manager.yml @@ -46,7 +46,7 @@ spec: packageRef: refName: cert-manager.packages.kadras.io versionSelection: - constraints: 1.17.1 + constraints: 1.17.2 prereleases: {} values: - secretRef: diff --git a/package/config/components/contour.yml b/package/config/components/contour.yml index 780611b..41d647b 100644 --- a/package/config/components/contour.yml +++ b/package/config/components/contour.yml @@ -33,7 +33,7 @@ spec: packageRef: refName: contour.packages.kadras.io versionSelection: - constraints: 1.30.3 + constraints: 1.32.0 values: - secretRef: name: contour-values diff --git a/package/config/components/crossplane.yml b/package/config/components/crossplane.yml index c4778dc..c3054e4 100644 --- a/package/config/components/crossplane.yml +++ b/package/config/components/crossplane.yml @@ -25,7 +25,7 @@ spec: packageRef: refName: crossplane.packages.kadras.io versionSelection: - constraints: 1.19.1 + constraints: 1.20.0 values: - secretRef: name: crossplane-values diff --git a/package/config/components/dapr.yml b/package/config/components/dapr.yml index 8bf2f72..decac6b 100644 --- a/package/config/components/dapr.yml +++ b/package/config/components/dapr.yml @@ -25,7 +25,7 @@ spec: packageRef: refName: dapr.packages.kadras.io versionSelection: - constraints: 1.15.3 + constraints: 1.15.5 values: - secretRef: name: dapr-values diff --git a/package/config/components/dependency-track.yml b/package/config/components/dependency-track.yml index 593620a..0344800 100644 --- a/package/config/components/dependency-track.yml +++ b/package/config/components/dependency-track.yml @@ -28,7 +28,7 @@ spec: packageRef: refName: dependency-track.packages.kadras.io versionSelection: - constraints: 4.12.7 + constraints: 4.13.2 values: - secretRef: name: dependency-track-values diff --git a/package/config/components/developer-portal.yml b/package/config/components/developer-portal.yml index 27116d7..9bd4fdf 100644 --- a/package/config/components/developer-portal.yml +++ b/package/config/components/developer-portal.yml @@ -26,7 +26,7 @@ spec: packageRef: refName: developer-portal.packages.kadras.io versionSelection: - constraints: 0.6.0 + constraints: 0.7.0 values: - secretRef: name: developer-portal-values diff --git a/package/config/components/flux.yml b/package/config/components/flux.yml index be1438b..c17076f 100644 --- a/package/config/components/flux.yml +++ b/package/config/components/flux.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: flux.packages.kadras.io versionSelection: - constraints: 2.5.1 + constraints: 2.6.0 values: - secretRef: name: flux-values diff --git a/package/config/components/knative-serving.yml b/package/config/components/knative-serving.yml index c65c935..85311d7 100644 --- a/package/config/components/knative-serving.yml +++ b/package/config/components/knative-serving.yml @@ -42,7 +42,7 @@ spec: packageRef: refName: knative-serving.packages.kadras.io versionSelection: - constraints: 1.17.0 + constraints: 1.18.0 values: - secretRef: name: knative-serving-values diff --git a/package/config/components/kyverno.yml b/package/config/components/kyverno.yml index 20948cd..9a110aa 100644 --- a/package/config/components/kyverno.yml +++ b/package/config/components/kyverno.yml @@ -31,7 +31,7 @@ spec: packageRef: refName: kyverno.packages.kadras.io versionSelection: - constraints: 1.13.4 + constraints: 1.14.1 values: - secretRef: name: kyverno-values diff --git a/package/config/components/postgresql-operator.yml b/package/config/components/postgresql-operator.yml index 96f221f..2a46af4 100644 --- a/package/config/components/postgresql-operator.yml +++ b/package/config/components/postgresql-operator.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: postgresql-operator.packages.kadras.io versionSelection: - constraints: 1.25.1 + constraints: 1.26.0 values: - secretRef: name: postgresql-operator-values diff --git a/package/config/components/rabbitmq-operator.yml b/package/config/components/rabbitmq-operator.yml index e8a60bf..b35c35d 100644 --- a/package/config/components/rabbitmq-operator.yml +++ b/package/config/components/rabbitmq-operator.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: rabbitmq-operator.packages.kadras.io versionSelection: - constraints: 2.12.1 + constraints: 2.13.0 values: - secretRef: name: rabbitmq-operator-values diff --git a/package/config/components/secretgen-controller.yml b/package/config/components/secretgen-controller.yml index 225f30b..5afa55b 100644 --- a/package/config/components/secretgen-controller.yml +++ b/package/config/components/secretgen-controller.yml @@ -23,7 +23,7 @@ spec: packageRef: refName: secretgen-controller.packages.kadras.io versionSelection: - constraints: 0.19.1 + constraints: 0.19.2 prereleases: {} values: - secretRef: From 57226e68f237fe8fc5ade1b1d427be867b8f2384 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 1 Jun 2025 14:48:19 +0200 Subject: [PATCH 3/7] feat: Simplified config for Dependency Track --- package/config/components/dependency-track.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/config/components/dependency-track.yml b/package/config/components/dependency-track.yml index 0344800..ac1ca54 100644 --- a/package/config/components/dependency-track.yml +++ b/package/config/components/dependency-track.yml @@ -7,6 +7,17 @@ #@ def compute_package_values(): #@ values = struct.decode(data.values.dependency_track) +#@ +#@ #! Compute values for Ingress Domain Name +#@ if data.values.platform.ingress.domain and (not hasattr(data.values.dependency_track, "domain_name") or not data.values.dependency_track.domain_name): +#@ values["domain_name"] = "dependency-track." + data.values.platform.ingress.domain +#@ end +#@ +#@ #! Compute values for Ingress Issuer +#@ if data.values.platform.ingress.issuer and (not hasattr(data.values.dependency_track, "ingress_issuer") or not data.values.dependency_track.ingress_issuer): +#@ values["ingress_issuer"] = get_issuer_name(data.values.platform.ingress.issuer) +#@ end +#@ #@ return struct.encode(values) #@ end From 1d06cf8d7128e384b2a949558c04e129aa7b148f Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 1 Jun 2025 14:52:23 +0200 Subject: [PATCH 4/7] fix: Add missing import --- package/config/components/dependency-track.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/config/components/dependency-track.yml b/package/config/components/dependency-track.yml index ac1ca54..edf363f 100644 --- a/package/config/components/dependency-track.yml +++ b/package/config/components/dependency-track.yml @@ -1,7 +1,7 @@ #@ load("@ytt:data", "data") #@ load("@ytt:struct", "struct") #@ load("@ytt:yaml", "yaml") -#@ load("/helpers.star", "is_package_additional") +#@ load("/helpers.star", "get_issuer_name", "is_package_additional") #@ if is_package_additional("dependency-track"): From e62dc701b72275155dbd8a8c6dbff7533f15c379 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 1 Jun 2025 14:52:37 +0200 Subject: [PATCH 5/7] Release version 0.26.0 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1051de..9231e7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,6 @@ jobs: registry-server: ghcr.io registry-username: ${{ github.actor }} image: ${{ github.repository }} - version: 0.23.0 + version: 0.26.0 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} From 9783a2b2b0f44770a060e7ba3299b0dc36fdf0cb Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 1 Jun 2025 14:53:16 +0200 Subject: [PATCH 6/7] docs: Update docs to latest version --- docs/quick-start/getting-started.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/quick-start/getting-started.md b/docs/quick-start/getting-started.md index 4c5ec80..58189eb 100644 --- a/docs/quick-start/getting-started.md +++ b/docs/quick-start/getting-started.md @@ -50,7 +50,7 @@ Add the Kadras repository to make the platform packages available to the cluster ```shell kctrl package repository add -r kadras-packages \ - --url ghcr.io/kadras-io/kadras-packages:0.25.0 \ + --url ghcr.io/kadras-io/kadras-packages:0.26.0 \ -n kadras-system --create-namespace ``` @@ -78,7 +78,7 @@ Reference the `values.yml` file you created in the previous step and install the ```shell kctrl package install -i engineering-platform \ -p engineering-platform.packages.kadras.io \ - -v 0.23.0 \ + -v 0.26.0 \ -n kadras-system \ --values-file values.yml ``` From 87c9d76b0e88407e00b88c6496fb26b42661d245 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 1 Jun 2025 15:01:18 +0200 Subject: [PATCH 7/7] Release next version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9231e7f..140b13f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,6 @@ jobs: registry-server: ghcr.io registry-username: ${{ github.actor }} image: ${{ github.repository }} - version: 0.26.0 + version: 0.25.0 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }}