From cd86c71d1dcd5ab0b27d4680fc2298affca779f6 Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Thu, 12 Oct 2023 09:06:22 -0500 Subject: [PATCH] Update conversion-gen and conversion-verifier. (#39) Signed-off-by: Dean Roehrich --- Makefile | 4 ++-- github/cluster-api/util/conversion/conversion_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ab0095b..b861e76 100644 --- a/Makefile +++ b/Makefile @@ -250,12 +250,12 @@ CONVERSION_VERIFIER_PKG := sigs.k8s.io/cluster-api/hack/tools/conversion-verifie ## Tool Versions KUSTOMIZE_VERSION ?= v4.5.7 CONTROLLER_TOOLS_VERSION ?= v0.12.0 -CONVERSION_GEN_VER := v0.26.3 +CONVERSION_GEN_VER := v0.28.2 # Can be "latest", but cannot be a tag, such as "v1.3.3". However, it will # work with the short-form git commit rev that has been tagged. #CONVERSION_VERIFIER_VER := 09030092b # v1.3.3 -CONVERSION_VERIFIER_VER := 2c07717 # v1.4.0 +CONVERSION_VERIFIER_VER := 3290c5a # v1.5.2 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/github/cluster-api/util/conversion/conversion_test.go b/github/cluster-api/util/conversion/conversion_test.go index 2f9ae20..cccca73 100644 --- a/github/cluster-api/util/conversion/conversion_test.go +++ b/github/cluster-api/util/conversion/conversion_test.go @@ -103,7 +103,7 @@ func TestUnmarshalData(t *testing.T) { ok, err := UnmarshalData(src, dst) g.Expect(ok).To(BeFalse()) - g.Expect(err).To(BeNil()) + g.Expect(err).ToNot(HaveOccurred()) }) t.Run("should return true when a valid annotation with data exists", func(t *testing.T) { @@ -121,7 +121,7 @@ func TestUnmarshalData(t *testing.T) { } ok, err := UnmarshalData(src, dst) - g.Expect(err).To(BeNil()) + g.Expect(err).ToNot(HaveOccurred()) g.Expect(ok).To(BeTrue()) g.Expect(dst.GetLabels()).To(HaveLen(1)) @@ -146,7 +146,7 @@ func TestUnmarshalData(t *testing.T) { } ok, err := UnmarshalData(src, dst) - g.Expect(err).To(BeNil()) + g.Expect(err).ToNot(HaveOccurred()) g.Expect(ok).To(BeTrue()) g.Expect(src.GetAnnotations()).ToNot(HaveKey(DataAnnotation))