hco-operator: Remove primary UDN Binding image env var

RamLavi · RamLavi · commit 3794124f4cf3 · 2024-12-17T22:11:16.000+02:00
Signed-off-by: Ram Lavi &lt;ralavi@redhat.com&gt;
diff --git a/deploy/images.csv b/deploy/images.csv
@@ -10,7 +10,6 @@ KUBEVIRT_EXPORTPROXY_IMAGE,quay.io/kubevirt/virt-exportproxy,KUBEVIRT_VERSION,55
 KUBEVIRT_EXPORSERVER_IMAGE,quay.io/kubevirt/virt-exportserver,KUBEVIRT_VERSION,ec1693cc6e8a14ab83f2feea87427643a968d65832c44b25a1bb911482403ff2
 KUBEVIRT_PR_HELPER,quay.io/kubevirt/pr-helper,KUBEVIRT_VERSION,fd434b4ea1ca5682fc5b05f23de01130c0c10f77a0a2d9d089d8f3cb5b545aa6
 KUBEVIRT_SIDECAR_SHIM,quay.io/kubevirt/sidecar-shim,KUBEVIRT_VERSION,cb4025f7275f8de2891c2195c5faf128ac1b68595cdb3eff776a2e5360b8f034
-PRIMARY_USER_DEFINED_NETWORK_BINDING_IMAGE,quay.io/kubevirt/network-passt-binding,KUBEVIRT_VERSION,c794cc1b9173267f1e3d34e666d9e2f782b88d93b47fb4449675346b467f802c
 CNA_OPERATOR_IMAGE,quay.io/kubevirt/cluster-network-addons-operator,NETWORK_ADDONS_VERSION,6c4e0af7e8ea2bc9c3caf007f4b875c5dc78e5936f35f1791392d92ede660bb4
 SSP_OPERATOR_IMAGE,quay.io/kubevirt/ssp-operator,SSP_VERSION,4e37f106d2ab188c53ca743cd9226703f1f8640ad8628e80bdd249f48ab905cc
 SSP_VALIDATOR_IMAGE,quay.io/kubevirt/kubevirt-template-validator,SSP_VERSION,a8d15be0336b43bef23aa127d69b040ddfba917c6ae5a83f2226cdb7ae27ccc5
diff --git a/deploy/images.env b/deploy/images.env
@@ -9,7 +9,6 @@ KUBEVIRT_EXPORTPROXY_IMAGE=quay.io/kubevirt/virt-exportproxy@sha256:55e38274e59b
 KUBEVIRT_EXPORSERVER_IMAGE=quay.io/kubevirt/virt-exportserver@sha256:ec1693cc6e8a14ab83f2feea87427643a968d65832c44b25a1bb911482403ff2
 KUBEVIRT_PR_HELPER=quay.io/kubevirt/pr-helper@sha256:fd434b4ea1ca5682fc5b05f23de01130c0c10f77a0a2d9d089d8f3cb5b545aa6
 KUBEVIRT_SIDECAR_SHIM=quay.io/kubevirt/sidecar-shim@sha256:cb4025f7275f8de2891c2195c5faf128ac1b68595cdb3eff776a2e5360b8f034
-PRIMARY_USER_DEFINED_NETWORK_BINDING_IMAGE=quay.io/kubevirt/network-passt-binding@sha256:c794cc1b9173267f1e3d34e666d9e2f782b88d93b47fb4449675346b467f802c
 CNA_OPERATOR_IMAGE=quay.io/kubevirt/cluster-network-addons-operator@sha256:6c4e0af7e8ea2bc9c3caf007f4b875c5dc78e5936f35f1791392d92ede660bb4
 SSP_OPERATOR_IMAGE=quay.io/kubevirt/ssp-operator@sha256:4e37f106d2ab188c53ca743cd9226703f1f8640ad8628e80bdd249f48ab905cc
 SSP_VALIDATOR_IMAGE=quay.io/kubevirt/kubevirt-template-validator@sha256:a8d15be0336b43bef23aa127d69b040ddfba917c6ae5a83f2226cdb7ae27ccc5
@@ -44,7 +43,6 @@ DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-exportproxy@sha256:55e38274e59
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-exportserver@sha256:ec1693cc6e8a14ab83f2feea87427643a968d65832c44b25a1bb911482403ff2"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/pr-helper@sha256:fd434b4ea1ca5682fc5b05f23de01130c0c10f77a0a2d9d089d8f3cb5b545aa6"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/sidecar-shim@sha256:cb4025f7275f8de2891c2195c5faf128ac1b68595cdb3eff776a2e5360b8f034"
-DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/network-passt-binding@sha256:c794cc1b9173267f1e3d34e666d9e2f782b88d93b47fb4449675346b467f802c"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cluster-network-addons-operator@sha256:6c4e0af7e8ea2bc9c3caf007f4b875c5dc78e5936f35f1791392d92ede660bb4"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/ssp-operator@sha256:4e37f106d2ab188c53ca743cd9226703f1f8640ad8628e80bdd249f48ab905cc"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/kubevirt-template-validator@sha256:a8d15be0336b43bef23aa127d69b040ddfba917c6ae5a83f2226cdb7ae27ccc5"
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -70,8 +70,6 @@ spec:
           value: v1.3.0
         - name: KV_CONSOLE_PLUGIN_IMAGE
         - name: KV_CONSOLE_PROXY_IMAGE
-        - name: PRIMARY_UDN_SIDECAR_IMAGE
-          value: quay.io/kubevirt/network-passt-binding@sha256:c794cc1b9173267f1e3d34e666d9e2f782b88d93b47fb4449675346b467f802c
         image: quay.io/kubevirt/hyperconverged-cluster-operator:1.14.0-unstable
         imagePullPolicy: Always
         livenessProbe:
diff --git a/hack/build-manifests.sh b/hack/build-manifests.sh
@@ -307,7 +307,6 @@ ${PROJECT_ROOT}/tools/manifest-templator/manifest-templator \
   --aaq-version="${AAQ_VERSION}" \
   --operator-image="${HCO_OPERATOR_IMAGE}" \
   --webhook-image="${HCO_WEBHOOK_IMAGE}" \
-  --primary-udn-binding-image-name="${PRIMARY_USER_DEFINED_NETWORK_BINDING_IMAGE}" \
   --cli-downloads-image="${HCO_DOWNLOADS_IMAGE}"
 
 (cd ${PROJECT_ROOT}/tools/manifest-templator/ && go clean)
@@ -354,7 +353,6 @@ ${PROJECT_ROOT}/tools/csv-merger/csv-merger \
   --kubevirt-consoleplugin-image-name="${KUBEVIRT_CONSOLE_PLUGIN_IMAGE}" \
   --kubevirt-consoleproxy-image-name="${KUBEVIRT_CONSOLE_PROXY_IMAGE}" \
   --cli-downloads-image-name="${HCO_DOWNLOADS_IMAGE}" \
-  --primary-udn-binding-image-name="${PRIMARY_USER_DEFINED_NETWORK_BINDING_IMAGE}" > "${CSV_DIR}/${OPERATOR_NAME}.v${CSV_VERSION}.${CSV_EXT}"
 
 rendered_csv="$(cat "${CSV_DIR}/${OPERATOR_NAME}.v${CSV_VERSION}.${CSV_EXT}")"
 rendered_keywords="$(echo "$rendered_csv" |grep 'keywords' -A 3)"
diff --git a/pkg/components/components.go b/pkg/components/components.go
@@ -85,7 +85,6 @@ type DeploymentOperatorParams struct {
 	HppoVersion            string
 	MtqVersion             string
 	AaqVersion             string
-	PrimaryUDNImage        string
 	Env                    []corev1.EnvVar
 }
 
@@ -292,10 +291,6 @@ func buildEnvVars(params *DeploymentOperatorParams) []corev1.EnvVar {
 			Name:  util.KVUIProxyImageEnvV,
 			Value: params.KVUIProxyImage,
 		},
-		{
-			Name:  util.PrimaryUDNImageEnvV,
-			Value: params.PrimaryUDNImage,
-		},
 	}, params.Env...)
 
 	if params.KvVirtLancherOsVersion != "" {
diff --git a/pkg/util/consts.go b/pkg/util/consts.go
@@ -17,7 +17,6 @@ const (
 	AaqVersionEnvV                   = "AAQ_VERSION"
 	KVUIPluginImageEnvV              = "KV_CONSOLE_PLUGIN_IMAGE"
 	KVUIProxyImageEnvV               = "KV_CONSOLE_PROXY_IMAGE"
-	PrimaryUDNImageEnvV              = "PRIMARY_UDN_SIDECAR_IMAGE"
 	HcoValidatingWebhook             = "validate-hco.kubevirt.io"
 	HcoMutatingWebhookNS             = "mutate-ns-hco.kubevirt.io"
 	PrometheusRuleCRDName            = "prometheusrules.monitoring.coreos.com"
diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go
@@ -97,7 +97,6 @@ var (
 	kvUIPluginImage     = flag.String("kubevirt-consoleplugin-image-name", "", "KubeVirt Console Plugin image")
 	kvUIProxyImage      = flag.String("kubevirt-consoleproxy-image-name", "", "KubeVirt Console Proxy image")
 	kvVirtIOWinImage    = flag.String("kv-virtiowin-image-name", "", "KubeVirt VirtIO Win image")
-	primaryUDNImage     = flag.String("primary-udn-binding-image-name", "", "Primary UDN binding image")
 	smbios              = flag.String("smbios", "", "Custom SMBIOS string for KubeVirt ConfigMap")
 	machinetype         = flag.String("machinetype", "", "Custom MACHINETYPE string for KubeVirt ConfigMap (Deprecated, use amd64-machinetype)")
 	amd64MachineType    = flag.String("amd64-machinetype", "", "Custom AMD64_MACHINETYPE string for KubeVirt ConfigMap")
@@ -535,7 +534,6 @@ func getDeploymentParams() *components.DeploymentOperatorParams {
 		SspVersion:             *sspVersion,
 		HppoVersion:            *hppoVersion,
 		AaqVersion:             *aaqVersion,
-		PrimaryUDNImage:        *primaryUDNImage,
 		Env:                    envVars,
 	}
 }
diff --git a/tools/manifest-templator/manifest-templator.go b/tools/manifest-templator/manifest-templator.go
@@ -77,7 +77,6 @@ var (
 	hppoVersion             = flag.String("hppo-version", "", "HPP operator version")
 	_                       = flag.String("mtq-version", "", "deprecated. This flag is ignored")
 	aaqVersion              = flag.String("aaq-version", "", "AAQ operator version")
-	primaryUDNImage         = flag.String("primary-udn-binding-image-name", "", "Primary UDN binding image")
 	apiSources              = flag.String("api-sources", cwd+"/...", "Project sources")
 )
 
@@ -431,7 +430,6 @@ func getOperatorParameters() *components.DeploymentOperatorParams {
 		SspVersion:             *sspVersion,
 		HppoVersion:            *hppoVersion,
 		AaqVersion:             *aaqVersion,
-		PrimaryUDNImage:        *primaryUDNImage,
 		Env:                    []corev1.EnvVar{},
 	}
 	return params

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ var (`
`77`	`77`	`hppoVersion = flag.String("hppo-version", "", "HPP operator version")`
`78`	`78`	`_ = flag.String("mtq-version", "", "deprecated. This flag is ignored")`
`79`	`79`	`aaqVersion = flag.String("aaq-version", "", "AAQ operator version")`
`80`		`- primaryUDNImage = flag.String("primary-udn-binding-image-name", "", "Primary UDN binding image")`
`81`	`80`	`apiSources = flag.String("api-sources", cwd+"/...", "Project sources")`
`82`	`81`	`)`
`83`	`82`
`@@ -431,7 +430,6 @@ func getOperatorParameters() *components.DeploymentOperatorParams {`
`431`	`430`	`SspVersion: *sspVersion,`
`432`	`431`	`HppoVersion: *hppoVersion,`
`433`	`432`	`AaqVersion: *aaqVersion,`
`434`		`- PrimaryUDNImage: *primaryUDNImage,`
`435`	`433`	`Env: []corev1.EnvVar{},`
`436`	`434`	`}`
`437`	`435`	`return params`