Commit c674687
authored
Trim linux headers to LTS kernel versions for 4.x and 5.x and include new LTS versions for 6.x kernels. (#2350)
Summary: Trim linux headers to LTS kernel versions for 4.x and 5.x and
include new LTS versions for 6.x kernels.
Relevant Issues: #2275, #2344
Type of change: /kind dependency
Test Plan: Deploy a vizier on the following platforms and compared pl7
headers vs the new pl8
- [x] Bottlerocket
- [x] Amazon Linux
- [x] k0s (6.12 kernel)
- [x] Google COS
- Verified that the new build process via `make prepare` creates
similarly sized tar files and has roughly the same files present (some
files were missing like .config, Makefile, Module.symvers, Kconfig,
compile.h, but not of these are used by the PEM)
<details><summary>Bottlerocket /etc/os-release</summary>
```
I20260410 02:06:57.094861 9891 system_info.cc:35] /host/etc/os-release:
NAME=Bottlerocket
ID=bottlerocket
VERSION="1.57.0 (aws-k8s-1.33)"
PRETTY_NAME="Bottlerocket OS 1.57.0 (aws-k8s-1.33)"
VARIANT_ID=aws-k8s-1.33
VERSION_ID=1.57.0
BUILD_ID=beaadc52
VENDOR_NAME=Bottlerocket
HOME_URL="https://github.com/bottlerocket-os/bottlerocket"
SUPPORT_URL="https://github.com/bottlerocket-os/bottlerocket/discussions"
BUG_REPORT_URL="https://github.com/bottlerocket-os/bottlerocket/issues"
DOCUMENTATION_URL="https://bottlerocket.dev"
```
</details>
<details><summary>Google COS /etc/os-release</summary>
```
I20260410 01:17:27.298167 14802 system_info.cc:35] /host/etc/os-release:
NAME="Container-Optimized OS"
ID=cos
PRETTY_NAME="Container-Optimized OS from Google"
HOME_URL="https://cloud.google.com/container-optimized-os/docs"
BUG_REPORT_URL="https://cloud.google.com/container-optimized-os/docs/resources/support-policy#contact_us"
GOOGLE_METRICS_PRODUCT_ID=26
KERNEL_COMMIT_ID=46c2d01887bed5038cc2b8bbd801ae2f7985e7f0
GOOGLE_CRASH_ID=Lakitu
VERSION=125
VERSION_ID=125
BUILD_ID=19216.104.126
```
</details>
<details><summary>header size comparision</summary>
```
Size Comparison
┌──────────┬────────┬───────────┬─────────┬─────────┐
│ Version │ Arch │ pl8 opt │ pl8 orig │ pl7 │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 4.18.20 │ x86_64 │ 7.6M │ 9.9M │ 7.7M │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 4.18.20 │ arm64 │ 7.3M │ 8.1M │ 7.5M │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 5.10.252 │ x86_64 │ 8.7M │ 12M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 5.10.252 │ arm64 │ 8.4M │ 9.9M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 5.14.21 │ x86_64 │ 8.9M │ 12M │ 8.8M │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 5.14.21 │ arm64 │ 8.6M │ 11M │ 8.8M │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.1.167 │ x86_64 │ 9.7M │ 13M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.1.167 │ arm64 │ 9.4M │ 12M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.6.132 │ x86_64 │ 11M │ 13M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.6.132 │ arm64 │ 9.8M │ 13M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.12.80 │ x86_64 │ 11M │ 14M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.12.80 │ arm64 │ 11M │ 14M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.18.21 │ x86_64 │ 12M │ 14M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.18.21 │ arm64 │ 11M │ 16M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.19.10 │ x86_64 │ 12M │ 14M │ N/A │
├──────────┼────────┼───────────┼─────────┼─────────┤
│ 6.19.10 │ arm64 │ 12M │ 16M │ N/A │
└──────────┴────────┴───────────┴─────────┴─────────┘
```
</details>
Changelog Message: Update the vizier-pem's prepackaged linux headers to
work with newer AMI / cloud images. This fixes an issue where some
platforms which don't have linux header packages (like Google COS)
wouldn't show protocol tracing data (#2344)
---------
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>1 parent ce0f158 commit c674687
4 files changed
Lines changed: 58 additions & 79 deletions
File tree
- bazel
- tools/docker
- linux_headers_image
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
32 | | - | |
| 31 | + | |
33 | 32 | | |
34 | | - | |
| 33 | + | |
35 | 34 | | |
36 | 35 | | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
40 | | - | |
41 | | - | |
| 39 | + | |
42 | 40 | | |
43 | | - | |
| 41 | + | |
44 | 42 | | |
45 | 43 | | |
46 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
105 | 95 | | |
106 | 96 | | |
107 | 97 | | |
| |||
112 | 102 | | |
113 | 103 | | |
114 | 104 | | |
115 | | - | |
116 | 105 | | |
117 | 106 | | |
118 | 107 | | |
| |||
135 | 124 | | |
136 | 125 | | |
137 | 126 | | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
146 | 134 | | |
147 | 135 | | |
148 | 136 | | |
| |||
251 | 239 | | |
252 | 240 | | |
253 | 241 | | |
254 | | - | |
255 | 242 | | |
256 | 243 | | |
257 | 244 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | 34 | | |
37 | 35 | | |
38 | 36 | | |
39 | 37 | | |
40 | | - | |
41 | | - | |
42 | 38 | | |
43 | 39 | | |
44 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
53 | 52 | | |
54 | 53 | | |
55 | 54 | | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | 58 | | |
64 | 59 | | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
| 60 | + | |
| 61 | + | |
75 | 62 | | |
76 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
77 | 68 | | |
78 | 69 | | |
79 | 70 | | |
80 | 71 | | |
81 | | - | |
82 | | - | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
83 | 80 | | |
84 | 81 | | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
96 | 94 | | |
97 | 95 | | |
98 | 96 | | |
| |||
0 commit comments