From 03ddeb869b5f5706181ddc4131b42868fd3b367b Mon Sep 17 00:00:00 2001 From: Julius von Kohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Fri, 15 Mar 2024 09:17:29 +0100 Subject: [PATCH] kustomize 5.2.1 (#2654) * Update install_kustomize.sh Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * Update README.md Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * Update pull_request_template.md Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * deprecate old kustomize Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * update readme.md Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * update readme and Go to the pipelines version Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --------- Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --- .github/pull_request_template.md | 2 +- README.md | 8 ++++---- go.mod | 4 ++-- tests/e2e/README.md | 2 +- tests/gh-actions/install_kustomize.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9935e6d5b2..f25245602c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -6,6 +6,6 @@ Resolves # **Checklist:** - [ ] Unit tests pass: - **Make sure you have installed kustomize == 5.0.3** + **Make sure you have installed kustomize == 5.2.1+** 1. `make generate-changed-only` 2. `make test` diff --git a/README.md b/README.md index 4cf0495bdb..243ba0b40c 100644 --- a/README.md +++ b/README.md @@ -85,9 +85,9 @@ The `example` directory contains an example kustomization for the single command ### Prerequisites -- `Kubernetes` (up to `1.27`) with a default [StorageClass](https://kubernetes.io/docs/concepts/storage/storage-classes/) -- `kustomize` [5.0.3](https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv5.0.3) - - :warning: Kubeflow is not compatible with earlier versions of Kustomize. This is because we need the [`sortOptions`](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/sortoptions/) field, which is only available in Kustomize 5 and onwards https://github.com/kubeflow/manifests/issues/2388. +- `Kubernetes` (around `1.28`) with a default [StorageClass](https://kubernetes.io/docs/concepts/storage/storage-classes/) +- `kustomize` [5.2.1+](https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv5.2.1) + - :warning: Kubeflow is not compatible with earlier versions of Kustomize. One of the reasons is that we need the [`sortOptions`](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/sortoptions/) field, which is only available in Kustomize 5 and onwards https://github.com/kubeflow/manifests/issues/2388. - `kubectl` --- @@ -508,4 +508,4 @@ The Manifest Working Group releases Kubeflow based on the [release timeline](htt - **Q:** What versions of Istio, Knative, Cert-Manager, Argo, ... are compatible with Kubeflow? \ **A:** Please refer to each individual component's documentation for a dependency compatibility range. For Istio, Knative, Dex, Cert-Manager and OIDC-AuthService, the versions in `common` are the ones we have validated. - **Q:** Can I use earlier version of Kustomize with Kubeflow manifests? - **A:** The manual installation instructions work with Kustomize 3.2. To use the one-liner installation you'll need to comment out the `sortOptions` section in the `example/kustomization.yaml`. + **A:** No, it is not supported anymore, although it might be possible with manual effort. diff --git a/go.mod b/go.mod index bd5eb6cfdc..15651f79b6 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module github.com/kubeflow/manifests -go 1.12 +go 1.20 -require sigs.k8s.io/kustomize/kustomize/v3 v3.2.1 +require sigs.k8s.io/kustomize/kustomize/v3 v5.2.1 diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 743341e496..3922cc987f 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -13,7 +13,7 @@ This test is using the following Kubeflow CRDs: The heart of this test is the `mnist.py` python script, which applies and waits for the CRDs to complete. The python scripts are all expecting that 1. `kubectl` is configured with access to a Kubeflow cluster -2. `kustomize` 5.0.3+ is available +2. `kustomize` 5.2.1+ is available 3. The KFP backend is proxied to localhost While the `mnist.py` is used for running the test, it is advised to use the diff --git a/tests/gh-actions/install_kustomize.sh b/tests/gh-actions/install_kustomize.sh index 16829f76d9..025f81a683 100755 --- a/tests/gh-actions/install_kustomize.sh +++ b/tests/gh-actions/install_kustomize.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -curl --silent --location --remote-name "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.0.3/kustomize_v5.0.3_linux_amd64.tar.gz" -tar -xzvf kustomize_v5.0.3_linux_amd64.tar.gz +curl --silent --location --remote-name "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.2.1/kustomize_v5.2.1_linux_amd64.tar.gz" +tar -xzvf kustomize_v5.2.1_linux_amd64.tar.gz chmod a+x kustomize sudo mv kustomize /usr/local/bin/kustomize