From bf8fc8b0861fe4e9258628fd48424940429a4d0d Mon Sep 17 00:00:00 2001 From: Brandon Palm Date: Tue, 17 Dec 2024 11:42:30 -0600 Subject: [PATCH] Update preflight to v1.11.1 --- CATALOG.md | 28 ++++++++++++++++++++++------ go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/CATALOG.md b/CATALOG.md index 6c80a42df..fbe1d18f8 100644 --- a/CATALOG.md +++ b/CATALOG.md @@ -7,7 +7,7 @@ Depending on the workload type, not all tests are required to pass to satisfy be ## Test cases summary -### Total test cases: 117 +### Total test cases: 118 ### Total suites: 10 @@ -22,7 +22,7 @@ Depending on the workload type, not all tests are required to pass to satisfy be |operator|11| |performance|6| |platform-alteration|13| -|preflight|17| +|preflight|18| ### Extended specific tests only: 12 @@ -36,11 +36,11 @@ Depending on the workload type, not all tests are required to pass to satisfy be |---|---| |8|1| -### Non-Telco specific tests only: 69 +### Non-Telco specific tests only: 70 |Mandatory|Optional| |---|---| -|44|25| +|44|26| ### Telco specific tests only: 27 @@ -1800,13 +1800,29 @@ Tags|common,preflight |Non-Telco|Optional| |Telco|Optional| +#### preflight-HasProhibitedContainerName + +Property|Description +---|--- +Unique ID|preflight-HasProhibitedContainerName +Description|Checking if the container-name violates Red Hat trademark. +Suggested Remediation|Update container-name ie (quay.io/repo-name/container-name) to not violate Red Hat trademark. +Best Practice Reference|No Doc Link +Exception Process|There is no documented exception process for this. +Tags|common,preflight +|**Scenario**|**Optional/Mandatory**| +|Extended|Optional| +|Far-Edge|Optional| +|Non-Telco|Optional| +|Telco|Optional| + #### preflight-HasRequiredLabel Property|Description ---|--- Unique ID|preflight-HasRequiredLabel -Description|Checking if the required labels (name, vendor, version, release, summary, description) are present in the container metadata. -Suggested Remediation|Add the following labels to your Dockerfile or Containerfile: name, vendor, version, release, summary, description +Description|Checking if the required labels (name, vendor, version, release, summary, description, maintainer) are present in the container metadata and that they do not violate Red Hat trademark. +Suggested Remediation|Add the following labels to your Dockerfile or Containerfile: name, vendor, version, release, summary, description, maintainer and validate that they do not violate Red Hat trademark. Best Practice Reference|No Doc Link Exception Process|There is no documented exception process for this. Tags|common,preflight diff --git a/go.mod b/go.mod index 5cac7cb21..d24671bd9 100644 --- a/go.mod +++ b/go.mod @@ -143,7 +143,7 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/onsi/gomega v1.35.1 // indirect + github.com/onsi/gomega v1.36.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect github.com/openshift/library-go v0.0.0-20231020125025-211b32f1a1f2 // indirect @@ -218,7 +218,7 @@ require ( modernc.org/sqlite v1.28.0 // indirect oras.land/oras-go v1.2.5 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect - sigs.k8s.io/controller-runtime v0.19.0 // indirect + sigs.k8s.io/controller-runtime v0.19.3 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect sigs.k8s.io/kustomize/api v0.18.0 // indirect @@ -243,7 +243,7 @@ require ( github.com/manifoldco/promptui v0.9.0 github.com/redhat-best-practices-for-k8s/oct v0.0.29 github.com/redhat-best-practices-for-k8s/privileged-daemonset v1.0.43 - github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241021175030-e64988a27024 + github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241211152839-f787b66d23c7 github.com/robert-nix/ansihtml v1.0.1 golang.org/x/term v0.27.0 google.golang.org/api v0.212.0 @@ -251,6 +251,6 @@ require ( k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 ) -replace github.com/redhat-openshift-ecosystem/openshift-preflight => github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241021175030-e64988a27024 +replace github.com/redhat-openshift-ecosystem/openshift-preflight => github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241211152839-f787b66d23c7 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20241024191314-684b2b1679ba diff --git a/go.sum b/go.sum index 72a7bdb16..d34006fb7 100644 --- a/go.sum +++ b/go.sum @@ -409,10 +409,10 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= -github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= -github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= -github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= +github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= +github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y= +github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -476,8 +476,8 @@ github.com/redhat-best-practices-for-k8s/oct v0.0.29 h1:NpS7W+jTflncjnMTXYKzt/NV github.com/redhat-best-practices-for-k8s/oct v0.0.29/go.mod h1:jAVJkKvP2URy4oPwxARzYoUn8Zn7qYfWUD5+P4rywgw= github.com/redhat-best-practices-for-k8s/privileged-daemonset v1.0.43 h1:/M2L223DOvv/I4bb5ZFgqchN3vwRMnsa6fjaTd4XhUI= github.com/redhat-best-practices-for-k8s/privileged-daemonset v1.0.43/go.mod h1:XVI9IK9DKYKz21XYxBcRYJMeN8Meily8meHOz1Yxcyw= -github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241021175030-e64988a27024 h1:qPsNS6SIDigSwcUMUrEdDovIAdbVCNOGvhir8p6wVNc= -github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241021175030-e64988a27024/go.mod h1:WgrOUZnQYsTQetJwbMHkcNecYaOcWMmTVDmDOTTIMcQ= +github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241211152839-f787b66d23c7 h1:zfL9KPgdJ5m0KuEUg283u2eQjJ++nm916W+dGj1cbRk= +github.com/redhat-openshift-ecosystem/openshift-preflight v0.0.0-20241211152839-f787b66d23c7/go.mod h1:OfW8qqVJj2/rhgoC7unTiGDsLRwmKwaGAnHU5yaC3+k= github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho= github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U= github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc= @@ -783,8 +783,8 @@ oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= -sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= +sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw= +sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 h1:PFWFSkpArPNJxFX4ZKWAk9NSeRoZaXschn+ULa4xVek=