From d0841198b62b369845a161f58e7d64d53f0cb41a Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 20 May 2026 14:06:37 -0700 Subject: [PATCH 1/2] Use consistent calicoImage field name for combined calico image --- pkg/render/apiserver.go | 32 ++++++------------- .../applicationlayer/applicationlayer.go | 6 ++-- pkg/render/compliance.go | 32 ++++--------------- pkg/render/csi.go | 10 +++--- pkg/render/gatewayapi/gateway_api.go | 6 ++-- pkg/render/goldmane/component.go | 6 ++-- pkg/render/guardian.go | 6 ++-- pkg/render/intrusion_detection.go | 6 ++-- .../kubecontrollers/kube-controllers.go | 6 ++-- pkg/render/logstorage/esgateway/esgateway.go | 6 ++-- .../esmetrics/elasticsearch_metrics.go | 6 ++-- pkg/render/logstorage/linseed/linseed.go | 6 ++-- pkg/render/manager.go | 17 ++++------ pkg/render/monitor/monitor.go | 6 ++-- pkg/render/node.go | 13 +++----- pkg/render/packet_capture_api.go | 6 ++-- pkg/render/policyrecommendation.go | 6 ++-- pkg/render/typha.go | 6 ++-- pkg/render/webhooks/render.go | 6 ++-- pkg/render/whisker/component.go | 6 ++-- 20 files changed, 77 insertions(+), 117 deletions(-) diff --git a/pkg/render/apiserver.go b/pkg/render/apiserver.go index 01ea3ff555..81d99b7d1c 100644 --- a/pkg/render/apiserver.go +++ b/pkg/render/apiserver.go @@ -154,9 +154,7 @@ type APIServerConfiguration struct { type apiServerComponent struct { cfg *APIServerConfiguration - apiServerImage string - queryServerImage string - l7AdmissionControllerImage string + calicoImage string l7AdmissionControllerEnvoyImage string dikastesImage string } @@ -170,30 +168,20 @@ func (c *apiServerComponent) ResolveImages(is *operatorv1.ImageSet) error { enterprise := c.cfg.Installation.Variant.IsEnterprise() if enterprise || c.cfg.RequiresAggregationServer { - c.apiServerImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } } - if enterprise { - c.queryServerImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + if enterprise && c.cfg.IsSidecarInjectionEnabled() { + c.l7AdmissionControllerEnvoyImage, err = components.GetReference(components.ComponentEnvoyProxy, reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } - if c.cfg.IsSidecarInjectionEnabled() { - c.l7AdmissionControllerImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) - if err != nil { - errMsgs = append(errMsgs, err.Error()) - } - c.l7AdmissionControllerEnvoyImage, err = components.GetReference(components.ComponentEnvoyProxy, reg, path, prefix, is) - if err != nil { - errMsgs = append(errMsgs, err.Error()) - } - c.dikastesImage, err = components.GetReference(components.ComponentDikastes, reg, path, prefix, is) - if err != nil { - errMsgs = append(errMsgs, err.Error()) - } + c.dikastesImage, err = components.GetReference(components.ComponentDikastes, reg, path, prefix, is) + if err != nil { + errMsgs = append(errMsgs, err.Error()) } } @@ -1177,7 +1165,7 @@ func (c *apiServerComponent) apiServerContainer() corev1.Container { apiServer := corev1.Container{ Name: string(APIServerContainerName), - Image: c.apiServerImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "apiserver"}, Args: c.startUpArgs(), Env: env, @@ -1317,7 +1305,7 @@ func (c *apiServerComponent) queryServerContainer() corev1.Container { container := corev1.Container{ Name: string(TigeraAPIServerQueryServerContainerName), - Image: c.queryServerImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "queryserver"}, Env: env, LivenessProbe: &corev1.Probe{ @@ -2304,7 +2292,7 @@ func (c *apiServerComponent) l7AdmissionControllerContainer() corev1.Container { l7AdmssCtrl := corev1.Container{ Name: string(L7AdmissionControllerContainerName), - Image: c.l7AdmissionControllerImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "l7-admission-controller"}, Env: []corev1.EnvVar{ { diff --git a/pkg/render/applicationlayer/applicationlayer.go b/pkg/render/applicationlayer/applicationlayer.go index 844fd6ce58..5b1c29d795 100644 --- a/pkg/render/applicationlayer/applicationlayer.go +++ b/pkg/render/applicationlayer/applicationlayer.go @@ -101,7 +101,7 @@ type Config struct { // Calculated internal fields. proxyImage string - collectorImage string + calicoImage string dikastesImage string dikastesEnabled bool perHostEnvoyEnabled bool @@ -132,7 +132,7 @@ func (c *component) ResolveImages(is *operatorv1.ImageSet) error { errMsgs = append(errMsgs, err.Error()) } - c.config.collectorImage, err = components.GetReference(components.CombinedCalicoImage(c.config.Installation), reg, path, prefix, is) + c.config.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.config.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } @@ -288,7 +288,7 @@ func (c *component) containers() []corev1.Container { // Log collection specific container collector := corev1.Container{ Name: L7CollectorContainerName, - Image: c.config.collectorImage, + Image: c.config.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "l7-collector"}, Env: c.collectorEnv(), SecurityContext: securitycontext.NewRootContext(false), diff --git a/pkg/render/compliance.go b/pkg/render/compliance.go index b2039d2d0f..e9743400a8 100644 --- a/pkg/render/compliance.go +++ b/pkg/render/compliance.go @@ -122,10 +122,7 @@ type ComplianceConfiguration struct { type complianceComponent struct { cfg *ComplianceConfiguration benchmarkerImage string - snapshotterImage string - serverImage string - controllerImage string - reporterImage string + calicoImage string } func (c *complianceComponent) ResolveImages(is *operatorv1.ImageSet) error { @@ -133,29 +130,14 @@ func (c *complianceComponent) ResolveImages(is *operatorv1.ImageSet) error { path := c.cfg.Installation.ImagePath prefix := c.cfg.Installation.ImagePrefix var err error - c.benchmarkerImage, err = components.GetReference(components.ComponentComplianceBenchmarker, reg, path, prefix, is) - errMsgs := []string{} - if err != nil { - errMsgs = append(errMsgs, err.Error()) - } - - c.snapshotterImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) - if err != nil { - errMsgs = append(errMsgs, err.Error()) - } - c.serverImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) - if err != nil { - errMsgs = append(errMsgs, err.Error()) - } - - c.controllerImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.benchmarkerImage, err = components.GetReference(components.ComponentComplianceBenchmarker, reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } - c.reporterImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } @@ -484,7 +466,7 @@ func (c *complianceComponent) complianceControllerDeployment() *appsv1.Deploymen Containers: []corev1.Container{ { Name: ComplianceControllerName, - Image: c.controllerImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "compliance-controller"}, Env: envVars, LivenessProbe: &corev1.Probe{ @@ -684,7 +666,7 @@ func (c *complianceComponent) complianceReporterPodTemplate() *corev1.PodTemplat Containers: []corev1.Container{ { Name: "reporter", - Image: c.reporterImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "compliance-reporter"}, Env: envVars, LivenessProbe: &corev1.Probe{ @@ -892,7 +874,7 @@ func (c *complianceComponent) complianceServerDeployment() *appsv1.Deployment { Containers: []corev1.Container{ { Name: ComplianceServerName, - Image: c.serverImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "compliance-server"}, Env: envVars, LivenessProbe: &corev1.Probe{ @@ -1105,7 +1087,7 @@ func (c *complianceComponent) complianceSnapshotterDeployment() *appsv1.Deployme Containers: []corev1.Container{ { Name: ComplianceSnapshotterName, - Image: c.snapshotterImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "compliance-snapshotter"}, Env: envVars, LivenessProbe: &corev1.Probe{ diff --git a/pkg/render/csi.go b/pkg/render/csi.go index 0fc7a81f04..ead5147813 100644 --- a/pkg/render/csi.go +++ b/pkg/render/csi.go @@ -51,8 +51,7 @@ type CSIConfiguration struct { type csiComponent struct { cfg *CSIConfiguration - csiImage string - csiRegistrarImage string + calicoImage string } func CSI(cfg *CSIConfiguration) Component { @@ -140,7 +139,7 @@ func (c *csiComponent) csiContainers() []corev1.Container { mountPropagation := corev1.MountPropagationBidirectional csiContainer := corev1.Container{ Name: CSIContainerName, - Image: c.csiImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "csi"}, Args: []string{ "--nodeid=$(KUBE_NODE_NAME)", @@ -181,7 +180,7 @@ func (c *csiComponent) csiContainers() []corev1.Container { // Construct "csi-node-driver-registrar" container registrarContainer := corev1.Container{ Name: CSIRegistrarContainerName, - Image: c.csiRegistrarImage, + Image: c.calicoImage, Command: []string{"/usr/bin/csi-node-driver-registrar"}, Args: []string{ "--v=5", @@ -377,11 +376,10 @@ func (c *csiComponent) ResolveImages(is *operatorv1.ImageSet) error { path := c.cfg.Installation.ImagePath prefix := c.cfg.Installation.ImagePrefix var err error - c.csiImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) if err != nil { return err } - c.csiRegistrarImage = c.csiImage return nil } diff --git a/pkg/render/gatewayapi/gateway_api.go b/pkg/render/gatewayapi/gateway_api.go index 6e71e99b20..1d4aff2d07 100644 --- a/pkg/render/gatewayapi/gateway_api.go +++ b/pkg/render/gatewayapi/gateway_api.go @@ -420,7 +420,7 @@ type gatewayAPIImplementationComponent struct { envoyGatewayImage string envoyProxyImage string envoyRatelimitImage string - wafHTTPFilterImage string + calicoImage string L7LogCollectorImage string } @@ -449,7 +449,7 @@ func (pr *gatewayAPIImplementationComponent) ResolveImages(is *operatorv1.ImageS if err != nil { return err } - pr.wafHTTPFilterImage, err = components.GetReference(components.CombinedCalicoImage(pr.cfg.Installation), reg, path, prefix, is) + pr.calicoImage, err = components.GetReference(components.CombinedCalicoImage(pr.cfg.Installation), reg, path, prefix, is) if err != nil { return err } @@ -822,7 +822,7 @@ func (pr *gatewayAPIImplementationComponent) envoyProxyConfig(className string, // Add or update the Init Container to the deployment wafHTTPFilter := corev1.Container{ Name: wafFilterName, - Image: pr.wafHTTPFilterImage, + Image: pr.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "waf-http-filter"}, Args: []string{ "--logFileDirectory", diff --git a/pkg/render/goldmane/component.go b/pkg/render/goldmane/component.go index d6ee4c98bf..cdfdde662e 100644 --- a/pkg/render/goldmane/component.go +++ b/pkg/render/goldmane/component.go @@ -83,7 +83,7 @@ type Configuration struct { type Component struct { cfg *Configuration - goldmaneImage string + calicoImage string } func (c *Component) ResolveImages(is *operatorv1.ImageSet) error { @@ -92,7 +92,7 @@ func (c *Component) ResolveImages(is *operatorv1.ImageSet) error { prefix := c.cfg.Installation.ImagePrefix var err error - c.goldmaneImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) return err } @@ -234,7 +234,7 @@ func (c *Component) goldmaneContainer() corev1.Container { return corev1.Container{ Name: GoldmaneContainerName, - Image: c.goldmaneImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "goldmane"}, Env: env, SecurityContext: securitycontext.NewNonRootContext(), diff --git a/pkg/render/guardian.go b/pkg/render/guardian.go index 52ee44ed01..2db5a1411e 100644 --- a/pkg/render/guardian.go +++ b/pkg/render/guardian.go @@ -134,7 +134,7 @@ type GuardianConfiguration struct { type GuardianComponent struct { cfg *GuardianConfiguration - image string + calicoImage string } func (c *GuardianComponent) ResolveImages(is *operatorv1.ImageSet) error { @@ -142,7 +142,7 @@ func (c *GuardianComponent) ResolveImages(is *operatorv1.ImageSet) error { path := c.cfg.Installation.ImagePath prefix := c.cfg.Installation.ImagePrefix var err error - c.image, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) return err } @@ -496,7 +496,7 @@ func (c *GuardianComponent) container() []corev1.Container { return []corev1.Container{ { Name: GuardianContainerName, - Image: c.image, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "guardian"}, Env: envVars, VolumeMounts: c.volumeMounts(), diff --git a/pkg/render/intrusion_detection.go b/pkg/render/intrusion_detection.go index 027d64cadf..5544c57ea0 100644 --- a/pkg/render/intrusion_detection.go +++ b/pkg/render/intrusion_detection.go @@ -122,7 +122,7 @@ type IntrusionDetectionConfiguration struct { type intrusionDetectionComponent struct { cfg *IntrusionDetectionConfiguration controllerImage string - webhooksProcessorImage string + calicoImage string } func (c *intrusionDetectionComponent) ResolveImages(is *operatorv1.ImageSet) error { @@ -137,7 +137,7 @@ func (c *intrusionDetectionComponent) ResolveImages(is *operatorv1.ImageSet) err errMsgs = append(errMsgs, err.Error()) } - c.webhooksProcessorImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } @@ -686,7 +686,7 @@ func (c *intrusionDetectionComponent) webhooksControllerContainer() corev1.Conta return corev1.Container{ Name: "webhooks-processor", - Image: c.webhooksProcessorImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "webhooks-processor"}, Env: envVars, SecurityContext: securitycontext.NewNonRootContext(), diff --git a/pkg/render/kubecontrollers/kube-controllers.go b/pkg/render/kubecontrollers/kube-controllers.go index 86049c9481..7db1c163fd 100644 --- a/pkg/render/kubecontrollers/kube-controllers.go +++ b/pkg/render/kubecontrollers/kube-controllers.go @@ -221,7 +221,7 @@ type kubeControllersComponent struct { cfg *KubeControllersConfiguration // Internal state generated by the given configuration. - image string + calicoImage string kubeControllerServiceAccountName string kubeControllerRoleName string @@ -241,7 +241,7 @@ func (c *kubeControllersComponent) ResolveImages(is *operatorv1.ImageSet) error path := c.cfg.Installation.ImagePath prefix := c.cfg.Installation.ImagePrefix var err error - c.image, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) return err } @@ -618,7 +618,7 @@ func (c *kubeControllersComponent) controllersDeployment() *appsv1.Deployment { container := corev1.Container{ Name: c.kubeControllerName, - Image: c.image, + Image: c.calicoImage, Command: containerCommand, Env: env, Resources: c.kubeControllersResources(), diff --git a/pkg/render/logstorage/esgateway/esgateway.go b/pkg/render/logstorage/esgateway/esgateway.go index 7c46e9d0d8..97834716c8 100644 --- a/pkg/render/logstorage/esgateway/esgateway.go +++ b/pkg/render/logstorage/esgateway/esgateway.go @@ -67,7 +67,7 @@ func EsGateway(c *Config) render.Component { type esGateway struct { csrImage string - esGatewayImage string + calicoImage string cfg *Config } @@ -92,7 +92,7 @@ func (e *esGateway) ResolveImages(is *operatorv1.ImageSet) error { var err error errMsgs := []string{} - e.esGatewayImage, err = components.GetReference(components.CombinedCalicoImage(e.cfg.Installation), reg, path, prefix, is) + e.calicoImage, err = components.GetReference(components.CombinedCalicoImage(e.cfg.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } @@ -252,7 +252,7 @@ func (e *esGateway) esGatewayDeployment() *appsv1.Deployment { Containers: []corev1.Container{ { Name: DeploymentName, - Image: e.esGatewayImage, + Image: e.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "es-gateway"}, Env: envVars, VolumeMounts: volumeMounts, diff --git a/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go b/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go index 2db85cc9db..df569fbc3e 100644 --- a/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go +++ b/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go @@ -72,7 +72,7 @@ type Config struct { type elasticsearchMetrics struct { cfg *Config - esMetricsImage string + calicoImage string } func (e *elasticsearchMetrics) ResolveImages(is *operatorv1.ImageSet) error { @@ -82,7 +82,7 @@ func (e *elasticsearchMetrics) ResolveImages(is *operatorv1.ImageSet) error { path := e.cfg.Installation.ImagePath prefix := e.cfg.Installation.ImagePrefix - e.esMetricsImage, err = components.GetReference(components.CombinedCalicoImage(e.cfg.Installation), reg, path, prefix, is) + e.calicoImage, err = components.GetReference(components.CombinedCalicoImage(e.cfg.Installation), reg, path, prefix, is) if err != nil { return err } @@ -234,7 +234,7 @@ func (e *elasticsearchMetrics) metricsDeployment() *appsv1.Deployment { Containers: []corev1.Container{ { Name: ElasticsearchMetricsName, - Image: e.esMetricsImage, + Image: e.calicoImage, SecurityContext: sc, Command: []string{components.CalicoBinaryPath, "component", "elasticsearch-metrics"}, Args: []string{ diff --git a/pkg/render/logstorage/linseed/linseed.go b/pkg/render/logstorage/linseed/linseed.go index e1e82c3b84..67e15e0543 100644 --- a/pkg/render/logstorage/linseed/linseed.go +++ b/pkg/render/logstorage/linseed/linseed.go @@ -67,7 +67,7 @@ func Linseed(c *Config) render.Component { } type linseed struct { - linseedImage string + calicoImage string csrImage string cfg *Config @@ -137,7 +137,7 @@ func (l *linseed) ResolveImages(is *operatorv1.ImageSet) error { errMsgs := []string{} // Calculate the image(s) to use for Linseed, given user registry configuration. - l.linseedImage, err = components.GetReference(components.CombinedCalicoImage(l.cfg.Installation), reg, path, prefix, is) + l.calicoImage, err = components.GetReference(components.CombinedCalicoImage(l.cfg.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } @@ -459,7 +459,7 @@ func (l *linseed) linseedDeployment() *appsv1.Deployment { Containers: []corev1.Container{ { Name: DeploymentName, - Image: l.linseedImage, + Image: l.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "linseed"}, Env: envVars, VolumeMounts: volumeMounts, diff --git a/pkg/render/manager.go b/pkg/render/manager.go index 5640eeda06..eaa20519db 100644 --- a/pkg/render/manager.go +++ b/pkg/render/manager.go @@ -224,8 +224,7 @@ type managerComponent struct { tlsSecrets []*corev1.Secret tlsAnnotations map[string]string managerImage string - voltronImage string - uiAPIsImage string + calicoImage string } func (c *managerComponent) ResolveImages(is *operatorv1.ImageSet) error { @@ -233,18 +232,14 @@ func (c *managerComponent) ResolveImages(is *operatorv1.ImageSet) error { path := c.cfg.Installation.ImagePath prefix := c.cfg.Installation.ImagePrefix var err error - c.managerImage, err = components.GetReference(components.ComponentManager, reg, path, prefix, is) errMsgs := []string{} - if err != nil { - errMsgs = append(errMsgs, err.Error()) - } - c.voltronImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.managerImage, err = components.GetReference(components.ComponentManager, reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } - c.uiAPIsImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } @@ -667,7 +662,7 @@ func (c *managerComponent) voltronContainer() corev1.Container { return corev1.Container{ Name: VoltronName, - Image: c.voltronImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "voltron"}, Env: env, VolumeMounts: mounts, @@ -705,7 +700,7 @@ func (c *managerComponent) dashboardContainer() corev1.Container { return corev1.Container{ Name: DashboardAPIName, - Image: c.uiAPIsImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "dashboards"}, Env: env, VolumeMounts: mounts, @@ -795,7 +790,7 @@ func (c *managerComponent) managerUIAPIsContainer() corev1.Container { return corev1.Container{ Name: UIAPIsName, - Image: c.uiAPIsImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "ui-apis"}, LivenessProbe: c.managerUIAPIsProbe(), SecurityContext: securitycontext.NewNonRootContext(), diff --git a/pkg/render/monitor/monitor.go b/pkg/render/monitor/monitor.go index fa3473df5c..b713d9508b 100644 --- a/pkg/render/monitor/monitor.go +++ b/pkg/render/monitor/monitor.go @@ -179,7 +179,7 @@ type monitorComponent struct { cfg *Config alertmanagerImage string prometheusImage string - prometheusServiceImage string + calicoImage string } func (mc *monitorComponent) ResolveImages(is *operatorv1.ImageSet) error { @@ -200,7 +200,7 @@ func (mc *monitorComponent) ResolveImages(is *operatorv1.ImageSet) error { errMsgs = append(errMsgs, err.Error()) } - mc.prometheusServiceImage, err = components.GetReference(components.CombinedCalicoImage(mc.cfg.Installation), reg, path, prefix, is) + mc.calicoImage, err = components.GetReference(components.CombinedCalicoImage(mc.cfg.Installation), reg, path, prefix, is) if err != nil { errMsgs = append(errMsgs, err.Error()) } @@ -639,7 +639,7 @@ func (mc *monitorComponent) prometheus() *monitoringv1.Prometheus { Containers: []corev1.Container{ { Name: "authn-proxy", - Image: mc.prometheusServiceImage, + Image: mc.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "prometheus-service"}, Ports: []corev1.ContainerPort{ { diff --git a/pkg/render/node.go b/pkg/render/node.go index 91aa1ef3ba..c72fe93c79 100644 --- a/pkg/render/node.go +++ b/pkg/render/node.go @@ -167,9 +167,8 @@ type nodeComponent struct { cfg *NodeConfiguration // Calculated internal fields based on the given information. - cniImage string - flexvolImage string - nodeImage string + calicoImage string + nodeImage string } func (c *nodeComponent) ResolveImages(is *operatorv1.ImageSet) error { @@ -184,9 +183,7 @@ func (c *nodeComponent) ResolveImages(is *operatorv1.ImageSet) error { return imageName } - combinedRef := appendIfErr(components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is)) - c.cniImage = combinedRef - c.flexvolImage = combinedRef + c.calicoImage = appendIfErr(components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is)) switch { case c.cfg.Installation.Variant.IsEnterprise(): c.nodeImage = appendIfErr(components.GetReference(components.ComponentTigeraNode, reg, path, prefix, is)) @@ -1211,7 +1208,7 @@ func (c *nodeComponent) cniContainer() corev1.Container { return corev1.Container{ Name: "install-cni", - Image: c.cniImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "cni", "install"}, Env: cniEnv, SecurityContext: securitycontext.NewRootContext(true), @@ -1228,7 +1225,7 @@ func (c *nodeComponent) flexVolumeContainer() corev1.Container { return corev1.Container{ Name: "flexvol-driver", - Image: c.flexvolImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "flexvol", "install", "--target", "/host/driver/uds"}, SecurityContext: securitycontext.NewRootContext(true), VolumeMounts: flexVolumeMounts, diff --git a/pkg/render/packet_capture_api.go b/pkg/render/packet_capture_api.go index 0e43bd1dbc..79cd7cbe9e 100644 --- a/pkg/render/packet_capture_api.go +++ b/pkg/render/packet_capture_api.go @@ -74,7 +74,7 @@ type PacketCaptureApiConfiguration struct { type packetCaptureApiComponent struct { cfg *PacketCaptureApiConfiguration - image string + calicoImage string } func PacketCaptureAPI(cfg *PacketCaptureApiConfiguration) Component { @@ -99,7 +99,7 @@ func (pc *packetCaptureApiComponent) ResolveImages(is *operatorv1.ImageSet) erro prefix := pc.cfg.Installation.ImagePrefix var err error - pc.image, err = components.GetReference(components.CombinedCalicoImage(pc.cfg.Installation), reg, path, prefix, is) + pc.calicoImage, err = components.GetReference(components.CombinedCalicoImage(pc.cfg.Installation), reg, path, prefix, is) if err != nil { return err } @@ -303,7 +303,7 @@ func (pc *packetCaptureApiComponent) container() corev1.Container { return corev1.Container{ Name: PacketCaptureContainerName, - Image: pc.image, + Image: pc.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "packetcapture"}, LivenessProbe: pc.healthProbe(), ReadinessProbe: pc.healthProbe(), diff --git a/pkg/render/policyrecommendation.go b/pkg/render/policyrecommendation.go index 7d2a9afdb9..fa761d01f1 100644 --- a/pkg/render/policyrecommendation.go +++ b/pkg/render/policyrecommendation.go @@ -82,7 +82,7 @@ type PolicyRecommendationConfiguration struct { type policyRecommendationComponent struct { cfg *PolicyRecommendationConfiguration - image string + calicoImage string } func PolicyRecommendation(cfg *PolicyRecommendationConfiguration) Component { @@ -97,7 +97,7 @@ func (pr *policyRecommendationComponent) ResolveImages(is *operatorv1.ImageSet) prefix := pr.cfg.Installation.ImagePrefix var err error - pr.image, err = components.GetReference(components.CombinedCalicoImage(pr.cfg.Installation), reg, path, prefix, is) + pr.calicoImage, err = components.GetReference(components.CombinedCalicoImage(pr.cfg.Installation), reg, path, prefix, is) if err != nil { return err } @@ -359,7 +359,7 @@ func (pr *policyRecommendationComponent) deployment() *appsv1.Deployment { controllerContainer := corev1.Container{ Name: "policy-recommendation-controller", - Image: pr.image, + Image: pr.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "policy-recommendation"}, Env: envs, SecurityContext: securitycontext.NewNonRootContext(), diff --git a/pkg/render/typha.go b/pkg/render/typha.go index 4374991bbc..b2be1eab52 100644 --- a/pkg/render/typha.go +++ b/pkg/render/typha.go @@ -91,7 +91,7 @@ type typhaComponent struct { cfg *TyphaConfiguration // Generated internal config, built from the given configuration. - typhaImage string + calicoImage string } func (c *typhaComponent) ResolveImages(is *operatorv1.ImageSet) error { @@ -99,7 +99,7 @@ func (c *typhaComponent) ResolveImages(is *operatorv1.ImageSet) error { path := c.cfg.Installation.ImagePath prefix := c.cfg.Installation.ImagePrefix var err error - c.typhaImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) return err } @@ -563,7 +563,7 @@ func (c *typhaComponent) typhaContainer() corev1.Container { lp, rp := c.livenessReadinessProbes("localhost") return corev1.Container{ Name: TyphaContainerName, - Image: c.typhaImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "typha"}, Resources: c.typhaResources(), Env: c.typhaEnvVars(c.cfg.TLS.TyphaSecret), diff --git a/pkg/render/webhooks/render.go b/pkg/render/webhooks/render.go index d40dc84426..f31ee1ea6a 100644 --- a/pkg/render/webhooks/render.go +++ b/pkg/render/webhooks/render.go @@ -70,7 +70,7 @@ type component struct { cfg *Configuration // Images. - webhooksImage string + calicoImage string } func (c *component) ResolveImages(is *operatorv1.ImageSet) error { @@ -79,7 +79,7 @@ func (c *component) ResolveImages(is *operatorv1.ImageSet) error { prefix := c.cfg.Installation.ImagePrefix var err error - c.webhooksImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) return err } @@ -134,7 +134,7 @@ func (c *component) Objects() ([]client.Object, []client.Object) { ImagePullSecrets: secret.GetReferenceList(c.cfg.PullSecrets), Containers: []corev1.Container{{ Name: WebhooksName, - Image: c.webhooksImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "webhooks"}, SecurityContext: securtyContext, Args: []string{ diff --git a/pkg/render/whisker/component.go b/pkg/render/whisker/component.go index 2642021f6b..2e07160838 100644 --- a/pkg/render/whisker/component.go +++ b/pkg/render/whisker/component.go @@ -94,7 +94,7 @@ type Component struct { cfg *Configuration whiskerImage string - whiskerBackendImage string + calicoImage string } func (c *Component) ResolveImages(is *operatorv1.ImageSet) error { @@ -108,7 +108,7 @@ func (c *Component) ResolveImages(is *operatorv1.ImageSet) error { if err != nil { return err } - c.whiskerBackendImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) + c.calicoImage, err = components.GetReference(components.CombinedCalicoImage(c.cfg.Installation), reg, path, prefix, is) return err } @@ -195,7 +195,7 @@ func (c *Component) whiskerService() *corev1.Service { func (c *Component) whiskerBackendContainer() corev1.Container { return corev1.Container{ Name: WhiskerBackendContainerName, - Image: c.whiskerBackendImage, + Image: c.calicoImage, Command: []string{components.CalicoBinaryPath, "component", "whisker-backend"}, Env: []corev1.EnvVar{ {Name: "LOG_LEVEL", Value: "INFO"}, From 2ed505c0c2f2eeaee2a820a0fdffc3f498349ae0 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 20 May 2026 14:24:18 -0700 Subject: [PATCH 2/2] make fix --- pkg/render/applicationlayer/applicationlayer.go | 2 +- pkg/render/gatewayapi/gateway_api.go | 2 +- pkg/render/guardian.go | 2 +- pkg/render/intrusion_detection.go | 6 +++--- pkg/render/logstorage/esgateway/esgateway.go | 4 ++-- pkg/render/logstorage/esmetrics/elasticsearch_metrics.go | 2 +- pkg/render/logstorage/linseed/linseed.go | 4 ++-- pkg/render/monitor/monitor.go | 8 ++++---- pkg/render/packet_capture_api.go | 2 +- pkg/render/policyrecommendation.go | 2 +- pkg/render/whisker/component.go | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/render/applicationlayer/applicationlayer.go b/pkg/render/applicationlayer/applicationlayer.go index 5b1c29d795..812e85c5c8 100644 --- a/pkg/render/applicationlayer/applicationlayer.go +++ b/pkg/render/applicationlayer/applicationlayer.go @@ -101,7 +101,7 @@ type Config struct { // Calculated internal fields. proxyImage string - calicoImage string + calicoImage string dikastesImage string dikastesEnabled bool perHostEnvoyEnabled bool diff --git a/pkg/render/gatewayapi/gateway_api.go b/pkg/render/gatewayapi/gateway_api.go index 1d4aff2d07..b40d848c34 100644 --- a/pkg/render/gatewayapi/gateway_api.go +++ b/pkg/render/gatewayapi/gateway_api.go @@ -420,7 +420,7 @@ type gatewayAPIImplementationComponent struct { envoyGatewayImage string envoyProxyImage string envoyRatelimitImage string - calicoImage string + calicoImage string L7LogCollectorImage string } diff --git a/pkg/render/guardian.go b/pkg/render/guardian.go index 2db5a1411e..ae742bf1a6 100644 --- a/pkg/render/guardian.go +++ b/pkg/render/guardian.go @@ -133,7 +133,7 @@ type GuardianConfiguration struct { } type GuardianComponent struct { - cfg *GuardianConfiguration + cfg *GuardianConfiguration calicoImage string } diff --git a/pkg/render/intrusion_detection.go b/pkg/render/intrusion_detection.go index 5544c57ea0..da2aa28530 100644 --- a/pkg/render/intrusion_detection.go +++ b/pkg/render/intrusion_detection.go @@ -120,9 +120,9 @@ type IntrusionDetectionConfiguration struct { } type intrusionDetectionComponent struct { - cfg *IntrusionDetectionConfiguration - controllerImage string - calicoImage string + cfg *IntrusionDetectionConfiguration + controllerImage string + calicoImage string } func (c *intrusionDetectionComponent) ResolveImages(is *operatorv1.ImageSet) error { diff --git a/pkg/render/logstorage/esgateway/esgateway.go b/pkg/render/logstorage/esgateway/esgateway.go index 97834716c8..d8673fae21 100644 --- a/pkg/render/logstorage/esgateway/esgateway.go +++ b/pkg/render/logstorage/esgateway/esgateway.go @@ -66,9 +66,9 @@ func EsGateway(c *Config) render.Component { } type esGateway struct { - csrImage string + csrImage string calicoImage string - cfg *Config + cfg *Config } // Config contains all the config information needed to render the EsGateway component. diff --git a/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go b/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go index df569fbc3e..47c99a763b 100644 --- a/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go +++ b/pkg/render/logstorage/esmetrics/elasticsearch_metrics.go @@ -71,7 +71,7 @@ type Config struct { } type elasticsearchMetrics struct { - cfg *Config + cfg *Config calicoImage string } diff --git a/pkg/render/logstorage/linseed/linseed.go b/pkg/render/logstorage/linseed/linseed.go index 67e15e0543..7f976280f4 100644 --- a/pkg/render/logstorage/linseed/linseed.go +++ b/pkg/render/logstorage/linseed/linseed.go @@ -68,8 +68,8 @@ func Linseed(c *Config) render.Component { type linseed struct { calicoImage string - csrImage string - cfg *Config + csrImage string + cfg *Config // Namespace in which to provision namespaced resources. namespace string diff --git a/pkg/render/monitor/monitor.go b/pkg/render/monitor/monitor.go index b713d9508b..f9a59de790 100644 --- a/pkg/render/monitor/monitor.go +++ b/pkg/render/monitor/monitor.go @@ -176,10 +176,10 @@ type Config struct { } type monitorComponent struct { - cfg *Config - alertmanagerImage string - prometheusImage string - calicoImage string + cfg *Config + alertmanagerImage string + prometheusImage string + calicoImage string } func (mc *monitorComponent) ResolveImages(is *operatorv1.ImageSet) error { diff --git a/pkg/render/packet_capture_api.go b/pkg/render/packet_capture_api.go index 79cd7cbe9e..576b84e44b 100644 --- a/pkg/render/packet_capture_api.go +++ b/pkg/render/packet_capture_api.go @@ -73,7 +73,7 @@ type PacketCaptureApiConfiguration struct { } type packetCaptureApiComponent struct { - cfg *PacketCaptureApiConfiguration + cfg *PacketCaptureApiConfiguration calicoImage string } diff --git a/pkg/render/policyrecommendation.go b/pkg/render/policyrecommendation.go index fa761d01f1..a99c1ad37b 100644 --- a/pkg/render/policyrecommendation.go +++ b/pkg/render/policyrecommendation.go @@ -81,7 +81,7 @@ type PolicyRecommendationConfiguration struct { } type policyRecommendationComponent struct { - cfg *PolicyRecommendationConfiguration + cfg *PolicyRecommendationConfiguration calicoImage string } diff --git a/pkg/render/whisker/component.go b/pkg/render/whisker/component.go index 2e07160838..768d0a0650 100644 --- a/pkg/render/whisker/component.go +++ b/pkg/render/whisker/component.go @@ -93,8 +93,8 @@ type Configuration struct { type Component struct { cfg *Configuration - whiskerImage string - calicoImage string + whiskerImage string + calicoImage string } func (c *Component) ResolveImages(is *operatorv1.ImageSet) error {