Skip to content

Commit 92060e4

Browse files
committed
feat: add STIG compliance adjustments to hack/release files
Signed-off-by: Michael Zeevi <[email protected]>
1 parent 3178ca1 commit 92060e4

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

hack/release.go

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ type Release struct {
6767
SriovCni *ReleaseImageSpec
6868
SriovIbCni *ReleaseImageSpec
6969
Mofed *ReleaseImageSpec
70+
MofedStig *ReleaseImageSpec
7071
RdmaSharedDevicePlugin *ReleaseImageSpec
7172
SriovDevicePlugin *ReleaseImageSpec
7273
IbKubernetes *ReleaseImageSpec
@@ -185,19 +186,31 @@ func docaDriverTagsCheck(release *Release, docaDriverMatrix *string) {
185186
fmt.Printf("Error: %v\n", err)
186187
os.Exit(1)
187188
}
188-
if err := validateTags(config, tags, release.Mofed.Version); err != nil {
189+
tagsStig, err := listTags(release.MofedStig.Repository, release.MofedStig.Image)
190+
if err != nil {
191+
fmt.Printf("Error: %v\n", err)
192+
os.Exit(1)
193+
}
194+
if err := validateTags(config, tags, release.Mofed.Version, func(os string) bool {return !strings.HasSuffix(os, "-stig")}); err != nil {
195+
fmt.Printf("Error: %v\n", err)
196+
os.Exit(1)
197+
}
198+
if err := validateTags(config, tagsStig, release.MofedStig.Version, func(os string) bool {return strings.HasSuffix(os, "-stig")}); err != nil {
189199
fmt.Printf("Error: %v\n", err)
190200
os.Exit(1)
191201
}
192202
}
193203

194-
func validateTags(config DocaDriverMatrix, tags []string, version string) error {
204+
func validateTags(config DocaDriverMatrix, tags []string, version string, shouldValidateOsFunction func(string) bool) error {
195205
// Build expected OS-arch combinations
196206
expectedCombinations := make(map[string]struct{})
197207
for _, entry := range config.DynamicallyCompiled {
198208
for _, arch := range entry.Arches {
199-
key := fmt.Sprintf("%s-%s", entry.OS, arch)
200-
expectedCombinations[key] = struct{}{}
209+
shouldValidateCurrentEntry := shouldValidateOsFunction(entry.OS)
210+
if shouldValidateCurrentEntry {
211+
key := fmt.Sprintf("%s-%s", entry.OS, arch)
212+
expectedCombinations[key] = struct{}{}
213+
}
201214
}
202215
}
203216

hack/release.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Mofed:
3838
image: doca-driver
3939
repository: nvcr.io/nvstaging/mellanox
4040
version: doca3.2.0-25.10-0.8.4.0-0
41+
MofedStig:
42+
image: doca-driver-stig
43+
repository: nvcr.io/nvstaging/mellanox
44+
version: doca3.2.0-25.10-0.4.2.0-0
4145
RdmaSharedDevicePlugin:
4246
image: k8s-rdma-shared-dev-plugin
4347
repository: nvcr.io/nvstaging/mellanox

0 commit comments

Comments
 (0)