Skip to content

Commit

Permalink
golang: Enable type alias again for go 1.13
Browse files Browse the repository at this point in the history
All files are re-generated again as there is change in generation tools.

Relates: kubernetes/kubernetes#127271
Relates: cilium/deepequal-gen#7
Relates: kubernetes-sigs/controller-tools#1061
Relates: 1d9d51f
Signed-off-by: Tam Mach <[email protected]>
  • Loading branch information
sayboras committed Oct 3, 2024
1 parent c8e0131 commit 6923557
Show file tree
Hide file tree
Showing 234 changed files with 1,894 additions and 6,187 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ generate-hubble-api: api/v1/flow/flow.proto api/v1/peer/peer.proto api/v1/observ

define generate_deepequal
$(GO) run github.com/cilium/deepequal-gen \
--input-dirs $(subst $(space),$(comma),$(1)) \
--go-header-file "$$PWD/hack/custom-boilerplate.go.txt" \
--output-file-base zz_generated.deepequal \
--output-base $(2)
--output-file zz_generated.deepequal.go \
--output-base $(2) \
$(1)
endef

define generate_k8s_protobuf
Expand Down
5 changes: 0 additions & 5 deletions Makefile.defs
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ GO_BUILD_LDFLAGS ?=
# go build/test -tags values
GO_TAGS_FLAGS += osusergo

# Keep the Go <=1.22 semantics for parsing type aliases.
# This is needed for code generation (k8s protobuf, deep*) until 'gengo' has been fixed.
GODEBUG += gotypesalias=0
export GODEBUG

# This is declared here as it is needed to change the covermode depending on if
# RACE is specified.
GOTEST_COVER_OPTS =
Expand Down
14 changes: 8 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/bombsimon/logrusr/v4 v4.1.0
github.com/cilium/charts v0.0.0-20240926142256-e20f2b5f5344
github.com/cilium/coverbee v0.3.3-0.20240723084546-664438750fce
github.com/cilium/deepequal-gen v0.0.0-20231116094812-0d6c075c335f
github.com/cilium/deepequal-gen v0.0.0-20241002105916-4c4165f47b6c
github.com/cilium/dns v1.1.51-0.20240603182237-af788769786a
github.com/cilium/ebpf v0.16.0
github.com/cilium/endpointslice-controller v0.0.0-20240409203012-75cb5d61db1b
Expand Down Expand Up @@ -132,7 +132,7 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/controller-tools v0.16.3
sigs.k8s.io/controller-tools v0.16.4-0.20240923084800-3b70a40398f4
sigs.k8s.io/gateway-api v1.2.0-rc1.0.20240923191000-5c5fc388829d
sigs.k8s.io/mcs-api v0.1.1-0.20240919125245-7bbb5990134a
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -319,9 +319,8 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/v3 v3.5.0 // indirect
k8s.io/apiserver v0.31.1 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
k8s.io/kubectl v0.31.0 // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand All @@ -333,7 +332,10 @@ require (
replace (
go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220829170633-5d7dfb1129f7

k8s.io/code-generator => k8s.io/code-generator v0.30.0-alpha.3.0.20240920005538-61df8a8f0355

// Using private fork of controller-tools. See commit msg for more context
// as to why we are using a private fork.
sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.16.1-1
// For testing purpose, use another fork to include https://github.com/kubernetes-sigs/controller-tools#1061
sigs.k8s.io/controller-tools => github.com/sayboras/controller-tools v0.0.0-20240925150353-20695830368c
)
32 changes: 12 additions & 20 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumclusterwideenvoyconfigs.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumclusterwidenetworkpolicies.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumegressgatewaypolicies.cilium.io
spec:
group: cilium.io
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/apis/cilium.io/client/crds/v2/ciliumendpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumendpoints.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumenvoyconfigs.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumexternalworkloads.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumidentities.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumlocalredirectpolicies.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumnetworkpolicies.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumnodeconfigs.cilium.io
spec:
group: cilium.io
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/apis/cilium.io/client/crds/v2/ciliumnodes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumnodes.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumbgpadvertisements.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumbgpclusterconfigs.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumbgpnodeconfigoverrides.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumbgpnodeconfigs.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumbgppeerconfigs.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumbgppeeringpolicies.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumcidrgroups.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumendpointslices.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliuml2announcementpolicies.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumloadbalancerippools.cilium.io
spec:
group: cilium.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.4-0.20240923084800-3b70a40398f4
name: ciliumpodippools.cilium.io
spec:
group: cilium.io
Expand Down
4 changes: 2 additions & 2 deletions pkg/k8s/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6923557

Please sign in to comment.