From d923f4949f99aa18171422ea8d1eec2cfc5133b5 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 25 Jun 2023 11:31:49 +0200 Subject: [PATCH 1/2] Improve config and test on k8s 1.27 --- .github/workflows/test.yml | 2 +- Makefile | 6 +++++- README.md | 7 +++---- ...egistry-credentials.yml => image-pull-secret.yml} | 0 test/setup/kind/v1.24/kind-config.yml | 8 -------- test/setup/kind/v1.25/kind-config.yml | 8 ++++++-- test/setup/kind/v1.26/kind-config.yml | 8 ++++++-- test/setup/kind/v1.27/kind-config.yml | 12 ++++++++++++ 8 files changed, 33 insertions(+), 18 deletions(-) rename package/config/overlays/{registry-credentials.yml => image-pull-secret.yml} (100%) delete mode 100644 test/setup/kind/v1.24/kind-config.yml create mode 100644 test/setup/kind/v1.27/kind-config.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f8cf6f0..f178585 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: name: Integration Tests strategy: matrix: - k8s_version: [v1.24, v1.25, v1.26] + k8s_version: [v1.25, v1.26, v1.27] permissions: contents: read uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main diff --git a/Makefile b/Makefile index 7804e0b..e5b70cc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION=v1.26 +K8S_VERSION=v1.27 # Build package configuration build: package @@ -26,6 +26,10 @@ ytt: schema: ytt -f package/config/values-schema.yml --data-values-schema-inspect -o openapi-v3 > schema-openapi.yml +# Use kbld to resolve the OCI images referenced within the manifests +kbld: + rm -f package/.imgpkg/images.yml && mkdir -p package/.imgpkg && kbld --file package/config --imgpkg-lock-output package/.imgpkg/images.yml 1>> /dev/null + # Check the ytt-annotated Kubernetes configuration and its validation test-config: ytt -f package/config | kubeconform -ignore-missing-schemas -summary diff --git a/README.md b/README.md index e88a4e8..5760644 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![Test Workflow](https://github.com/kadras-io/package-for-kpack/actions/workflows/test.yml/badge.svg) ![Release Workflow](https://github.com/kadras-io/package-for-kpack/actions/workflows/release.yml/badge.svg) -[![The SLSA Level 3 badge](https://slsa.dev/images/gh-badge-level3.svg)](https://slsa.dev/spec/v0.1/levels) +[![The SLSA Level 3 badge](https://slsa.dev/images/gh-badge-level3.svg)](https://slsa.dev/spec/v1.0/levels) [![The Apache 2.0 license badge](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Follow us on Twitter](https://img.shields.io/static/v1?label=Twitter&message=Follow&color=1DA1F2)](https://twitter.com/kadrasIO) @@ -12,7 +12,7 @@ A Carvel package for [Metrics Server](https://github.com/kubernetes-sigs/metrics ### Prerequisites -* Kubernetes 1.24+ +* Kubernetes 1.25+ * 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`. @@ -26,10 +26,9 @@ A Carvel package for [Metrics Server](https://github.com/kubernetes-sigs/metrics Add the Kadras [package repository](https://github.com/kadras-io/kadras-packages) to your Kubernetes cluster: ```shell - kubectl create namespace kadras-packages kctrl package repository add -r kadras-packages \ --url ghcr.io/kadras-io/kadras-packages \ - -n kadras-packages + -n kadras-packages --create-namespace ```
Installation without package repository diff --git a/package/config/overlays/registry-credentials.yml b/package/config/overlays/image-pull-secret.yml similarity index 100% rename from package/config/overlays/registry-credentials.yml rename to package/config/overlays/image-pull-secret.yml diff --git a/test/setup/kind/v1.24/kind-config.yml b/test/setup/kind/v1.24/kind-config.yml deleted file mode 100644 index 580e675..0000000 --- a/test/setup/kind/v1.24/kind-config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -kind: Cluster -apiVersion: kind.x-k8s.io/v1alpha4 -nodes: -- role: control-plane - image: kindest/node:v1.24.12 -- role: worker - image: kindest/node:v1.24.12 diff --git a/test/setup/kind/v1.25/kind-config.yml b/test/setup/kind/v1.25/kind-config.yml index 18a17bd..2804108 100644 --- a/test/setup/kind/v1.25/kind-config.yml +++ b/test/setup/kind/v1.25/kind-config.yml @@ -3,6 +3,10 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.25.8 + image: kindest/node:v1.25.11 - role: worker - image: kindest/node:v1.25.8 + image: kindest/node:v1.25.11 +- role: worker + image: kindest/node:v1.25.11 +- role: worker + image: kindest/node:v1.25.11 diff --git a/test/setup/kind/v1.26/kind-config.yml b/test/setup/kind/v1.26/kind-config.yml index 254a0ab..2ac0f7c 100644 --- a/test/setup/kind/v1.26/kind-config.yml +++ b/test/setup/kind/v1.26/kind-config.yml @@ -3,6 +3,10 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.26.3 + image: kindest/node:v1.26.6 - role: worker - image: kindest/node:v1.26.3 + image: kindest/node:v1.26.6 +- role: worker + image: kindest/node:v1.26.6 +- role: worker + image: kindest/node:v1.26.6 diff --git a/test/setup/kind/v1.27/kind-config.yml b/test/setup/kind/v1.27/kind-config.yml new file mode 100644 index 0000000..42ad0ae --- /dev/null +++ b/test/setup/kind/v1.27/kind-config.yml @@ -0,0 +1,12 @@ +--- +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +nodes: +- role: control-plane + image: kindest/node:v1.27.3 +- role: worker + image: kindest/node:v1.27.3 +- role: worker + image: kindest/node:v1.27.3 +- role: worker + image: kindest/node:v1.27.3 From cbe26db50f6adca2dfd6deea3b140c4f52937dd5 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sun, 25 Jun 2023 11:33:09 +0200 Subject: [PATCH 2/2] Improve test setup --- test/setup/kind/v1.25/kind-config.yml | 4 ---- test/setup/kind/v1.26/kind-config.yml | 4 ---- test/setup/kind/v1.27/kind-config.yml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/test/setup/kind/v1.25/kind-config.yml b/test/setup/kind/v1.25/kind-config.yml index 2804108..61248f9 100644 --- a/test/setup/kind/v1.25/kind-config.yml +++ b/test/setup/kind/v1.25/kind-config.yml @@ -6,7 +6,3 @@ nodes: image: kindest/node:v1.25.11 - role: worker image: kindest/node:v1.25.11 -- role: worker - image: kindest/node:v1.25.11 -- role: worker - image: kindest/node:v1.25.11 diff --git a/test/setup/kind/v1.26/kind-config.yml b/test/setup/kind/v1.26/kind-config.yml index 2ac0f7c..10ec400 100644 --- a/test/setup/kind/v1.26/kind-config.yml +++ b/test/setup/kind/v1.26/kind-config.yml @@ -6,7 +6,3 @@ nodes: image: kindest/node:v1.26.6 - role: worker image: kindest/node:v1.26.6 -- role: worker - image: kindest/node:v1.26.6 -- role: worker - image: kindest/node:v1.26.6 diff --git a/test/setup/kind/v1.27/kind-config.yml b/test/setup/kind/v1.27/kind-config.yml index 42ad0ae..4cc978d 100644 --- a/test/setup/kind/v1.27/kind-config.yml +++ b/test/setup/kind/v1.27/kind-config.yml @@ -6,7 +6,3 @@ nodes: image: kindest/node:v1.27.3 - role: worker image: kindest/node:v1.27.3 -- role: worker - image: kindest/node:v1.27.3 -- role: worker - image: kindest/node:v1.27.3