From 3ca838d259e07994d4f1b77e861622ba0f9bf75b Mon Sep 17 00:00:00 2001 From: song Date: Wed, 15 Jan 2025 10:41:26 +0800 Subject: [PATCH 1/3] Fix: touch /dev/null permission denied on macos Signed-off-by: song Kubernetes-commit: 11c3bd3038dbf47abb71ff5b9f12e5889da2192f --- kube_codegen.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kube_codegen.sh b/kube_codegen.sh index 8207da5e..6b2ba321 100755 --- a/kube_codegen.sh +++ b/kube_codegen.sh @@ -368,7 +368,10 @@ function kube::codegen::gen_openapi() { "${input_pkgs[@]}" fi - touch "${report}" # in case it doesn't exist yet + if [ ! -e "${report}" ]; then + touch "${report}" # in case it doesn't exist yet + fi + if ! diff -u "${report}" "${new_report}"; then echo -e "ERROR:" echo -e "\tAPI rule check failed for ${report}: new reported violations" From 6ee1d616b07e9a7eb2a8e26261790caddcd058ab Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 28 Jan 2025 04:19:30 -0800 Subject: [PATCH 2/3] Merge pull request #129740 from bobsongplus/automated-cherry-pick-of-#129629-upstream-release-1.32 Automated cherry pick of #129629: Fix: touch /dev/null permission denied on macos Kubernetes-commit: ce39aed39ed14331789114305d215142418a1f06 From 434520ca3c0e4c640713ac36a0faf2d159571729 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 13 Feb 2025 12:24:57 +0000 Subject: [PATCH 3/3] Update dependencies to v0.32.2 tag --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9bf7aaac..17b2d6d5 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/google/gofuzz v1.2.0 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.19.0 - k8s.io/apimachinery v0.0.0-20241206181855-59e9003f02d6 + k8s.io/apimachinery v0.32.2 k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f diff --git a/go.sum b/go.sum index d5c2e0eb..34a5a4ef 100644 --- a/go.sum +++ b/go.sum @@ -124,8 +124,8 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/apimachinery v0.0.0-20241206181855-59e9003f02d6 h1:8ccyzZdQXEqpO3sboLCV3yt9bm6VFoO/jYOGS7gCAQs= -k8s.io/apimachinery v0.0.0-20241206181855-59e9003f02d6/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=