Merge pull request #289 from beagles/sync_netutils_var_name

openshift-merge-bot[bot] · web-flow · commit 331609cbb30e · 2025-02-28T10:20:10.000Z
Update envvar name for netutils container image
diff --git a/api/v1beta1/designate_types.go b/api/v1beta1/designate_types.go
@@ -324,7 +324,7 @@ func SetupDefaults() {
 		WorkerContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_DESIGNATE_WORKER_IMAGE_URL_DEFAULT", DesignateWorkerContainerImage),
 		UnboundContainerImageURL:      util.GetEnvVar("RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT", DesignateUnboundContainerImage),
 		Backendbind9ContainerImageURL: util.GetEnvVar("RELATED_IMAGE_DESIGNATE_BACKENDBIND9_IMAGE_URL_DEFAULT", DesignateBackendbind9ContainerImage),
-		NetUtilsURL:                   util.GetEnvVar("RELATED_IMAGE_NETUTILS_IMAGE_URL_DEFAULT", NetUtilsContainerImage),
+		NetUtilsURL:                   util.GetEnvVar("RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT", NetUtilsContainerImage),
 		DesignateAPIRouteTimeout:      APITimeout,
 	}
 
diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml
@@ -25,5 +25,5 @@ spec:
           value: quay.io/podified-antelope-centos9/openstack-designate-backend-bind9:current-podified
         - name: RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-unbound:current-podified
-        - name: RELATED_IMAGE_NETUTILS_IMAGE_URL_DEFAULT
+        - name: RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-netutils:current-podified

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ func SetupDefaults() {`
`324`	`324`	`WorkerContainerImageURL: util.GetEnvVar("RELATED_IMAGE_DESIGNATE_WORKER_IMAGE_URL_DEFAULT", DesignateWorkerContainerImage),`
`325`	`325`	`UnboundContainerImageURL: util.GetEnvVar("RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT", DesignateUnboundContainerImage),`
`326`	`326`	`Backendbind9ContainerImageURL: util.GetEnvVar("RELATED_IMAGE_DESIGNATE_BACKENDBIND9_IMAGE_URL_DEFAULT", DesignateBackendbind9ContainerImage),`
`327`		`- NetUtilsURL: util.GetEnvVar("RELATED_IMAGE_NETUTILS_IMAGE_URL_DEFAULT", NetUtilsContainerImage),`
	`327`	`+ NetUtilsURL: util.GetEnvVar("RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT", NetUtilsContainerImage),`
`328`	`328`	`DesignateAPIRouteTimeout: APITimeout,`
`329`	`329`	`}`
`330`	`330`