Skip to content

CMP-3515: Use Konflux builds for content #772

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CMP-3515: Use Konflux builds for content #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ E2E_USE_DEFAULT_IMAGES?=false
E2E_SKIP_CONTAINER_BUILD?=false

# Used for substitutions
DEFAULT_CONTENT_IMAGE=ghcr.io/complianceascode/k8scontent:latest
DEFAULT_CONTENT_IMAGE=quay.io/redhat-user-workloads/ocp-isc-tenant/compliance-operator-content-dev:master
CONTENT_IMAGE?=$(DEFAULT_CONTENT_IMAGE)
# Specifies the image path to use for the content in the tests
E2E_CONTENT_IMAGE_PATH?=ghcr.io/complianceascode/k8scontent:latest
E2E_CONTENT_IMAGE_PATH?=quay.io/redhat-user-workloads/ocp-isc-tenant/compliance-operator-content-dev:master
# We specifically omit the tag here since we use this for testing
# different images referenced by different tags.
E2E_BROKEN_CONTENT_IMAGE_PATH?=ghcr.io/complianceascode/test-broken-content-ocp
Expand Down
1 change: 0 additions & 1 deletion images/testcontent/Dockerfile.ci
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/controller/compliancescan/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
)

const (
DefaultContentContainerImage = "ghcr.io/complianceascode/k8scontent:latest"
DefaultContentContainerImage = "quay.io/redhat-user-workloads/ocp-isc-tenant/compliance-operator-content-dev:master"
CACertDataKey = "ca.crt"
CAKeyDataKey = "ca.key"
ServerCertInstanceSuffix = "-rs"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/scansettingbinding/scansettingbinding_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var _ = Describe("Testing scansettingbinding controller", func() {
Namespace: common.GetComplianceOperatorNamespace(),
},
Spec: compv1alpha1.ProfileBundleSpec{
ContentImage: "ghcr.io/complianceascode/k8scontent:latest",
ContentImage: "quay.io/redhat-user-workloads/ocp-isc-tenant/compliance-operator-content-dev:master",
ContentFile: "ssg-rhcos4-ds.xml",
},
Status: compv1alpha1.ProfileBundleStatus{
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var componentDefaults = []struct {
}{
{"ghcr.io/complianceascode/openscap-ocp:latest", "RELATED_IMAGE_OPENSCAP"},
{"ghcr.io/complianceascode/compliance-operator:latest", "RELATED_IMAGE_OPERATOR"},
{"ghcr.io/complianceascode/k8scontent:latest", "RELATED_IMAGE_PROFILE"},
{"quay.io/redhat-user-workloads/ocp-isc-tenant/compliance-operator-content-dev:master", "RELATED_IMAGE_PROFILE"},
}

// GetComponentImage returns a full image pull spec for a given component
Expand Down
Loading