Skip to content

Commit e16a0f8

Browse files
piyush-jenapiyush-jena
committed
variants: add k8s-1.34 variants
Signed-off-by: Piyush Jena <jepiyush@amazon.com>
1 parent 431fe75 commit e16a0f8

90 files changed

Lines changed: 541 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

Lines changed: 45 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ members = [
2020
"variants/aws-k8s-1.32-fips",
2121
"variants/aws-k8s-1.33",
2222
"variants/aws-k8s-1.33-fips",
23+
"variants/aws-k8s-1.34",
24+
"variants/aws-k8s-1.34-fips",
2325
"variants/aws-k8s-1.28-nvidia",
2426
"variants/aws-k8s-1.29-nvidia",
2527
"variants/aws-k8s-1.30-nvidia",
2628
"variants/aws-k8s-1.31-nvidia",
2729
"variants/aws-k8s-1.32-nvidia",
2830
"variants/aws-k8s-1.33-nvidia",
31+
"variants/aws-k8s-1.34-nvidia",
2932
"variants/metal-dev",
3033
"variants/vmware-dev",
3134
"variants/vmware-k8s-1.28",
@@ -40,6 +43,8 @@ members = [
4043
"variants/vmware-k8s-1.32-fips",
4144
"variants/vmware-k8s-1.33",
4245
"variants/vmware-k8s-1.33-fips",
46+
"variants/vmware-k8s-1.34",
47+
"variants/vmware-k8s-1.34-fips",
4348
]
4449

4550
[profile.dev]

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@ The following variants support EKS, as described above:
6767
* `aws-k8s-1.31`
6868
* `aws-k8s-1.32`
6969
* `aws-k8s-1.33`
70+
* `aws-k8s-1.34`
7071
* `aws-k8s-1.28-nvidia`
7172
* `aws-k8s-1.29-nvidia`
7273
* `aws-k8s-1.30-nvidia`
7374
* `aws-k8s-1.31-nvidia`
7475
* `aws-k8s-1.32-nvidia`
7576
* `aws-k8s-1.33-nvidia`
77+
* `aws-k8s-1.34-nvidia`
7678

7779
The following variants support ECS:
7880

@@ -87,6 +89,7 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware:
8789
* `vmware-k8s-1.31`
8890
* `vmware-k8s-1.32`
8991
* `vmware-k8s-1.33`
92+
* `vmware-k8s-1.34`
9093

9194
The following variants are no longer supported:
9295

‎packages/settings-defaults/settings-defaults.spec‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,32 @@ Conflicts: %{_cross_os}settings-defaults(any)
147147
%description aws-k8s-1.33-nvidia
148148
%{summary}.
149149

150+
%package aws-k8s-1.34
151+
Summary: Settings defaults for the aws-k8s 1.34 variants
152+
Requires: (%{shrink:
153+
%{_cross_os}variant(aws-k8s-1.34) or
154+
%{_cross_os}variant(aws-k8s-1.34-fips)
155+
%{nil}})
156+
Provides: %{_cross_os}settings-defaults(any)
157+
Provides: %{_cross_os}settings-defaults(aws-k8s-1.34)
158+
Provides: %{_cross_os}settings-defaults(aws-k8s-1.34-fips)
159+
Conflicts: %{_cross_os}settings-defaults(any)
160+
161+
%description aws-k8s-1.34
162+
%{summary}.
163+
164+
%package aws-k8s-1.34-nvidia
165+
Summary: Settings defaults for the aws-k8s 1.34 nvidia variants
166+
Requires: (%{shrink:
167+
%{_cross_os}variant(aws-k8s-1.34-nvidia)
168+
%{nil}})
169+
Provides: %{_cross_os}settings-defaults(any)
170+
Provides: %{_cross_os}settings-defaults(aws-k8s-1.34-nvidia)
171+
Conflicts: %{_cross_os}settings-defaults(any)
172+
173+
%description aws-k8s-1.34-nvidia
174+
%{summary}.
175+
150176
%package metal-dev
151177
Summary: Settings defaults for the metal-dev variant
152178
Requires: %{_cross_os}variant(metal-dev)
@@ -211,6 +237,20 @@ Conflicts: %{_cross_os}settings-defaults(any)
211237
%description vmware-k8s-1.33
212238
%{summary}.
213239

240+
%package vmware-k8s-1.34
241+
Summary: Settings defaults for the vmware-k8s 1.34 variants
242+
Requires: (%{shrink:
243+
%{_cross_os}variant(vmware-k8s-1.34) or
244+
%{_cross_os}variant(vmware-k8s-1.34-fips)
245+
%{nil}})
246+
Provides: %{_cross_os}settings-defaults(any)
247+
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34)
248+
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34-fips)
249+
Conflicts: %{_cross_os}settings-defaults(any)
250+
251+
%description vmware-k8s-1.34
252+
%{summary}.
253+
214254
%prep
215255
%setup -T -c
216256
%cargo_prep
@@ -227,10 +267,13 @@ for defaults in \
227267
aws-k8s-1.32-nvidia \
228268
aws-k8s-1.33 \
229269
aws-k8s-1.33-nvidia \
270+
aws-k8s-1.34 \
271+
aws-k8s-1.34-nvidia \
230272
metal-dev \
231273
vmware-dev \
232274
vmware-k8s-1.32 \
233275
vmware-k8s-1.33 \
276+
vmware-k8s-1.34 \
234277
;
235278
do
236279
projects+=( "-p" "settings-defaults-$(echo "${defaults}" | sed -e 's,\.,_,g')" )
@@ -260,10 +303,13 @@ for defaults in \
260303
aws-k8s-1.32-nvidia \
261304
aws-k8s-1.33 \
262305
aws-k8s-1.33-nvidia \
306+
aws-k8s-1.34 \
307+
aws-k8s-1.34-nvidia \
263308
metal-dev \
264309
vmware-dev \
265310
vmware-k8s-1.32 \
266311
vmware-k8s-1.33 \
312+
vmware-k8s-1.34 \
267313
;
268314
do
269315
crate="$(echo "${defaults}" | sed -e 's,\.,_,g')"
@@ -314,6 +360,14 @@ done
314360
%{_cross_defaultsdir}/aws-k8s-1.33-nvidia.toml
315361
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.33-nvidia.conf
316362

363+
%files aws-k8s-1.34
364+
%{_cross_defaultsdir}/aws-k8s-1.34.toml
365+
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.34.conf
366+
367+
%files aws-k8s-1.34-nvidia
368+
%{_cross_defaultsdir}/aws-k8s-1.34-nvidia.toml
369+
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.34-nvidia.conf
370+
317371
%files metal-dev
318372
%{_cross_defaultsdir}/metal-dev.toml
319373
%{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf
@@ -329,3 +383,7 @@ done
329383
%files vmware-k8s-1.33
330384
%{_cross_defaultsdir}/vmware-k8s-1.33.toml
331385
%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.33.conf
386+
387+
%files vmware-k8s-1.34
388+
%{_cross_defaultsdir}/vmware-k8s-1.34.toml
389+
%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.34.conf

‎packages/settings-plugins/settings-plugins.spec‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.32)
6262
Provides: %{_cross_os}settings-plugin(aws-k8s-1.32-fips)
6363
Provides: %{_cross_os}settings-plugin(aws-k8s-1.33)
6464
Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-fips)
65+
Provides: %{_cross_os}settings-plugin(aws-k8s-1.34)
66+
Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-fips)
6567
Conflicts: %{_cross_os}settings-plugin(any)
6668
Conflicts: %{_cross_os}variant-flavor(nvidia)
6769

@@ -79,6 +81,7 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-nvidia)
7981
Provides: %{_cross_os}settings-plugin(aws-k8s-1.31-nvidia)
8082
Provides: %{_cross_os}settings-plugin(aws-k8s-1.32-nvidia)
8183
Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-nvidia)
84+
Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-nvidia)
8285
Conflicts: %{_cross_os}settings-plugin(any)
8386

8487
%description aws-k8s-nvidia
@@ -120,6 +123,8 @@ Provides: %{_cross_os}settings-plugin(vmware-k8s-1.32)
120123
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.32-fips)
121124
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.33)
122125
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.33-fips)
126+
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.34)
127+
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.34-fips)
123128
Conflicts: %{_cross_os}settings-plugin(any)
124129

125130
%description vmware-k8s

‎sources/Cargo.lock‎

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

‎sources/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@ members = [
2222
"settings-defaults/aws-k8s-1.32-nvidia",
2323
"settings-defaults/aws-k8s-1.33",
2424
"settings-defaults/aws-k8s-1.33-nvidia",
25+
"settings-defaults/aws-k8s-1.34",
26+
"settings-defaults/aws-k8s-1.34-nvidia",
2527
"settings-defaults/metal-dev",
2628
"settings-defaults/metal-k8s-1.30",
2729
"settings-defaults/vmware-dev",
2830
"settings-defaults/vmware-k8s-1.32",
2931
"settings-defaults/vmware-k8s-1.33",
32+
"settings-defaults/vmware-k8s-1.34",
3033

3134
# (all previous migrations archived; add new ones after this line)
3235
"settings-migrations/v1.34.0/kubelet-device-plugins-mig-settings",

‎sources/settings-defaults/aws-k8s-1.34-nvidia/Cargo.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[package]
2+
name = "settings-defaults-aws-k8s-1_34-nvidia"
3+
version = "0.1.0"
4+
edition = "2021"
5+
license = "Apache-2.0 OR MIT"
6+
publish = false
7+
build = "../build-defaults.rs"
8+
9+
[lib]
10+
path = "../defaults-toml.rs"
11+
12+
[build-dependencies]
13+
bottlerocket-defaults-helper.workspace = true

‎sources/settings-defaults/aws-k8s-1.34-nvidia/defaults.d/10-defaults.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../shared-defaults/defaults.toml

‎sources/settings-defaults/aws-k8s-1.34-nvidia/defaults.d/15-aws-tuf.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../shared-defaults/aws-tuf.toml

0 commit comments

Comments
 (0)