Merge pull request #155 from larvacea/go-leak

Change Go version for k8s 1.23-1.29
bottlerocket-os · Sep 19, 2024 · 8504897 · 8504897
2 parents f3a8d3a + f409333
commit 8504897
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/packages/kubernetes-1.23/kubernetes-1.23.spec b/packages/kubernetes-1.23/kubernetes-1.23.spec
@@ -194,6 +194,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 
 %build
 export FORCE_HOST_GO=1
+export GO_MAJOR="1.22"
 # Build codegen programs with the host toolchain.
 make generated_files
 

diff --git a/packages/kubernetes-1.24/kubernetes-1.24.spec b/packages/kubernetes-1.24/kubernetes-1.24.spec
@@ -174,6 +174,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 
 %build
 export FORCE_HOST_GO=1
+export GO_MAJOR="1.22"
 # Build codegen programs with the host toolchain.
 make generated_files
 

diff --git a/packages/kubernetes-1.25/kubernetes-1.25.spec b/packages/kubernetes-1.25/kubernetes-1.25.spec
@@ -166,6 +166,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 
 %build
 export FORCE_HOST_GO=1
+export GO_MAJOR="1.22"
 # Build codegen programs with the host toolchain.
 make generated_files
 

diff --git a/packages/kubernetes-1.26/kubernetes-1.26.spec b/packages/kubernetes-1.26/kubernetes-1.26.spec
@@ -156,6 +156,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 
 %build
 export FORCE_HOST_GO=1
+export GO_MAJOR="1.22"
 # Build codegen programs with the host toolchain.
 make hack/update-codegen.sh
 

diff --git a/packages/kubernetes-1.27/kubernetes-1.27.spec b/packages/kubernetes-1.27/kubernetes-1.27.spec
@@ -142,6 +142,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 
 %build
 export FORCE_HOST_GO=1
+export GO_MAJOR="1.22"
 # Build codegen programs with the host toolchain.
 make hack/update-codegen.sh
 

diff --git a/packages/kubernetes-1.28/kubernetes-1.28.spec b/packages/kubernetes-1.28/kubernetes-1.28.spec
@@ -142,6 +142,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 
 %build
 export FORCE_HOST_GO=1
+export GO_MAJOR="1.22"
 # Build codegen programs with the host toolchain.
 make hack/update-codegen.sh
 

diff --git a/packages/kubernetes-1.29/kubernetes-1.29.spec b/packages/kubernetes-1.29/kubernetes-1.29.spec
@@ -142,6 +142,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 
 %build
 export FORCE_HOST_GO=1
+export GO_MAJOR="1.22"
 # Build codegen programs with the host toolchain.
 make hack/update-codegen.sh