From eeb1d4100305a1ab469f22fa29ef0ab324ed24ce Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Wed, 24 Sep 2025 18:10:36 +0200 Subject: [PATCH 1/6] feat: Support Kubernetes 1.34 --- .github/workflows/test.yml | 2 +- Makefile | 2 +- README.md | 2 +- test/setup/kind/v1.32/kind-config.yml | 4 ++-- test/setup/kind/v1.33/kind-config.yml | 4 ++-- test/setup/kind/{v1.31 => v1.34}/kind-config.yml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename test/setup/kind/{v1.31 => v1.34}/kind-config.yml (81%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f5e2ad..b5db92e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: name: Integration Tests strategy: matrix: - k8s_version: [v1.31, v1.32, v1.33] + k8s_version: [v1.32, v1.33, v1.34] permissions: contents: read uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main diff --git a/Makefile b/Makefile index e95c099..f7d1362 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION=v1.33 +K8S_VERSION=v1.34 # Build package configuration build: package diff --git a/README.md b/README.md index 15f9f48..b01c2a0 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.31+ +* Kubernetes 1.32+ * 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.32/kind-config.yml b/test/setup/kind/v1.32/kind-config.yml index 3d935ae..fffd5f6 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.5 + image: kindest/node:v1.32.8 - role: worker - image: kindest/node:v1.32.5 + image: kindest/node:v1.32.8 extraPortMappings: - containerPort: 80 hostPort: 80 diff --git a/test/setup/kind/v1.33/kind-config.yml b/test/setup/kind/v1.33/kind-config.yml index cda887c..9b34a32 100644 --- a/test/setup/kind/v1.33/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.33.2 + image: kindest/node:v1.33.4 - role: worker - image: kindest/node:v1.33.2 + image: kindest/node:v1.33.4 extraPortMappings: - containerPort: 80 hostPort: 80 diff --git a/test/setup/kind/v1.31/kind-config.yml b/test/setup/kind/v1.34/kind-config.yml similarity index 81% rename from test/setup/kind/v1.31/kind-config.yml rename to test/setup/kind/v1.34/kind-config.yml index 9f396f7..c0fd30f 100644 --- a/test/setup/kind/v1.31/kind-config.yml +++ b/test/setup/kind/v1.34/kind-config.yml @@ -3,9 +3,9 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.31.9 + image: kindest/node:v1.34.0 - role: worker - image: kindest/node:v1.31.9 + image: kindest/node:v1.34.0 extraPortMappings: - containerPort: 80 hostPort: 80 From e582d3725c62705bd70956a5fe0c161658de472a Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Wed, 24 Sep 2025 18:16:45 +0200 Subject: [PATCH 2/6] deps: Update components --- package/config/components/contour.yml | 2 +- package/config/components/dependency-track.yml | 2 +- package/config/components/developer-portal.yml | 2 +- package/config/components/knative-serving.yml | 2 +- package/config/components/kyverno.yml | 2 +- package/config/components/rabbitmq-operator.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/config/components/contour.yml b/package/config/components/contour.yml index 41d647b..fca1ad8 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.32.0 + constraints: 1.33.0 values: - secretRef: name: contour-values diff --git a/package/config/components/dependency-track.yml b/package/config/components/dependency-track.yml index 03c6b07..124cc7c 100644 --- a/package/config/components/dependency-track.yml +++ b/package/config/components/dependency-track.yml @@ -39,7 +39,7 @@ spec: packageRef: refName: dependency-track.packages.kadras.io versionSelection: - constraints: 4.13.3 + constraints: 4.13.4 values: - secretRef: name: dependency-track-values diff --git a/package/config/components/developer-portal.yml b/package/config/components/developer-portal.yml index 9bd4fdf..8813847 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.7.0 + constraints: 0.8.0 values: - secretRef: name: developer-portal-values diff --git a/package/config/components/knative-serving.yml b/package/config/components/knative-serving.yml index a01d1ee..f256864 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.19.0 + constraints: 1.19.5 values: - secretRef: name: knative-serving-values diff --git a/package/config/components/kyverno.yml b/package/config/components/kyverno.yml index 67f3415..e957b3a 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.15.0 + constraints: 1.15.1 values: - secretRef: name: kyverno-values diff --git a/package/config/components/rabbitmq-operator.yml b/package/config/components/rabbitmq-operator.yml index 98cce72..f6c9e6f 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.16.0 + constraints: 2.16.1 values: - secretRef: name: rabbitmq-operator-values From 16a482c3e9617c032da8c4ae201bc9528a106a96 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Wed, 24 Sep 2025 18:21:11 +0200 Subject: [PATCH 3/6] test: Update unit tests --- test/unit/config/values.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/unit/config/values.yml b/test/unit/config/values.yml index f210513..db8c593 100644 --- a/test/unit/config/values.yml +++ b/test/unit/config/values.yml @@ -5,10 +5,8 @@ platform: ingress: domain: kadras.io - oci_registry: - server: "ghcr.io" - repository: "my-org" - secret: + oci: + pull_secret: name: supply-chain-registry-credentials namespace: kadras-system From 59b57fe583bbba28510cd81e359f7317666386f4 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Wed, 24 Sep 2025 18:21:40 +0200 Subject: [PATCH 4/6] Release version 0.27.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 9231e7f..a432068 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.27.0 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} From 2b4fbb20ba1b2a407aff62c9f97d78dc22036837 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Wed, 24 Sep 2025 18:22:59 +0200 Subject: [PATCH 5/6] docs: Update getting started docs --- 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 58189eb..cb3c5c2 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.26.0 \ + --url ghcr.io/kadras-io/kadras-packages:0.27.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.26.0 \ + -v 0.27.0 \ -n kadras-system \ --values-file values.yml ``` From d753b2f4e499efc9a2e5e25cb1adc374e2ef070c Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Wed, 24 Sep 2025 18:26:28 +0200 Subject: [PATCH 6/6] docs: Update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b01c2a0..842f821 100644 --- a/README.md +++ b/README.md @@ -107,8 +107,8 @@ The Engineering Platform package has the following configurable properties. | `platform.ingress.issuer.type` | `private` | The type of ClusterIssuer the platform will use to enable TLS communications. Options: `private`, `letsencrypt_staging`, `letsencrypt`, `custom`. | | `platform.ingress.issuer.name` | `""` | A reference to a custom ClusterIssuer previously created on the cluster where the platform will be installed. Required when the type is `custom`. | | `platform.ingress.issuer.email` | `""` | The email address that Let's Encrypt will use to send info on expiring certificates or other issues. Required when the type is `letsencrypt_staging` or `letsencrypt`. | -| `platform.oci_registry.secret.name` | `""` | The name of the Secret holding the credentials to access the OCI registry. The credentials should provide read-only access to the OCI registry except when installing the platform with one of these profiles: `standalone`, `dev`, `build`. | -| `platform.oci_registry.secret.namespace` | `kadras-system` | The namespace of the Secret holding the credentials to access the OCI registry. | +| `platform.oci.pull_secret.name` | `""` | The name of the Secret holding the credentials to pull images from the OCI registry. | +| `platform.oci.pull_secret.namespace` | `kadras-system` | The namespace of the Secret holding the credentials to pull images from the OCI registry. | | `platform.cosign.secret.name` | `""` | The name of the Secret holding the Cosign key pair. | | `platform.cosign.secret.namespace` | `kadras-system` | The namespace of the Secret holding the Cosign key pair. | | `platform.git.server` | `https://github.com` | The server hosting the Git repositories used by the plaform. |