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#6
Relates: kubernetes-sigs/controller-tools#1061
Relates: 1d9d51f
Signed-off-by: Tam Mach <tam.mach@cilium.io>
  • Loading branch information
sayboras committed Sep 25, 2024
1 parent ed8dd18 commit d3b1793
Show file tree
Hide file tree
Showing 186 changed files with 1,862 additions and 1,305 deletions.
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
17 changes: 11 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-20240905132853-a346c1504556
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-20240920134030-fe070c611b00
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-20240902221715-702e33fdd3c3
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
sigs.k8s.io/mcs-api v0.1.1-0.20240903161117-2c773b78635e
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -319,9 +319,9 @@ 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 v0.0.0-20240911193312-2b36238f13e9 // 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 +333,12 @@ 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

k8s.io/gengo => github.com/sayboras/gengo v0.0.0-20240920133050-8cd674ebf6a9

// 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
)
28 changes: 14 additions & 14 deletions go.sum

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

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.

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

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

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

Loading

0 comments on commit d3b1793

Please sign in to comment.