Skip to content

Commit 12fe31b

Browse files
kooooshkoooosh
authored
Merge pull request #476 from koooosh/add-k8s-1.33-beta
Add k8s-1.33 and ecr-credential-provider-1.33 pkgs with pre-release sources
2 parents 1853e71 + a33400b commit 12fe31b

31 files changed

+976
-0
lines changed

‎Cargo.lock‎

Lines changed: 16 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ members = [
3131
"packages/ecr-credential-provider-1.30",
3232
"packages/ecr-credential-provider-1.31",
3333
"packages/ecr-credential-provider-1.32",
34+
"packages/ecr-credential-provider-1.33",
3435
"packages/ecs-agent",
3536
"packages/ecs-gpu-init",
3637
"packages/ethtool",
@@ -53,6 +54,7 @@ members = [
5354
"packages/kubernetes-1.30",
5455
"packages/kubernetes-1.31",
5556
"packages/kubernetes-1.32",
57+
"packages/kubernetes-1.33",
5658
"packages/libacl",
5759
"packages/libaio",
5860
"packages/libattr",

‎kits/bottlerocket-core-kit/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ ecr-credential-provider-1_29 = { path = "../../packages/ecr-credential-provider-
4141
ecr-credential-provider-1_30 = { path = "../../packages/ecr-credential-provider-1.30" }
4242
ecr-credential-provider-1_31 = { path = "../../packages/ecr-credential-provider-1.31" }
4343
ecr-credential-provider-1_32 = { path = "../../packages/ecr-credential-provider-1.32" }
44+
ecr-credential-provider-1_33 = { path = "../../packages/ecr-credential-provider-1.33" }
4445
ecs-agent = { path = "../../packages/ecs-agent" }
4546
ecs-gpu-init = { path = "../../packages/ecs-gpu-init" }
4647
ethtool = { path = "../../packages/ethtool" }
@@ -63,6 +64,7 @@ kubernetes-1_29 = { path = "../../packages/kubernetes-1.29" }
6364
kubernetes-1_30 = { path = "../../packages/kubernetes-1.30" }
6465
kubernetes-1_31 = { path = "../../packages/kubernetes-1.31" }
6566
kubernetes-1_32 = { path = "../../packages/kubernetes-1.32" }
67+
kubernetes-1_33 = { path = "../../packages/kubernetes-1.33" }
6668
libacl = { path = "../../packages/libacl" }
6769
libaio = { path = "../../packages/libaio" }
6870
libattr = { path = "../../packages/libattr" }

‎packages/ecr-credential-provider-1.33/Cargo.toml‎

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_33"
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.33"
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.33.0-rc.0.tar.gz"
19+
path = "cloud-provider-aws-1.33.0.tar.gz"
20+
sha512 = "a923071b95174ad96bf78e3c255e0b7682fe1f896d7399abdcacdde82df808aec026c350e443f8612f98048ca6b51d77208d55f34fae9167a2ccf01b83e20071"
21+
bundle-modules = [ "go" ]
22+
23+
[build-dependencies]
24+
glibc = { path = "../glibc" }

‎packages/ecr-credential-provider-1.33/clarify.toml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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+
{ path = "goyaml.v2/LICENSE", hash = 0xe569d630 },
6+
{ path = "goyaml.v2/LICENSE.libyaml", hash = 0xa2e4ce3 },
7+
{ path = "goyaml.v2/NOTICE", hash = 0x49bceeb9 },
8+
]

‎packages/ecr-credential-provider-1.33/ecr-credential-provider-1.33.spec‎

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.33.0
6+
%global rpmver %{gover}
7+
8+
%global _dwz_low_mem_die_limit 0
9+
10+
Name: %{_cross_os}ecr-credential-provider-1.33
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

‎packages/kubernetes-1.33/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/*-EKS-PATCH-*.patch

‎packages/kubernetes-1.33/Cargo.toml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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 = "kubernetes-1_33"
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 = "kubernetes-1.33"
15+
16+
[[package.metadata.build-package.external-files]]
17+
url = "https://distro.eks.amazonaws.com/kubernetes-1-33/releases/1/artifacts/kubernetes/v1.33.0-beta.0/kubernetes-src.tar.gz"
18+
sha512 = "45c059166c0d24ba928c446c32e766b77e24e40c61ac4bb54b28725f220793b33ff7d2f04cc355db077cdbd146041ae927cd0c87889ff4b835b9b6faa7a9a09c"
19+
20+
[build-dependencies]
21+
glibc = { path = "../glibc" }

‎packages/kubernetes-1.33/clarify.toml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
[clarify."github.com/JeffAshton/win_pdh"]
2+
expression = "BSD-3-Clause"
3+
license-files = [
4+
{ path = "LICENSE", hash = 0xb221dcc9 },
5+
]
6+
7+
[clarify."github.com/daviddengcn/go-colortext"]
8+
expression = "BSD-3-Clause AND MIT"
9+
license-files = [
10+
{ path = "LICENSE", hash = 0x9769fae1 },
11+
]
12+
13+
[clarify."github.com/ghodss/yaml"]
14+
expression = "MIT AND BSD-3-Clause"
15+
license-files = [
16+
{ path = "LICENSE", hash = 0xcdf3ae00 },
17+
]
18+
19+
[clarify."github.com/heketi/heketi"]
20+
# kubernetes only uses code that is under LGPLv3+/Apache 2.0, not the code that is GPLv2+/LGPLv3+
21+
expression = "LGPL-3.0-or-later OR Apache-2.0"
22+
license-files = [
23+
{ path = "LICENSE", hash = 0x3c4b96d1 },
24+
{ path = "LICENSE-APACHE2", hash = 0x438c8616 },
25+
{ path = "COPYING-LGPLV3", hash = 0xf0bccb3a },
26+
]
27+
skip-files = [ "COPYING-GPLV2" ]
28+
29+
[clarify."github.com/go-bindata/go-bindata"]
30+
expression = "CC0-1.0"
31+
license-files = [
32+
{ path = "LICENSE", hash = 0x393fafd6 },
33+
]
34+
35+
[clarify."github.com/miekg/dns"]
36+
expression = "BSD-3-Clause"
37+
license-files = [
38+
{ path = "COPYRIGHT", hash = 0xe41dd36c },
39+
{ path = "LICENSE", hash = 0xfc8f12ff },
40+
]
41+
42+
[clarify."sigs.k8s.io/yaml"]
43+
expression = "MIT AND BSD-3-Clause AND Apache-2.0"
44+
license-files = [
45+
{ path = "LICENSE", hash = 0x617d80bc },
46+
{ path = "goyaml.v2/LICENSE", hash = 0xe569d630 },
47+
{ path = "goyaml.v2/LICENSE.libyaml", hash = 0xa2e4ce3 },
48+
{ path = "goyaml.v2/NOTICE", hash = 0x49bceeb9 },
49+
{ path = "goyaml.v3/LICENSE", hash = 0x176b1f44 },
50+
{ path = "goyaml.v3/NOTICE", hash = 0x49bceeb9 },
51+
]
52+
53+
[clarify."honnef.co/go/tools"]
54+
expression = "MIT AND BSD-3-Clause AND Apache-2.0"
55+
license-files = [
56+
{ path = "LICENSE", hash = 0xad378ed2 },
57+
{ path = "LICENSE-THIRD-PARTY", hash = 0x546425eb },
58+
{ path = "lint/LICENSE", hash = 0xc6b58232 },
59+
{ path = "ssa/LICENSE", hash = 0xe656fb62 },
60+
]
61+
62+
[clarify."github.com/storageos/go-api"]
63+
expression = "MIT AND BSD-2-Clause"
64+
license-files = [
65+
{ path = "LICENCE", hash = 0x67a6861e },
66+
]
67+
skip-files = ["licence.go", "types/licence.go"]

‎packages/kubernetes-1.33/credential-provider-config-yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[required-extensions]
2+
aws = { version = "v1", optional = true }
3+
kubernetes = "v1"
4+
std = { version = "v1", helpers = ["default"] }
5+
+++
6+
apiVersion: kubelet.config.k8s.io/v1
7+
kind: CredentialProviderConfig
8+
providers:
9+
{{#if settings.kubernetes.credential-providers}}
10+
{{#each settings.kubernetes.credential-providers}}
11+
{{#if this.enabled}}
12+
- name: {{@key}}
13+
matchImages:
14+
{{#each this.image-patterns}}
15+
- "{{this}}"
16+
{{/each}}
17+
defaultCacheDuration: "{{default "12h" this.cache-duration}}"
18+
apiVersion: credentialprovider.kubelet.k8s.io/v1
19+
{{#if (eq @key "ecr-credential-provider")}}
20+
env:
21+
{{else}}
22+
{{#if this.environment}}
23+
env:
24+
{{/if}}
25+
{{/if}}
26+
{{#if this.environment}}
27+
{{#each this.environment}}
28+
- name: {{@key}}
29+
value: '{{this}}'
30+
{{/each}}
31+
{{/if}}
32+
{{#if (eq @key "ecr-credential-provider")}}
33+
- name: HOME
34+
value: '/root'
35+
{{#if @root.settings.aws.profile}}
36+
- name: AWS_PROFILE
37+
value: '{{@root.settings.aws.profile}}'
38+
{{/if}}
39+
{{/if}}
40+
{{/if}}
41+
{{/each}}
42+
{{/if}}

0 commit comments

Comments
 (0)