Skip to content

Special case the global OpenShift image pull secret #3278

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

Merged
dhaus67 merged 3 commits into from
Oct 19, 2022
Merged

Special case the global OpenShift image pull secret #3278

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3871835
Special case the global OpenShift image pull secret
Oct 3, 2022
ba45a31
Address review comments.
dhaus67 Oct 7, 2022
d9668da
Rebase.
dhaus67 Oct 18, 2022
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
15 changes: 14 additions & 1 deletion pkg/images/enricher/enricher_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ import (
const (
// The number of consecutive errors for a scanner or registry that cause its health status to be UNHEALTHY
consecutiveErrorThreshold = 3

openshiftConfigNamespace = "openshift-config"
openshiftConfigPullSecret = "pull-secret"
)

var (
Expand All @@ -47,7 +50,7 @@ type enricherImpl struct {
errorsPerScanner map[scannerTypes.ImageScannerWithDataSource]int32
scannerErrorsLock sync.RWMutex

integrationHealthReporter integrationhealth.Reporter ``
integrationHealthReporter integrationhealth.Reporter

metadataLimiter *rate.Limiter
metadataCache expiringcache.Cache
Expand Down Expand Up @@ -655,6 +658,11 @@ func (e *enricherImpl) checkRegistryForImage(image *storage.Image) error {
return nil
}

func isOpenshiftGlobalPullSecret(source *storage.ImageIntegration_Source) bool {
return source.GetNamespace() == openshiftConfigNamespace &&
source.GetImagePullSecretName() == openshiftConfigPullSecret
}

func (e *enricherImpl) getRegistriesForContext(ctx EnrichmentContext) ([]registryTypes.ImageRegistry, error) {
registries := e.integrations.RegistrySet().GetAll()
if ctx.Internal {
Expand Down Expand Up @@ -687,6 +695,11 @@ func filterRegistriesBySource(requestSource *RequestSource, registries []registr
if source.GetClusterId() != requestSource.ClusterID {
continue
}
// Check if the integration source is the global OpenShift registry
if isOpenshiftGlobalPullSecret(source) {
filteredRegistries = append(filteredRegistries, registry)
continue
}
if source.GetNamespace() != requestSource.Namespace {
continue
}
Expand Down