Remove hubble-ui-proxy from the related image list

cilium/cilium#19565 removed hubble-ui-proxy from the Helm chart. Remove all the references to hubble-ui-proxy in the OLM templates. Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
isovalent · Feb 20, 2024 · 1419a06 · 1419a06
1 parent 7b5dbeb
commit 1419a06
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 22 deletions.
diff --git a/config/operator/olm.cue b/config/operator/olm.cue
@@ -174,13 +174,6 @@ _related_images: [
 	}
 ]
 
-if parameters.hubbleUIProxyImage != "nothing" {
-	_related_images: _related_images + [{
-		name: "hubble-ui-proxy"
-		image: parameters.hubbleUIProxyImage
-	}]
-}
-
 // quay.io/coreos/etcd is not included in Cilium >= 1.15 Helm charts.
 // Ref: https://github.com/cilium/cilium/blob/v1.15.1/install/kubernetes/cilium/values.yaml
 if strings.HasPrefix(parameters.ciliumVersion, "1.12") || strings.HasPrefix(parameters.ciliumVersion, "1.13") || strings.HasPrefix(parameters.ciliumVersion, "1.14") {

diff --git a/config/operator/operator.cue b/config/operator/operator.cue
@@ -63,13 +63,6 @@ _related_images_env_vars: [{
 		value: parameters.clustermeshEtcdImage
 	}]
 
-if parameters.hubbleUIProxyImage != "nothing" {
-	_related_images_env_vars: _related_images_env_vars + [{
-		name: "RELATED_IMAGE_HUBBLE_UI_PROXY"
-		value: parameters.hubbleUIProxyImage
-	}]
-}
-
 _workloadSpec: {
 	template: {
 		metadata: labels: _commonMetadata.labels
@@ -256,7 +249,6 @@ _core_items: namespace + [
         certgenImage:          string | *""
         hubbleUIBackendImage:  string | *""
         hubbleUIFrontendImage: string | *""
-        hubbleUIProxyImage:    string | *""
         etcdOperatorImage:     string | *""
         nodeInitImage:         string | *""
         clustermeshEtcdImage:  string | *""

diff --git a/scripts/add-release.sh b/scripts/add-release.sh
@@ -59,7 +59,6 @@ cat > "${operator_dir}/watches.yaml" << EOF
     certgen.image.override: \$RELATED_IMAGE_CERTGEN
     hubble.ui.backend.image.override: \$RELATED_IMAGE_HUBBLE_UI_BE
     hubble.ui.frontend.image.override: \$RELATED_IMAGE_HUBBLE_UI_FE
-    hubble.ui.proxy.image.override: \$RELATED_IMAGE_HUBBLE_UI_PROXY
     etcd.image.override: \$RELATED_IMAGE_ETCD_OPERATOR
     nodeinit.image.override: \$RELATED_IMAGE_NODEINIT
     clustermesh.apiserver.etcd.image.override: \$RELATED_IMAGE_CLUSTERMESH_ETCD
@@ -169,7 +168,6 @@ if [[ ${cilium_version} == 1.9.* ]]; then
     # hubble-ui
     sed -i 's|^\([[:blank:]]*\)image: "{{ \.Values\.hubble\.ui\.frontend.*$|\1image: "{{ .Values.hubble.ui.frontend.image.override }}"|' "${template_dir}/hubble-ui-deployment.yaml"
     sed -i 's|^\([[:blank:]]*\)image: "{{ \.Values\.hubble\.ui\.backend.*$|\1image: "{{ .Values.hubble.ui.backend.image.override }}"|' "${template_dir}/hubble-ui-deployment.yaml"
-    sed -i 's|^\([[:blank:]]*\)image: "{{ \.Values\.hubble\.ui\.proxy.*$|\1image: "{{ .Values.hubble.ui.proxy.image.override }}"|' "${template_dir}/hubble-ui-deployment.yaml"
 fi
 
 git add Makefile.releases "${operator_dir}" "${bundle_dir}"

diff --git a/scripts/generate-configs.sh b/scripts/generate-configs.sh
@@ -55,9 +55,6 @@ clustermesh_image="$(yq e '.clustermesh.apiserver.image.repository' "$values_fil
 certgen_image="$(get_image "$(yq e '.certgen.image.repository' "$values_file")" "$(yq e '.certgen.image.tag' "$values_file")")"
 hubble_ui_be_image="$(get_image "$(yq e '.hubble.ui.backend.image.repository' "$values_file")" "$(yq e '.hubble.ui.backend.image.tag' "$values_file")")"
 hubble_ui_fe_image="$(get_image "$(yq e '.hubble.ui.frontend.image.repository' "$values_file")" "$(yq e '.hubble.ui.frontend.image.tag' "$values_file")")"
-if [[ "${cilium_version}" == 1.9.* ]]; then
-    hubble_ui_proxy_image="$(get_image "$(yq e '.hubble.ui.proxy.image.repository' "$values_file")" "$(yq e '.hubble.ui.proxy.image.tag' "$values_file")")"
-fi
 etcd_operator_image="$(get_image "$(yq e '.etcd.image.repository' "$values_file")" "$(yq e '.etcd.image.tag' "$values_file")")"
 nodeinit_image="$(get_image "$(yq e '.nodeinit.image.repository' "$values_file")" "$(yq e '.nodeinit.image.tag' "$values_file")")"
 clustermesh_etcd_image="$(get_image "$(yq e '.clustermesh.apiserver.etcd.image.repository' "$values_file")" "$(yq e '.clustermesh.apiserver.etcd.image.tag' "$values_file")")"
@@ -100,7 +97,6 @@ instances: [
       certgenImage: "${certgen_image}"
       hubbleUIBackendImage: "${hubble_ui_be_image}"
       hubbleUIFrontendImage: "${hubble_ui_fe_image}"
-      hubbleUIProxyImage: "${hubble_ui_proxy_image:-nothing}"
       etcdOperatorImage: "${etcd_operator_image}"
       nodeInitImage: "${nodeinit_image}"
       clustermeshEtcdImage: "${clustermesh_etcd_image}"
@@ -125,7 +121,6 @@ instances: [
       certgenImage: "${certgen_image}"
       hubbleUIBackendImage: "${hubble_ui_be_image}"
       hubbleUIFrontendImage: "${hubble_ui_fe_image}"
-      hubbleUIProxyImage: "${hubble_ui_proxy_image:-nothing}"
       etcdOperatorImage: "${etcd_operator_image}"
       nodeInitImage: "${nodeinit_image}"
       clustermeshEtcdImage: "${clustermesh_etcd_image}"