Skip to content

Commit 73c5a17

Browse files
vigh-mvigh-m
authored
Merge pull request #4827 from vigh-m/bob-eks-136
variants: add k8s-1.36 variants
2 parents bd25a18 + d73417f commit 73c5a17

100 files changed

Lines changed: 618 additions & 13 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: 54 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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ members = [
2525
"variants/aws-k8s-1.34-fips",
2626
"variants/aws-k8s-1.35",
2727
"variants/aws-k8s-1.35-fips",
28+
"variants/aws-k8s-1.36",
29+
"variants/aws-k8s-1.36-fips",
2830
"variants/aws-k8s-1.30-nvidia",
2931
"variants/aws-k8s-1.30-nvidia-fips",
3032
"variants/aws-k8s-1.31-nvidia",
@@ -37,6 +39,8 @@ members = [
3739
"variants/aws-k8s-1.34-nvidia-fips",
3840
"variants/aws-k8s-1.35-nvidia",
3941
"variants/aws-k8s-1.35-nvidia-fips",
42+
"variants/aws-k8s-1.36-nvidia",
43+
"variants/aws-k8s-1.36-nvidia-fips",
4044
"variants/metal-dev",
4145
"variants/vmware-dev",
4246
"variants/vmware-k8s-1.30",
@@ -51,6 +55,8 @@ members = [
5155
"variants/vmware-k8s-1.34-fips",
5256
"variants/vmware-k8s-1.35",
5357
"variants/vmware-k8s-1.35-fips",
58+
"variants/vmware-k8s-1.36",
59+
"variants/vmware-k8s-1.36-fips",
5460
]
5561

5662
[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.33`
6868
* `aws-k8s-1.34`
6969
* `aws-k8s-1.35`
70+
* `aws-k8s-1.36`
7071
* `aws-k8s-1.30-nvidia`
7172
* `aws-k8s-1.31-nvidia`
7273
* `aws-k8s-1.32-nvidia`
7374
* `aws-k8s-1.33-nvidia`
7475
* `aws-k8s-1.34-nvidia`
7576
* `aws-k8s-1.35-nvidia`
77+
* `aws-k8s-1.36-nvidia`
7678

7779
The following variants support ECS:
7880

@@ -90,6 +92,7 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware:
9092
* `vmware-k8s-1.33`
9193
* `vmware-k8s-1.34`
9294
* `vmware-k8s-1.35`
95+
* `vmware-k8s-1.36`
9396

9497
The following variants are no longer supported:
9598

‎Release.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "1.60.0"
1+
version = "1.61.0"
22

33
[migrations]
44
"(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -468,3 +468,4 @@ version = "1.60.0"
468468
"migrate_v1.60.0_kubernetes-topology-manager-policy-options.lz4",
469469
"migrate_v1.60.0_container-runtime-max-concurrent-unpacks.lz4",
470470
]
471+
"(1.60.0, 1.61.0)" = []

‎Twoliter.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ digest = "P53kyrWy7GdGpasy3WpIAiUNvH0YI/K3IPo4Fnk3Lws="
1717

1818
[[kit]]
1919
name = "bottlerocket-core-kit"
20-
version = "14.2.0"
20+
version = "14.3.0"
2121
vendor = "bottlerocket"
22-
source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v14.2.0"
23-
digest = "gYCGdzwB2xxCZY8kdwiYUqwGC3hWMM7yQm8kR/9dRvo="
22+
source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v14.3.0"
23+
digest = "LVzsIAIk1ReTF1ftGAnyjL2Y6dfx6L9WulRuEqJrrZw="

‎Twoliter.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
schema-version = 2
2-
release-version = "1.60.0"
2+
release-version = "1.61.0"
33
project-vendor = "Bottlerocket"
44

55
[vendor.bottlerocket]
@@ -17,5 +17,5 @@ vendor = "bottlerocket"
1717

1818
[[kit]]
1919
name = "bottlerocket-core-kit"
20-
version = "14.2.0"
20+
version = "14.3.0"
2121
vendor = "bottlerocket"

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

Lines changed: 67 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,34 @@ Conflicts: %{_cross_os}settings-defaults(any)
231231
%description aws-k8s-1.35-nvidia
232232
%{summary}.
233233

234+
%package aws-k8s-1.36
235+
Summary: Settings defaults for the aws-k8s 1.36 variants
236+
Requires: (%{shrink:
237+
%{_cross_os}variant(aws-k8s-1.36) or
238+
%{_cross_os}variant(aws-k8s-1.36-fips)
239+
%{nil}})
240+
Provides: %{_cross_os}settings-defaults(any)
241+
Provides: %{_cross_os}settings-defaults(aws-k8s-1.36)
242+
Provides: %{_cross_os}settings-defaults(aws-k8s-1.36-fips)
243+
Conflicts: %{_cross_os}settings-defaults(any)
244+
245+
%description aws-k8s-1.36
246+
%{summary}.
247+
248+
%package aws-k8s-1.36-nvidia
249+
Summary: Settings defaults for the aws-k8s 1.36 nvidia variants
250+
Requires: (%{shrink:
251+
%{_cross_os}variant(aws-k8s-1.36-nvidia) or
252+
%{_cross_os}variant(aws-k8s-1.36-nvidia-fips)
253+
%{nil}})
254+
Provides: %{_cross_os}settings-defaults(any)
255+
Provides: %{_cross_os}settings-defaults(aws-k8s-1.36-nvidia)
256+
Provides: %{_cross_os}settings-defaults(aws-k8s-1.36-nvidia-fips)
257+
Conflicts: %{_cross_os}settings-defaults(any)
258+
259+
%description aws-k8s-1.36-nvidia
260+
%{summary}.
261+
234262
%package metal-dev
235263
Summary: Settings defaults for the metal-dev variant
236264
Requires: %{_cross_os}variant(metal-dev)
@@ -287,6 +315,20 @@ Conflicts: %{_cross_os}settings-defaults(any)
287315
%description vmware-k8s-1.33
288316
%{summary}.
289317

318+
%package vmware-k8s-1.34
319+
Summary: Settings defaults for the vmware-k8s 1.34 variants
320+
Requires: (%{shrink:
321+
%{_cross_os}variant(vmware-k8s-1.34) or
322+
%{_cross_os}variant(vmware-k8s-1.34-fips)
323+
%{nil}})
324+
Provides: %{_cross_os}settings-defaults(any)
325+
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34)
326+
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34-fips)
327+
Conflicts: %{_cross_os}settings-defaults(any)
328+
329+
%description vmware-k8s-1.34
330+
%{summary}.
331+
290332
%package vmware-k8s-1.35
291333
Summary: Settings defaults for the vmware-k8s 1.35 variants
292334
Requires: (%{shrink:
@@ -301,18 +343,18 @@ Conflicts: %{_cross_os}settings-defaults(any)
301343
%description vmware-k8s-1.35
302344
%{summary}.
303345

304-
%package vmware-k8s-1.34
305-
Summary: Settings defaults for the vmware-k8s 1.34 variants
346+
%package vmware-k8s-1.36
347+
Summary: Settings defaults for the vmware-k8s 1.35 variants
306348
Requires: (%{shrink:
307-
%{_cross_os}variant(vmware-k8s-1.34) or
308-
%{_cross_os}variant(vmware-k8s-1.34-fips)
349+
%{_cross_os}variant(vmware-k8s-1.36) or
350+
%{_cross_os}variant(vmware-k8s-1.36-fips)
309351
%{nil}})
310352
Provides: %{_cross_os}settings-defaults(any)
311-
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34)
312-
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34-fips)
353+
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.36)
354+
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.36-fips)
313355
Conflicts: %{_cross_os}settings-defaults(any)
314356

315-
%description vmware-k8s-1.34
357+
%description vmware-k8s-1.36
316358
%{summary}.
317359

318360
%prep
@@ -337,12 +379,15 @@ for defaults in \
337379
aws-k8s-1.34-nvidia \
338380
aws-k8s-1.35 \
339381
aws-k8s-1.35-nvidia \
382+
aws-k8s-1.36 \
383+
aws-k8s-1.36-nvidia \
340384
metal-dev \
341385
vmware-dev \
342386
vmware-k8s-1.32 \
343387
vmware-k8s-1.33 \
344388
vmware-k8s-1.34 \
345389
vmware-k8s-1.35 \
390+
vmware-k8s-1.36 \
346391
;
347392
do
348393
projects+=( "-p" "settings-defaults-$(echo "${defaults}" | sed -e 's,\.,_,g')" )
@@ -378,12 +423,15 @@ for defaults in \
378423
aws-k8s-1.34-nvidia \
379424
aws-k8s-1.35 \
380425
aws-k8s-1.35-nvidia \
426+
aws-k8s-1.36 \
427+
aws-k8s-1.36-nvidia \
381428
metal-dev \
382429
vmware-dev \
383430
vmware-k8s-1.32 \
384431
vmware-k8s-1.33 \
385432
vmware-k8s-1.34 \
386433
vmware-k8s-1.35 \
434+
vmware-k8s-1.36 \
387435
;
388436
do
389437
crate="$(echo "${defaults}" | sed -e 's,\.,_,g')"
@@ -458,6 +506,14 @@ done
458506
%{_cross_defaultsdir}/aws-k8s-1.35-nvidia.toml
459507
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.35-nvidia.conf
460508

509+
%files aws-k8s-1.36
510+
%{_cross_defaultsdir}/aws-k8s-1.36.toml
511+
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.36.conf
512+
513+
%files aws-k8s-1.36-nvidia
514+
%{_cross_defaultsdir}/aws-k8s-1.36-nvidia.toml
515+
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.36-nvidia.conf
516+
461517
%files metal-dev
462518
%{_cross_defaultsdir}/metal-dev.toml
463519
%{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf
@@ -481,3 +537,7 @@ done
481537
%files vmware-k8s-1.35
482538
%{_cross_defaultsdir}/vmware-k8s-1.35.toml
483539
%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.35.conf
540+
541+
%files vmware-k8s-1.36
542+
%{_cross_defaultsdir}/vmware-k8s-1.36.toml
543+
%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.36.conf

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.34)
8282
Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-fips)
8383
Provides: %{_cross_os}settings-plugin(aws-k8s-1.35)
8484
Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-fips)
85+
Provides: %{_cross_os}settings-plugin(aws-k8s-1.36)
86+
Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-fips)
8587
Conflicts: %{_cross_os}settings-plugin(any)
8688
Conflicts: %{_cross_os}variant-flavor(nvidia)
8789

@@ -105,6 +107,8 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-nvidia)
105107
Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-nvidia-fips)
106108
Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-nvidia)
107109
Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-nvidia-fips)
110+
Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-nvidia)
111+
Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-nvidia-fips)
108112
Conflicts: %{_cross_os}settings-plugin(any)
109113

110114
%description aws-k8s-nvidia
@@ -146,6 +150,8 @@ Provides: %{_cross_os}settings-plugin(vmware-k8s-1.34)
146150
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.34-fips)
147151
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.35)
148152
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.35-fips)
153+
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.36)
154+
Provides: %{_cross_os}settings-plugin(vmware-k8s-1.36-fips)
149155
Conflicts: %{_cross_os}settings-plugin(any)
150156

151157
%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
@@ -28,13 +28,16 @@ members = [
2828
"settings-defaults/aws-k8s-1.34-nvidia",
2929
"settings-defaults/aws-k8s-1.35",
3030
"settings-defaults/aws-k8s-1.35-nvidia",
31+
"settings-defaults/aws-k8s-1.36",
32+
"settings-defaults/aws-k8s-1.36-nvidia",
3133
"settings-defaults/metal-dev",
3234
"settings-defaults/metal-k8s-1.30",
3335
"settings-defaults/vmware-dev",
3436
"settings-defaults/vmware-k8s-1.32",
3537
"settings-defaults/vmware-k8s-1.33",
3638
"settings-defaults/vmware-k8s-1.34",
3739
"settings-defaults/vmware-k8s-1.35",
40+
"settings-defaults/vmware-k8s-1.36",
3841

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

0 commit comments

Comments
 (0)