Skip to content

Remove image overlays #29

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
mclasmeier merged 1 commit into from
Dec 18, 2025
Merged

Remove image overlays #29

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
116 changes: 2 additions & 114 deletions internal/deployer/deploy_via_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,13 @@ func (d *Deployer) createCentralCR(resources, exposure string) (map[string]inter
}

resourcesOverlay := d.getCentralResourcesOperator(resources)
imageOverlay := d.getCentralImageOverlays()

overrides, err := GetOverrides(d.overrideFile, d.overrideSetExpressions)
if err != nil {
return nil, fmt.Errorf("failed construct Central CR overrides: %w", err)
}

merged := helpers.MergeMaps(base, resourcesOverlay, imageOverlay, overrides)
merged := helpers.MergeMaps(base, resourcesOverlay, overrides)

return merged, nil
}
Expand Down Expand Up @@ -345,43 +344,6 @@ func (d *Deployer) getCentralResourcesOperator(resourcesName string) map[string]
return resources
}

// getCentralImageOverlays returns image tag overlays for Central components
func (d *Deployer) getCentralImageOverlays() map[string]interface{} {
if d.mainImageTag == "" {
return map[string]interface{}{}
}

// Create overlays to set the image tag for all Central deployments.
overlays := []map[string]interface{}{
d.mainImageOverlays("Deployment", "central", map[string]string{
"central": "main",
}),
d.mainImageOverlays("Deployment", "config-controller", map[string]string{
"manager": "main",
}),
d.mainImageOverlays("Deployment", "central-db", map[string]string{
"init:init-db": "central-db",
"central-db": "central-db",
}),
d.mainImageOverlays("Deployment", "scanner-v4-indexer", map[string]string{
"indexer": "scanner-v4",
}),
d.mainImageOverlays("Deployment", "scanner-v4-matcher", map[string]string{
"matcher": "scanner-v4",
}),
d.mainImageOverlays("Deployment", "scanner-v4-db", map[string]string{
"init:init-db": "scanner-v4-db",
"db": "scanner-v4-db",
}),
}

return map[string]interface{}{
"spec": map[string]interface{}{
"overlays": overlays,
},
}
}

// getCentralExposureConfig returns the exposure configuration
func (d *Deployer) getCentralExposureConfig(exposure string) map[string]interface{} {
switch exposure {
Expand Down Expand Up @@ -687,14 +649,13 @@ func (d *Deployer) createSecuredClusterCR(clusterName, resources string) (map[st
}

resourcesOverlay := d.getSecuredClusterResourcesOperator(resources)
imageOverlay := d.getSecuredClusterImageOverlays()

overrides, err := GetOverrides(d.overrideFile, d.overrideSetExpressions)
if err != nil {
return nil, fmt.Errorf("failed construct Central CR overrides: %w", err)
}

merged := helpers.MergeMaps(base, resourcesOverlay, imageOverlay, overrides)
merged := helpers.MergeMaps(base, resourcesOverlay, overrides)

return merged, nil
}
Expand Down Expand Up @@ -740,79 +701,6 @@ func (d *Deployer) getSecuredClusterResourcesOperator(resourcesName string) map[
return resources
}

func (d *Deployer) mainImageOverlays(kind, name string, containerImages map[string]string) map[string]interface{} {
patches := make([]map[string]interface{}, 0, len(containerImages))
for containerName, containerImage := range containerImages {
containerType := "containers"
containerComponents := strings.SplitN(containerName, ":", 2)
if len(containerComponents) == 2 {
if containerComponents[0] == "init" {
containerType = "initContainers"
containerName = containerComponents[1]
} else {
panic(fmt.Sprintf("invalid container type: %s", containerComponents[0]))
}
}
patchPath := fmt.Sprintf("spec.template.spec.%s[name:%s].image", containerType, containerName)
patches = append(patches, map[string]interface{}{
"path": patchPath,
"value": fmt.Sprintf("quay.io/rhacs-eng/%s:%s", containerImage, d.mainImageTag),
})
}
return map[string]interface{}{
"apiVersion": "apps/v1",
"kind": kind,
"name": name,
"optional": true,
"patches": patches,
}
}

// getSecuredClusterImageOverlays returns image tag overlays for SecuredCluster components
func (d *Deployer) getSecuredClusterImageOverlays() map[string]interface{} {
if d.mainImageTag == "" {
return map[string]interface{}{}
}

// Create overlays to set the image tag for all SecuredCluster deployments.
overlays := []map[string]interface{}{
d.mainImageOverlays("Deployment", "sensor", map[string]string{
"init:crs": "main",
"init:init-tls-certs": "main",
"sensor": "main",
}),
d.mainImageOverlays("Deployment", "admission-control", map[string]string{
"init:init-tls-certs": "main",
"admission-control": "main",
}),
d.mainImageOverlays("DaemonSet", "collector", map[string]string{
"init:init-tls-certs": "main",
"compliance": "main",
}),
d.mainImageOverlays("Deployment", "scanner-v4-indexer", map[string]string{
"init:init-tls-certs": "main",
"indexer": "scanner-v4",
}),
d.mainImageOverlays("Deployment", "scanner-v4-db", map[string]string{
"init:init-tls-certs": "main",
"init:init-db": "scanner-v4-db",
"db": "scanner-v4-db",
}),
d.mainImageOverlays("Deployment", "scanner", map[string]string{
"init:init-tls-certs": "main",
}),
d.mainImageOverlays("Deployment", "scanner-db", map[string]string{
"init:init-tls-certs": "main",
}),
}

return map[string]interface{}{
"spec": map[string]interface{}{
"overlays": overlays,
},
}
}

// applySecuredClusterCR applies the SecuredCluster CR to the cluster
func (d *Deployer) applySecuredClusterCR(ctx context.Context, cr map[string]interface{}) error {
d.logger.Info("Applying SecuredCluster custom resource")
Expand Down