Skip to content

Commit df69953

Browse files
authored
Merge pull request #684 from piyush-jena/go-updates
sdk-bump, go-update, rust-update, third party package update
2 parents 634b80b + 315eae7 commit df69953

File tree

22 files changed

+3840
-53
lines changed

22 files changed

+3840
-53
lines changed

Twoliter.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project-vendor = "Bottlerocket"
44

55
[sdk]
66
name = "bottlerocket-sdk"
7-
version = "0.64.0"
7+
version = "0.65.0"
88
vendor = "bottlerocket"
9-
source = "public.ecr.aws/bottlerocket/bottlerocket-sdk:v0.64.0"
10-
digest = "kRW2MsSo3jA+rAEO/Mp5gW8Q4/pd62bbB/lT4d5Jzak="
9+
source = "public.ecr.aws/bottlerocket/bottlerocket-sdk:v0.65.0"
10+
digest = "g03GUrm333pxmItqDrr3kPVELf0gHj8An8Yz9/GG5Ms="

Twoliter.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ registry = "public.ecr.aws/bottlerocket"
77

88
[sdk]
99
name = "bottlerocket-sdk"
10-
version = "0.64.0"
10+
version = "0.65.0"
1111
vendor = "bottlerocket"

packages/amazon-ssm-agent/amazon-ssm-agent.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-plugin-bin)
6868
%autosetup -n %{gorepo}-%{version} -p1
6969

7070
%build
71-
export GO_MAJOR="1.24"
72-
7371
%set_cross_go_flags
7472

7573
go build -ldflags "${GOLDFLAGS}" -o amazon-ssm-agent \

packages/aws-iam-authenticator/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ path = "../packages.rs"
1212
releases-url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases"
1313

1414
[[package.metadata.build-package.external-files]]
15-
url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.7.5/aws-iam-authenticator-0.7.5.tar.gz"
16-
sha512 = "9818dac7c6f651fb04b80e5ea363d2ce35dcc1988d78f67a0320f592ddff20fb286033bf6112f5e9a08736b3c341dab64895654f914b3a53a35f6c0ebd74fa91"
15+
url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.7.8/aws-iam-authenticator-0.7.8.tar.gz"
16+
sha512 = "63dc40f7ad3f1de4cb4fa3bcda793fe73276fb477f5e001593698cd272fd7d06ff19b3dd73b29b682ef91b25870abae5241e658032d21f647f9b091509e1d5a8"
1717
bundle-modules = [ "go" ]
1818

1919
[build-dependencies]

packages/aws-iam-authenticator/aws-iam-authenticator.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%global gorepo aws-iam-authenticator
33
%global goimport %{goproject}/%{gorepo}
44

5-
%global gover 0.7.5
5+
%global gover 0.7.8
66
%global rpmver %{gover}
77

88
%global _dwz_low_mem_die_limit 0
@@ -53,7 +53,7 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
5353

5454
%build
5555
%set_cross_go_flags
56-
export GO_MAJOR="1.24"
56+
export GO_MAJOR="1.25"
5757
go build -ldflags="${GOLDFLAGS}" -o aws-iam-authenticator ./cmd/aws-iam-authenticator
5858
gofips build -ldflags="${GOLDFLAGS}" -o fips/aws-iam-authenticator ./cmd/aws-iam-authenticator
5959

packages/cni-plugins/cni-plugins.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
4848

4949
%build
5050
%cross_go_configure %{goimport}
51-
export GO_MAJOR="1.23"
51+
5252
for d in $(find plugins -mindepth 2 -maxdepth 2 -type d ! -name windows) ; do
5353
go build -ldflags="${GOLDFLAGS}" -o "bin/${d##*/}" %{goimport}/${d}
5454
gofips build -ldflags="${GOLDFLAGS}" -o "fips/bin/${d##*/}" %{goimport}/${d}

packages/ecr-credential-provider-1.30/ecr-credential-provider-1.30.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
5454
%build
5555
%set_cross_go_flags
5656

57-
export GO_MAJOR="1.23"
58-
5957
go build -ldflags="${GOLDFLAGS}" -o=ecr-credential-provider cmd/ecr-credential-provider/*.go
6058
gofips build -ldflags="${GOLDFLAGS}" -o=fips/ecr-credential-provider cmd/ecr-credential-provider/*.go
6159

packages/ecs-gpu-init/ecs-gpu-init.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ BuildRequires: %{_cross_os}glibc-devel
1919
cp -r %{_builddir}/sources/%{workspace_name}/* .
2020

2121
%build
22-
export GO_MAJOR="1.23"
23-
2422
%set_cross_go_flags
2523
# We don't set `-Wl,-z,now`, because the binary uses lazy loading
2624
# to load the NVIDIA libraries in the host

packages/kubernetes-1.31/kubernetes-1.31.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
145145
%build
146146
export FORCE_HOST_GO=1
147147

148-
export GO_MAJOR="1.23"
149-
150148
# Build codegen programs with the host toolchain.
151149
make hack/update-codegen.sh
152150

packages/kubernetes-1.32/kubernetes-1.32.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
144144
%build
145145
export FORCE_HOST_GO=1
146146

147-
export GO_MAJOR="1.23"
148-
149147
# Build codegen programs with the host toolchain.
150148
make hack/update-codegen.sh
151149

0 commit comments

Comments
 (0)