Skip to content

CMP-4475: Install OpenShift Virtualization operator for OCP-Virt e2e #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vincent056 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

CMP-4475: Install OpenShift Virtualization operator for OCP-Virt e2e #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0f83ab
CMP-4475: Install OpenShift Virtualization operator for OCP-Virt e2e
Vincent056 Jul 2, 2026
33369e7
CMP-4475: Harden HCO creation and add live CNV install test
Vincent056 Jul 7, 2026
7caca1b
CMP-4475: Wire install-virt/cel-content-file into make e2e-profile + …
Vincent056 Jul 7, 2026
60edbc5
CMP-4475: Drop docs file (moved to PR description/comment)
Vincent056 Jul 7, 2026
c4dbe5e
CMP-4475: Bump compliance-operator to v1.9.0 and wire typed CELConten…
Vincent056 Jul 8, 2026
db231a2
CMP-4475: Make e2e-profile usable for custom content locally + fix lo…
Vincent056 Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 16 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@ INSTALL_OPERATOR?=true
BYPASS_REMEDIATIONS?=false
# Type of rules to test: platform, node, or all
TEST_TYPE?=all
# Install the OpenShift Virtualization (CNV) operator during setup. Set to true
# for the OCP-Virt profiles so they can run on a cluster without CNV.
INSTALL_VIRT?=false
# Path (inside the content image) to the CEL content YAML. Set for CEL profiles
# (e.g. the CIS OpenShift Virtualization benchmark), e.g. ocp4-cel-content.yaml.
CEL_CONTENT_FILE?=
# Content image to test. Leave empty to use the built-in default; set to a
# custom image (e.g. one built with CEL content) to test it.
CONTENT_IMAGE?=
CONTENT_IMAGE_FLAG:=$(if $(strip $(CONTENT_IMAGE)),-content-image="$(CONTENT_IMAGE)")
# Directory for logs/artifacts (assertion files, reports). Defaults to the CI
# path; override for local runs, e.g. LOG_DIR=/tmp/artifacts.
LOG_DIR?=
LOG_DIR_FLAG:=$(if $(strip $(LOG_DIR)),-log-dir="$(LOG_DIR)")

GOLANGCI_LINT_VERSION=latest
BUILD_DIR := build
Expand All @@ -31,11 +45,11 @@ e2e-node: install-jq ## Run only node compliance tests

.PHONY: e2e-profile
e2e-profile: install-jq ## Run TestProfile test only
set -o pipefail; PATH=$$PATH:/tmp/bin go test $(TEST_FLAGS) . -run=^TestProfile$$ -profile="$(PROFILE)" -product="$(PRODUCT)" -install-operator=$(INSTALL_OPERATOR) | tee .e2e-profile-test-results.out
set -o pipefail; PATH=$$PATH:/tmp/bin go test $(TEST_FLAGS) . -run=^TestProfile$$ -profile="$(PROFILE)" -product="$(PRODUCT)" -install-operator=$(INSTALL_OPERATOR) -install-virt=$(INSTALL_VIRT) -cel-content-file="$(CEL_CONTENT_FILE)" $(CONTENT_IMAGE_FLAG) $(LOG_DIR_FLAG) | tee .e2e-profile-test-results.out

.PHONY: e2e-profile-remediations
e2e-profile-remediations: install-jq ## Run TestProfile test only
set -o pipefail; PATH=$$PATH:/tmp/bin go test $(TEST_FLAGS) . -run=^TestProfileRemediations$$ -profile="$(PROFILE)" -product="$(PRODUCT)" -install-operator=$(INSTALL_OPERATOR) | tee .e2e-profile-test-results.out
set -o pipefail; PATH=$$PATH:/tmp/bin go test $(TEST_FLAGS) . -run=^TestProfileRemediations$$ -profile="$(PROFILE)" -product="$(PRODUCT)" -install-operator=$(INSTALL_OPERATOR) -install-virt=$(INSTALL_VIRT) -cel-content-file="$(CEL_CONTENT_FILE)" $(CONTENT_IMAGE_FLAG) $(LOG_DIR_FLAG) | tee .e2e-profile-test-results.out

.PHONY: help
help: ## Show this help screen
Expand Down
18 changes: 18 additions & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ type TestConfig struct {
OperatorNamespace types.NamespacedName
Version string
ManualRemediationTimeout time.Duration
// InstallVirt, when true, makes the suite install the OpenShift
// Virtualization (CNV) operator and HyperConverged CR during setup so
// the OCP-Virt profiles can be scanned on a cluster without CNV.
InstallVirt bool
// CELContentFile is the path (inside the content image) to the CEL
// content YAML. When set, a CEL ProfileBundle is created so CEL profiles
// (e.g. the CIS OpenShift Virtualization benchmark) are parsed.
CELContentFile string
}

var (
Expand All @@ -44,6 +52,8 @@ var (
bypassRemediations bool
testType string
manualRemediationTimeout time.Duration
installVirt bool
celContentFile string
)

// NewTestConfig creates a new TestConfig from the parsed flags and sets the
Expand Down Expand Up @@ -75,6 +85,8 @@ func NewTestConfig() *TestConfig {
OperatorNamespace: types.NamespacedName{Name: "compliance-operator", Namespace: "openshift-compliance"},
Version: version,
ManualRemediationTimeout: manualRemediationTimeout,
InstallVirt: installVirt,
CELContentFile: celContentFile,
}
}

Expand All @@ -94,6 +106,12 @@ func DefineFlags() {
flag.StringVar(&testType, "test-type", "all", "Type of rules to test: 'platform', 'node', or 'all' (default)")
flag.DurationVar(&manualRemediationTimeout,
"manual-remediation-timeout", 30*time.Minute, "Timeout for manual remediation scripts")
flag.BoolVar(&installVirt, "install-virt", false,
"Install the OpenShift Virtualization (CNV) operator and HyperConverged CR during setup. "+
"Use when testing the OCP-Virt profiles on a cluster that does not already have CNV.")
flag.StringVar(&celContentFile, "cel-content-file", "",
"Path (inside the content image) to the CEL content YAML. When set, a CEL ProfileBundle "+
"is created so CEL profiles (e.g. the CIS OpenShift Virtualization benchmark) are parsed.")
}

// ValidateFlags checks that required flags are provided.
Expand Down
138 changes: 77 additions & 61 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,105 @@
module github.com/ComplianceAsCode/ocp4e2e

go 1.23.0

toolchain go1.23.10
go 1.25.3

require (
github.com/ComplianceAsCode/compliance-operator v1.7.0
github.com/ComplianceAsCode/compliance-operator v1.9.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/openshift/machine-config-operator v0.0.1-0.20250401081735-9026ff2d802e
github.com/openshift/machine-config-operator v0.0.1-0.20260410020757-449e78f7ec94
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.32.3
k8s.io/apiextensions-apiserver v0.32.1
k8s.io/apimachinery v0.32.3
k8s.io/api v0.35.3
k8s.io/apiextensions-apiserver v0.35.3
k8s.io/apimachinery v0.35.3
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/controller-runtime v0.20.4
sigs.k8s.io/controller-runtime v0.23.3
)

require (
cel.dev/expr v0.25.1 // indirect
github.com/ComplianceAsCode/compliance-sdk v0.0.0-20250930163558-59886979dd19 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/go-openapi/jsonpointer v0.22.5 // indirect
github.com/go-openapi/jsonreference v0.21.5 // indirect
github.com/go-openapi/swag v0.25.5 // indirect
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
github.com/go-openapi/swag/conv v0.25.5 // indirect
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
github.com/go-openapi/swag/loading v0.25.5 // indirect
github.com/go-openapi/swag/mangling v0.25.5 // indirect
github.com/go-openapi/swag/netutils v0.25.5 // indirect
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
github.com/google/cel-go v0.26.0 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.22.1 // indirect
github.com/openshift/api v0.0.0-20250320115527-3aa9dd5b9002 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/openshift/api v0.0.1 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/stoewer/go-strcase v1.3.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.37.0 // indirect
golang.org/x/oauth2 v0.28.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/time v0.10.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/term v0.41.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/time v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31 // indirect
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)

replace (
github.com/go-log/log => github.com/go-log/log v0.1.1-0.20181211034820-a514cf01a3eb
github.com/openshift/api => github.com/openshift/api v0.0.0-20260331162130-f7b3bd900c75
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20200913004441-7eba765c69c9
k8s.io/api => k8s.io/api v0.30.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0
k8s.io/apiserver => k8s.io/apiserver v0.30.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0
k8s.io/client-go => k8s.io/client-go v0.30.0 // Required by prometheus-operator
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
k8s.io/code-generator => k8s.io/code-generator v0.30.0
k8s.io/component-base => k8s.io/component-base v0.30.0
k8s.io/cri-api => k8s.io/cri-api v0.30.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
k8s.io/kubectl => k8s.io/kubectl v0.30.0
k8s.io/kubelet => k8s.io/kubelet v0.30.0
k8s.io/api => k8s.io/api v0.35.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.35.3
k8s.io/apimachinery => k8s.io/apimachinery v0.35.3
k8s.io/apiserver => k8s.io/apiserver v0.35.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.35.3
k8s.io/client-go => k8s.io/client-go v0.35.3 // Required by prometheus-operator
k8s.io/cloud-provider => k8s.io/cloud-provider v0.35.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.35.3
k8s.io/code-generator => k8s.io/code-generator v0.35.3
k8s.io/component-base => k8s.io/component-base v0.35.3
k8s.io/cri-api => k8s.io/cri-api v0.35.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.35.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.35.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.35.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.35.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.35.3
k8s.io/kubectl => k8s.io/kubectl v0.35.3
k8s.io/kubelet => k8s.io/kubelet v0.35.3
k8s.io/kubernetes => k8s.io/kubernetes v1.19.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
k8s.io/metrics => k8s.io/metrics v0.30.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.35.3
k8s.io/metrics => k8s.io/metrics v0.35.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.35.3
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
Expand Down
Loading