From 27f092334c5b492d1bfd478cfc00da5044822472 Mon Sep 17 00:00:00 2001 From: Tero Saarni Date: Fri, 31 Jan 2025 18:01:01 +0200 Subject: [PATCH] Remove workaround for controller-tools typealias bug (#6874) * Remove workaround for controller-tools typealias bug The workaround is not necessary anymore after controller-tools v0.17.1. Signed-off-by: Tero Saarni * Run make generate Signed-off-by: Tero Saarni * Fixes for codespell. Signed-off-by: Tero Saarni --------- Signed-off-by: Tero Saarni --- apis/projectcontour/v1/zz_generated.deepcopy.go | 8 ++++++-- hack/generate-crd-deepcopy.sh | 4 ---- hack/generate-crd-yaml.sh | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/apis/projectcontour/v1/zz_generated.deepcopy.go b/apis/projectcontour/v1/zz_generated.deepcopy.go index 3207fef641a..e70c38fc43e 100644 --- a/apis/projectcontour/v1/zz_generated.deepcopy.go +++ b/apis/projectcontour/v1/zz_generated.deepcopy.go @@ -229,12 +229,16 @@ func (in *DetailedCondition) DeepCopyInto(out *DetailedCondition) { if in.Errors != nil { in, out := &in.Errors, &out.Errors *out = make([]SubCondition, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } if in.Warnings != nil { in, out := &in.Warnings, &out.Warnings *out = make([]SubCondition, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } } diff --git a/hack/generate-crd-deepcopy.sh b/hack/generate-crd-deepcopy.sh index d3a2731f638..1d18e5ed6f1 100755 --- a/hack/generate-crd-deepcopy.sh +++ b/hack/generate-crd-deepcopy.sh @@ -14,10 +14,6 @@ readonly GO111MODULE=on export GO111MODULE -# Workaround for https://github.com/projectcontour/contour/pull/6709#issuecomment-2466179766 -readonly GODEBUG=gotypesalias=0 -export GODEBUG - boilerplate() { cat <