Skip to content

Commit d072b8c

Browse files
committed
packages: add ecr-credential-provider-1.34
Signed-off-by: Kush Upadhyay <[email protected]>
1 parent 3d09628 commit d072b8c

File tree

6 files changed

+119
-0
lines changed

6 files changed

+119
-0
lines changed

Cargo.lock

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ members = [
3030
"packages/ecr-credential-provider-1.31",
3131
"packages/ecr-credential-provider-1.32",
3232
"packages/ecr-credential-provider-1.33",
33+
"packages/ecr-credential-provider-1.34",
3334
"packages/ecs-agent",
3435
"packages/ecs-gpu-init",
3536
"packages/ethtool",

kits/bottlerocket-core-kit/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ecr-credential-provider-1_30 = { path = "../../packages/ecr-credential-provider-
3939
ecr-credential-provider-1_31 = { path = "../../packages/ecr-credential-provider-1.31" }
4040
ecr-credential-provider-1_32 = { path = "../../packages/ecr-credential-provider-1.32" }
4141
ecr-credential-provider-1_33 = { path = "../../packages/ecr-credential-provider-1.33" }
42+
ecr-credential-provider-1_34 = { path = "../../packages/ecr-credential-provider-1.34" }
4243
ecs-agent = { path = "../../packages/ecs-agent" }
4344
ecs-gpu-init = { path = "../../packages/ecs-gpu-init" }
4445
ethtool = { path = "../../packages/ethtool" }
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[package]
2+
# "." is not allowed in crate names, but we want a friendlier name for the
3+
# directory and spec file, so we override it below.
4+
name = "ecr-credential-provider-1_34"
5+
version = "0.1.0"
6+
edition = "2021"
7+
publish = false
8+
build = "../build.rs"
9+
10+
[lib]
11+
path = "../packages.rs"
12+
13+
[package.metadata.build-package]
14+
package-name = "ecr-credential-provider-1.34"
15+
releases-url = "https://github.com/kubernetes/cloud-provider-aws/releases"
16+
17+
[[package.metadata.build-package.external-files]]
18+
url = "https://github.com/kubernetes/cloud-provider-aws/archive/v1.34.0-rc.0.tar.gz"
19+
path = "cloud-provider-aws-1.34.0.tar.gz"
20+
sha512 = "de7fdbdc5bc26959334194178eb63a25013e552fdaf67947c29d3990aec18cb62dcc7d3b0f153e76754bf95f911894fa13ae1e24c2491fdc0d81ba24d127d734"
21+
bundle-modules = [ "go" ]
22+
23+
[build-dependencies]
24+
glibc = { path = "../glibc" }
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[clarify."sigs.k8s.io/yaml"]
2+
expression = "MIT AND BSD-3-Clause AND Apache-2.0"
3+
license-files = [
4+
{ path = "LICENSE", hash = 0x617d80bc },
5+
]
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
%global goproject github.com/kubernetes
2+
%global gorepo cloud-provider-aws
3+
%global goimport %{goproject}/%{gorepo}
4+
5+
%global gover 1.34.0
6+
%global rpmver %{gover}
7+
8+
%global _dwz_low_mem_die_limit 0
9+
10+
Name: %{_cross_os}ecr-credential-provider-1.34
11+
Version: %{rpmver}
12+
Release: 0.rc0%{?dist}
13+
Summary: Amazon ECR credential provider
14+
License: Apache-2.0
15+
URL: https://github.com/kubernetes/cloud-provider-aws
16+
17+
Source: cloud-provider-aws-%{gover}.tar.gz
18+
Source1: bundled-cloud-provider-aws-%{gover}.tar.gz
19+
Source1000: clarify.toml
20+
21+
BuildRequires: %{_cross_os}glibc-devel
22+
Requires: %{name}(binaries)
23+
24+
# For IAM Roles Anywhere, the signing helper might be set as the credential
25+
# process.
26+
Requires: %{_cross_os}aws-signing-helper
27+
28+
%description
29+
%{summary}.
30+
31+
%package bin
32+
Summary: Amazon ECR credential provider binaries
33+
Provides: %{name}(binaries)
34+
Requires: (%{_cross_os}image-feature(no-fips) and %{name})
35+
Conflicts: (%{_cross_os}image-feature(fips) or %{name}-fips-bin)
36+
37+
%description bin
38+
%{summary}.
39+
40+
%package fips-bin
41+
Summary: Amazon ECR credential provider binaries, FIPS edition
42+
Provides: %{name}(binaries)
43+
Requires: (%{_cross_os}image-feature(fips) and %{name})
44+
Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
45+
46+
%description fips-bin
47+
%{summary}.
48+
49+
%prep
50+
%setup -n %{gorepo}-%{gover}-rc.0 -q
51+
%setup -T -D -n %{gorepo}-%{gover}-rc.0 -b 1 -q
52+
53+
%build
54+
%set_cross_go_flags
55+
56+
export GOTOOLCHAIN=local
57+
export GO_MAJOR="1.24"
58+
59+
go build -ldflags="${GOLDFLAGS}" -o=ecr-credential-provider cmd/ecr-credential-provider/*.go
60+
gofips build -ldflags="${GOLDFLAGS}" -o=fips/ecr-credential-provider cmd/ecr-credential-provider/*.go
61+
62+
%install
63+
install -d %{buildroot}%{_cross_libexecdir}/kubernetes/kubelet/plugins
64+
install -p -m 0755 ecr-credential-provider %{buildroot}%{_cross_libexecdir}/kubernetes/kubelet/plugins
65+
66+
install -d %{buildroot}%{_cross_fips_libexecdir}/kubernetes/kubelet/plugins
67+
install -p -m 0755 fips/ecr-credential-provider %{buildroot}%{_cross_fips_libexecdir}/kubernetes/kubelet/plugins
68+
69+
%cross_scan_attribution --clarify %{S:1000} go-vendor vendor
70+
71+
%files
72+
%license LICENSE
73+
%{_cross_attribution_file}
74+
%{_cross_attribution_vendor_dir}
75+
76+
%files bin
77+
%{_cross_libexecdir}/kubernetes/kubelet/plugins/ecr-credential-provider
78+
79+
%files fips-bin
80+
%{_cross_fips_libexecdir}/kubernetes/kubelet/plugins/ecr-credential-provider

0 commit comments

Comments
 (0)