From 958fbadf0d79e2ea66c169b250965cfad8123ac4 Mon Sep 17 00:00:00 2001 From: hugoShaka Date: Wed, 26 Jun 2024 13:48:19 -0400 Subject: [PATCH] Bump controller-tools to 0.14 as 0.9 panics with go 1.22 --- integrations/operator/Makefile | 2 +- .../operator/apis/resources/v1/zz_generated.deepcopy.go | 4 ++-- .../operator/apis/resources/v2/zz_generated.deepcopy.go | 1 - .../operator/apis/resources/v3/zz_generated.deepcopy.go | 1 - .../operator/apis/resources/v5/zz_generated.deepcopy.go | 1 - .../operator/apis/resources/v6/zz_generated.deepcopy.go | 1 - 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/integrations/operator/Makefile b/integrations/operator/Makefile index d7d97a292b5bb..9cbde98df3960 100644 --- a/integrations/operator/Makefile +++ b/integrations/operator/Makefile @@ -159,7 +159,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.9.0 +CONTROLLER_TOOLS_VERSION ?= v0.14.0 .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. diff --git a/integrations/operator/apis/resources/v1/zz_generated.deepcopy.go b/integrations/operator/apis/resources/v1/zz_generated.deepcopy.go index 769a018e3250f..7ddf45d202fcf 100644 --- a/integrations/operator/apis/resources/v1/zz_generated.deepcopy.go +++ b/integrations/operator/apis/resources/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022 Gravitational, Inc. @@ -96,7 +95,8 @@ func (in *TeleportLoginRuleSpec) DeepCopyInto(out *TeleportLoginRuleSpec) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make([]string, len(*in)) copy(*out, *in) } diff --git a/integrations/operator/apis/resources/v2/zz_generated.deepcopy.go b/integrations/operator/apis/resources/v2/zz_generated.deepcopy.go index 168a8e20d05bd..793c5f99e5064 100644 --- a/integrations/operator/apis/resources/v2/zz_generated.deepcopy.go +++ b/integrations/operator/apis/resources/v2/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022 Gravitational, Inc. diff --git a/integrations/operator/apis/resources/v3/zz_generated.deepcopy.go b/integrations/operator/apis/resources/v3/zz_generated.deepcopy.go index cf632e80d1058..f14c386bf8731 100644 --- a/integrations/operator/apis/resources/v3/zz_generated.deepcopy.go +++ b/integrations/operator/apis/resources/v3/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022 Gravitational, Inc. diff --git a/integrations/operator/apis/resources/v5/zz_generated.deepcopy.go b/integrations/operator/apis/resources/v5/zz_generated.deepcopy.go index 1c0cb2fed65ae..33f067623cd18 100644 --- a/integrations/operator/apis/resources/v5/zz_generated.deepcopy.go +++ b/integrations/operator/apis/resources/v5/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022 Gravitational, Inc. diff --git a/integrations/operator/apis/resources/v6/zz_generated.deepcopy.go b/integrations/operator/apis/resources/v6/zz_generated.deepcopy.go index a089ad8e23736..736c1676308fb 100644 --- a/integrations/operator/apis/resources/v6/zz_generated.deepcopy.go +++ b/integrations/operator/apis/resources/v6/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022 Gravitational, Inc.