Skip to content

Commit 3419a9b

Browse files
emosbaughemosbaugh
authored
feat: support for rhel 9 variants (rhel, centos, ol, rocky) (#1045)
1 parent 7b56ed4 commit 3419a9b

26 files changed

+361
-40
lines changed

‎config/crds/troubleshoot.sh_hostcollectors.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,10 @@ spec:
11981198
items:
11991199
type: string
12001200
type: array
1201+
centos9:
1202+
items:
1203+
type: string
1204+
type: array
12011205
collectorName:
12021206
type: string
12031207
exclude:
@@ -1214,6 +1218,10 @@ spec:
12141218
items:
12151219
type: string
12161220
type: array
1221+
ol9:
1222+
items:
1223+
type: string
1224+
type: array
12171225
rhel:
12181226
items:
12191227
type: string
@@ -1226,6 +1234,22 @@ spec:
12261234
items:
12271235
type: string
12281236
type: array
1237+
rhel9:
1238+
items:
1239+
type: string
1240+
type: array
1241+
rocky:
1242+
items:
1243+
type: string
1244+
type: array
1245+
rocky8:
1246+
items:
1247+
type: string
1248+
type: array
1249+
rocky9:
1250+
items:
1251+
type: string
1252+
type: array
12291253
ubuntu:
12301254
items:
12311255
type: string

‎config/crds/troubleshoot.sh_hostpreflights.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,10 @@ spec:
11981198
items:
11991199
type: string
12001200
type: array
1201+
centos9:
1202+
items:
1203+
type: string
1204+
type: array
12011205
collectorName:
12021206
type: string
12031207
exclude:
@@ -1214,6 +1218,10 @@ spec:
12141218
items:
12151219
type: string
12161220
type: array
1221+
ol9:
1222+
items:
1223+
type: string
1224+
type: array
12171225
rhel:
12181226
items:
12191227
type: string
@@ -1226,6 +1234,22 @@ spec:
12261234
items:
12271235
type: string
12281236
type: array
1237+
rhel9:
1238+
items:
1239+
type: string
1240+
type: array
1241+
rocky:
1242+
items:
1243+
type: string
1244+
type: array
1245+
rocky8:
1246+
items:
1247+
type: string
1248+
type: array
1249+
rocky9:
1250+
items:
1251+
type: string
1252+
type: array
12291253
ubuntu:
12301254
items:
12311255
type: string

‎config/crds/troubleshoot.sh_supportbundles.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11130,6 +11130,10 @@ spec:
1113011130
items:
1113111131
type: string
1113211132
type: array
11133+
centos9:
11134+
items:
11135+
type: string
11136+
type: array
1113311137
collectorName:
1113411138
type: string
1113511139
exclude:
@@ -11146,6 +11150,10 @@ spec:
1114611150
items:
1114711151
type: string
1114811152
type: array
11153+
ol9:
11154+
items:
11155+
type: string
11156+
type: array
1114911157
rhel:
1115011158
items:
1115111159
type: string
@@ -11158,6 +11166,22 @@ spec:
1115811166
items:
1115911167
type: string
1116011168
type: array
11169+
rhel9:
11170+
items:
11171+
type: string
11172+
type: array
11173+
rocky:
11174+
items:
11175+
type: string
11176+
type: array
11177+
rocky8:
11178+
items:
11179+
type: string
11180+
type: array
11181+
rocky9:
11182+
items:
11183+
type: string
11184+
type: array
1116111185
ubuntu:
1116211186
items:
1116311187
type: string

‎examples/preflight/host/system-packages.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,34 @@ spec:
2121
rhel8:
2222
- nfs-utils
2323
- openssl
24+
rhel9:
25+
- nfs-utils
26+
- openssl
27+
rocky8:
28+
- nfs-utils
29+
- openssl
30+
rocky9:
31+
- nfs-utils
32+
- openssl
2433
centos:
2534
- iscsi-initiator-utils
2635
centos7:
2736
- libzstd
2837
centos8:
2938
- nfs-utils
3039
- openssl
40+
centos9:
41+
- nfs-utils
42+
- openssl
3143
ol:
3244
- lvm2
3345
ol7:
3446
- libzstd
3547
- openssl
3648
ol8:
3749
- nfs-utils
50+
ol9:
51+
- nfs-utils
3852
amzn:
3953
- libzstd
4054
amzn2:

‎pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,18 @@ type HostSystemPackages struct {
8282
RHEL []string `json:"rhel,omitempty"`
8383
RHEL7 []string `json:"rhel7,omitempty"`
8484
RHEL8 []string `json:"rhel8,omitempty"`
85+
RHEL9 []string `json:"rhel9,omitempty"`
86+
RockyLinux []string `json:"rocky,omitempty"`
87+
RockyLinux8 []string `json:"rocky8,omitempty"`
88+
RockyLinux9 []string `json:"rocky9,omitempty"`
8589
CentOS []string `json:"centos,omitempty"`
8690
CentOS7 []string `json:"centos7,omitempty"`
8791
CentOS8 []string `json:"centos8,omitempty"`
92+
CentOS9 []string `json:"centos9,omitempty"`
8893
OracleLinux []string `json:"ol,omitempty"`
8994
OracleLinux7 []string `json:"ol7,omitempty"`
9095
OracleLinux8 []string `json:"ol8,omitempty"`
96+
OracleLinux9 []string `json:"ol9,omitempty"`
9197
AmazonLinux []string `json:"amzn,omitempty"`
9298
AmazonLinux2 []string `json:"amzn2,omitempty"`
9399
}

‎pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go‎

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

‎pkg/client/troubleshootclientset/clientset.go‎

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

‎pkg/client/troubleshootclientset/typed/troubleshoot/v1beta1/fake/fake_analyzer.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/troubleshootclientset/typed/troubleshoot/v1beta1/fake/fake_collector.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/troubleshootclientset/typed/troubleshoot/v1beta1/fake/fake_preflight.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)