OSSM-4881: Add support for SMCP v2.5 (#1342)

* OSSM-4881: Add support for v2.5 Signed-off-by: Jacek Ewertowski <[email protected]> * Remove 3scale adapter Signed-off-by: Jacek Ewertowski <[email protected]> * Remove TestWASMExtensionInstall Signed-off-by: Jacek Ewertowski <[email protected]> * Don't execute TestDefaultInstall for v2.2 Signed-off-by: Jacek Ewertowski <[email protected]> * Run TestAdditionalIngressGatewayInstall for all supported versions Signed-off-by: Jacek Ewertowski <[email protected]> * Remove unused functions Signed-off-by: Jacek Ewertowski <[email protected]> * Run TestNetworkPolicy for all supported versions Signed-off-by: Jacek Ewertowski <[email protected]> * Remove profiles_test.go, because only unsupported versions were tested Signed-off-by: Jacek Ewertowski <[email protected]> * Remove spec.addons.threescale from SMCP v2.5 Signed-off-by: Jacek Ewertowski <[email protected]> * Fix creating rendering strategy for version v2.5 Signed-off-by: Jacek Ewertowski <[email protected]> * Fix conditions in CNI daemonset 2.5 Signed-off-by: Jacek Ewertowski <[email protected]> * Add missing RLS image to the manifests Signed-off-by: Jacek Ewertowski <[email protected]> * Fix lint errors in a generate-manifests.sh Signed-off-by: Jacek Ewertowski <[email protected]> * Fix linter errors Signed-off-by: Jacek Ewertowski <[email protected]> * Fix lint errors Signed-off-by: Jacek Ewertowski <[email protected]> * Revert "Remove spec.addons.threescale from SMCP v2.5" This reverts commit 0d93507. Signed-off-by: Jacek Ewertowski <[email protected]> * Remove patch_3scale_container_image Signed-off-by: Jacek Ewertowski <[email protected]> * Patch istio-ingress and istio-egress values Signed-off-by: Jacek Ewertowski <[email protected]> * Restore telemetry values in istio-discovery chart Signed-off-by: Jacek Ewertowski <[email protected]> * Remove chart for ztunnel Signed-off-by: Jacek Ewertowski <[email protected]> * Remove 3scale rendering from v2.5 strategy Signed-off-by: Jacek Ewertowski <[email protected]> --------- Signed-off-by: Jacek Ewertowski <[email protected]>
maistra · Oct 9, 2023 · a33cbbb · a33cbbb
1 parent 907ae80
commit a33cbbb
Show file tree

Hide file tree

Showing 237 changed files with 58,831 additions and 1,195 deletions.
diff --git a/Makefile b/Makefile
@@ -18,9 +18,9 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
 
 -include Makefile.overrides
 
-MAISTRA_VERSION        ?= 2.4.3
-MAISTRA_BRANCH         ?= maistra-2.4
-ISTIO_VERSION          ?= 1.16.5
+MAISTRA_VERSION        ?= 2.5.0
+MAISTRA_BRANCH         ?= maistra-2.5
+ISTIO_VERSION          ?= 1.18.0
 REPLACES_PRODUCT_CSV   ?= 2.4.2
 REPLACES_COMMUNITY_CSV ?= 2.4.2
 VERSION                ?= development
@@ -87,7 +87,7 @@ test:
 # Helm charts generation and templates processing
 ################################################################################
 
-SUPPORTED_VERSIONS := 2.1 2.2 2.3 2.4
+SUPPORTED_VERSIONS := 2.1 2.2 2.3 2.4 2.5
 
 $(addprefix update-remote-maistra-,$(SUPPORTED_VERSIONS)): update-remote-maistra-%:
 	$(eval version:=$*)
@@ -181,10 +181,10 @@ endif
 # resource collection
 ################################################################################
 .PHONY: collect-charts
-collect-charts: collect-charts-2.1 collect-charts-2.2 collect-charts-2.3 collect-charts-2.4
+collect-charts: collect-charts-2.1 collect-charts-2.2 collect-charts-2.3 collect-charts-2.4 collect-charts-2.5
 
 .PHONY: collect-templates
-collect-templates: collect-templates-2.1 collect-templates-2.2 collect-templates-2.3 collect-templates-2.4
+collect-templates: collect-templates-2.1 collect-templates-2.2 collect-templates-2.3 collect-templates-2.4 collect-templates-2.5
 
 .PHONY: collect-olm-manifests
 collect-olm-manifests:

diff --git a/build/docker_build.sh b/build/docker_build.sh
@@ -36,4 +36,4 @@ mkdir "${HELM_DIR}"
 cp -r "${SOURCE_DIR}/tmp/_output/helm/istio-releases/istio-1.1.0" "${HELM_DIR}/1.1.0"
 
 echo "building container ${IMAGE}..."
-${CONTAINER_CLI} build --no-cache -t "${IMAGE}" -f tmp/build/Dockerfile --build-arg build_type=${BUILD_TYPE} .
+${CONTAINER_CLI} build --no-cache -t "${IMAGE}" -f tmp/build/Dockerfile --build-arg build_type="${BUILD_TYPE}" .
diff --git a/build/download-charts.sh b/build/download-charts.sh
@@ -6,14 +6,14 @@ set -e -u
 # shellcheck source=build/sed-wrapper.sh
 source "$(dirname "${BASH_SOURCE[0]}")/sed-wrapper.sh"
 
-: "${MAISTRA_VERSION:=2.4.3}"
+: "${MAISTRA_VERSION:=2.5.0}"
 : "${MAISTRA_REPO:=https://github.com/maistra/istio}"
-: "${MAISTRA_BRANCH:=maistra-2.4}"
+: "${MAISTRA_BRANCH:=maistra-2.5}"
 
 : "${SOURCE_DIR:=$(pwd)}"
 : "${OUT_DIR:=${SOURCE_DIR}/tmp/_output}"
 
-: "${ISTIO_VERSION:=1.16.5}"
+: "${ISTIO_VERSION:=1.18.0}"
 
 RELEASES_DIR=${OUT_DIR}/helm/istio-releases
 
@@ -51,12 +51,12 @@ function retrieveIstioRelease() {
   (
       echo "extracting Istio Helm charts to ${RELEASES_DIR}"
       cd "${RELEASES_DIR}"
-      rm -rf ${EXTRACT_DIR}
+      rm -rf "${EXTRACT_DIR}"
       ${EXTRACT_CMD}
-      cp -rf ${EXTRACT_DIR}/manifests/charts/* "${HELM_DIR}/"
+      cp -rf "${EXTRACT_DIR}"/manifests/charts/* "${HELM_DIR}/"
       # grafana dashboards
       mkdir -p "${HELM_DIR}/istio-telemetry/grafana/dashboards"
-      cp -rf ${EXTRACT_DIR}/manifests/addons/dashboards/* "${HELM_DIR}/istio-telemetry/grafana/dashboards/"
+      cp -rf "${EXTRACT_DIR}"/manifests/addons/dashboards/* "${HELM_DIR}/istio-telemetry/grafana/dashboards/"
       #(
       #  cd "${HELM_DIR}/istio"
       #  helm dep update

diff --git a/build/generate-manifests.sh b/build/generate-manifests.sh
@@ -62,32 +62,32 @@ function generateDeploymentFile() {
     cat deploy/src/rbac.yaml; echo -e "\n---\n"
     cat deploy/src/serviceaccount.yaml; echo -e "\n---\n"
     cat deploy/src/service.yaml; echo -e "\n---\n"
-    cat deploy/src/deployment-${BUILD_TYPE}.yaml; } >${DEPLOYMENT_FILE}
+    cat deploy/src/deployment-${BUILD_TYPE}.yaml; } >"${DEPLOYMENT_FILE}"
 }
 
 function generateCSV() {
   YQ="go run github.com/mikefarah/yq/v4"
 
-  IMAGE_SRC=$(${YQ} eval 'select(.kind=="Deployment" and .metadata.name=="istio-operator") | .spec.template.spec.containers[0].image' ${DEPLOYMENT_FILE})
+  IMAGE_SRC=$(${YQ} eval 'select(.kind=="Deployment" and .metadata.name=="istio-operator") | .spec.template.spec.containers[0].image' "${DEPLOYMENT_FILE}")
   if [ "$IMAGE_SRC" == "" ]; then
     echo "generateCSV(): Operator image source is empty, please verify source yaml/path to the field."
     exit 1
   fi
 
-  DEPLOYMENT_SPEC=$(${YQ} eval 'select(.kind=="Deployment" and .metadata.name=="istio-operator") | .spec' ${DEPLOYMENT_FILE} | sed 's/^/          /')
+  DEPLOYMENT_SPEC=$(${YQ} eval 'select(.kind=="Deployment" and .metadata.name=="istio-operator") | .spec' "${DEPLOYMENT_FILE}" | sed 's/^/          /')
   if [ "$DEPLOYMENT_SPEC" == "" ]; then
     echo "generateCSV(): Operator deployment spec is empty, please verify source yaml/path to the field."
     exit 1
   fi
 
-  CLUSTER_ROLE_RULES=$(${YQ} eval 'select(.kind=="ClusterRole" and .metadata.name=="istio-operator") | .rules' ${DEPLOYMENT_FILE} | sed 's/^/        /')
+  CLUSTER_ROLE_RULES=$(${YQ} eval 'select(.kind=="ClusterRole" and .metadata.name=="istio-operator") | .rules' "${DEPLOYMENT_FILE}" | sed 's/^/        /')
   if [ "$CLUSTER_ROLE_RULES" == "null" ]; then
     echo "generateCSV(): istio-operator cluster role source is empty, please verify source yaml/path to the field."
     exit 1
   fi
 
   if [ "${BUILD_TYPE}" == "maistra" ]; then
-    RELATED_IMAGES=$(${YQ} eval 'select(.kind=="Deployment" and .metadata.name=="istio-operator") | .spec.template.metadata.annotations' ${DEPLOYMENT_FILE} | \
+    RELATED_IMAGES=$(${YQ} eval 'select(.kind=="Deployment" and .metadata.name=="istio-operator") | .spec.template.metadata.annotations' "${DEPLOYMENT_FILE}" | \
       sed -n 's/olm\.relatedImage\.\([^:]*\): *\([^ ]*\)/- name: \1\
   image: \2/p' | \
       sed 's/^/  /')
@@ -146,9 +146,9 @@ $RELATED_IMAGES"
 
 function generatePackage() {
   local package_path=${MANIFESTS_DIR}/${BUILD_TYPE}.package.yaml
-  cp "${MY_LOCATION}/manifest-templates/package.yaml" ${package_path}
-  sed -i -e 's/__NAME__/'${OPERATOR_NAME}'/g' ${package_path}
-  sed -i -e 's/__VERSION__/'"${MAISTRA_VERSION}"'/g' ${package_path}
+  cp "${MY_LOCATION}/manifest-templates/package.yaml" "${package_path}"
+  sed -i -e 's/__NAME__/'${OPERATOR_NAME}'/g' "${package_path}"
+  sed -i -e 's/__VERSION__/'"${MAISTRA_VERSION}"'/g' "${package_path}"
 }
 
 checkDependencies

diff --git a/build/manifest-templates/clusterserviceversion.yaml b/build/manifest-templates/clusterserviceversion.yaml
@@ -29,7 +29,7 @@ metadata:
             "namespace": "control-plane-namespace"
           },
           "spec": {
-            "version": "v2.4",
+            "version": "v2.5",
             "tracing": {
               "type": "Jaeger",
               "sampling": 10000
@@ -200,6 +200,7 @@ __DEPLOYMENT_SPEC__
         path: version
         x-descriptors:
           - 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:General'
+          - 'urn:alm:descriptor:com.tectonic.ui:select:v2.5'
           - 'urn:alm:descriptor:com.tectonic.ui:select:v2.4'
           - 'urn:alm:descriptor:com.tectonic.ui:select:v2.3'
           - 'urn:alm:descriptor:com.tectonic.ui:select:v2.2'

diff --git a/build/patch-charts.sh b/build/patch-charts.sh
@@ -259,6 +259,10 @@ gateways: {}\n' "${HELM_DIR}/istio-control/istio-discovery/values.yaml"
 }
 
 function patchGateways() {
+  echo "move helpers file to gateways directory"
+  cp "${HELM_DIR}"/istio-control/istio-discovery/templates/_helpers.tpl "${HELM_DIR}/gateways/istio-ingress/templates"
+  cp "${HELM_DIR}"/istio-control/istio-discovery/templates/_helpers.tpl "${HELM_DIR}/gateways/istio-egress/templates"
+
   echo "patching Gateways specific Helm charts"
   sed_wrap -i -r -e 's/type: LoadBalancer *(#.*)?$/type: ClusterIP/' "${HELM_DIR}/gateways/istio-ingress/values.yaml"
 
@@ -302,6 +306,24 @@ gatewayAPI:
   tee >(cat >> "${HELM_DIR}/gateways/istio-ingress/values.yaml")\
       >(cat >> "${HELM_DIR}/gateways/istio-egress/values.yaml")
 
+  echo "
+telemetry:
+  enabled: true
+  v2:
+    enabled: true
+    prometheus:
+      enabled: true
+      configOverride:
+        gateway: {}
+        inboundSidecar: {}
+        outboundSidecar: {}
+    stackdriver:
+      enabled: false
+      configOverride: {}
+      disableOutbound: false" | \
+  tee >(cat >> "${HELM_DIR}/gateways/istio-ingress/values.yaml")\
+      >(cat >> "${HELM_DIR}/gateways/istio-egress/values.yaml")
+
   sed_wrap -i -e '/  logLevel:/ a\\n    tracer: zipkin' "${HELM_DIR}/gateways/istio-ingress/values.yaml"
   sed_wrap -i -e '/  logLevel:/ a\\n    tracer: zipkin' "${HELM_DIR}/gateways/istio-egress/values.yaml"
 
@@ -477,14 +499,15 @@ function removeUnsupportedCharts() {
   rm -rf "${HELM_DIR}/istiocoredns"
   rm -rf "${HELM_DIR}/istiod-remote"
   rm -rf "${HELM_DIR}/istio-operator"
+  rm -rf "${HELM_DIR}/ztunnel"
 }
 
 function moveEnvoyFiltersToMeshConfigChart() {
   echo "moving EnvoyFilter manifests to mesh-config"
   mv "${HELM_DIR}"/istio-control/istio-discovery/templates/telemetry*.yaml "${HELM_DIR}/mesh-config/templates"
+  cp "${HELM_DIR}"/istio-control/istio-discovery/templates/_helpers.tpl "${HELM_DIR}/mesh-config/templates"
 
   sed_nowrap -n -e '/^telemetry:/,/^      logWindowDuration/ p' "${HELM_DIR}/istio-control/istio-discovery/values.yaml" > "${HELM_DIR}/mesh-config/values.yaml"
-  sed_wrap -i -n -e '/^telemetry:/,/^      logWindowDuration/ d; p' "${HELM_DIR}/istio-control/istio-discovery/values.yaml"
   sed_wrap -i -e '/multiCluster:/ i\
   # Default mtls policy. If true, mtls between services will be enabled by default.\
   mtls:\
@@ -529,7 +552,7 @@ global:\
 
 function copyGlobalValues() {
   echo "copying global.yaml file from overlay charts as global.yaml file is removed in upstream but it's still needed."
-  cp "${SOURCE_DIR}/resources/helm/overlays/global.yaml" "${SOURCE_DIR}/resources/helm/v2.4/"
+  cp "${SOURCE_DIR}/resources/helm/overlays/global.yaml" "${SOURCE_DIR}/resources/helm/v2.5/"
 }
 
 # This hack is hopefully only needed for a few versions until this PR is merged: https://github.com/istio/istio/pull/39375

diff --git a/build/patch-container-image.sh b/build/patch-container-image.sh
@@ -51,30 +51,9 @@ function patch_oauth_proxy_image() {
     fi
 }
 
-function patch_3scale_container_image() {
-    local file=$1
-    if [ -f "$file" ]; then
-        if grep -q 'if contains "/" .Values.image' "${file}"; then return 0; fi
-        sed_wrap -i -re '/^ *- image:/,/^ *name: *3scale-istio-adapter *$/ {
-            /image:/!d
-            /image:/s+^( *)- image:.*$+\1- name: 3scale-istio-adapter\
-\{\{- if contains "/" .Values.image \}\}\
-\1  image: "\{\{ .Values.image \}\}"\
-\{\{- else \}\}\
-\1  image: "\{\{ .Values.hub \}\}/\{\{ .Values.image \}\}:\{\{ .Values.tag \}\}"\
-\{\{- end \}\}\
-\1  imagePullPolicy: Always+
-        }' "${file}"
-    else
-        echo "ERROR: file does not exist: ${file}"
-        return 1
-    fi
-}
-
 patch_container_image galley "${HELM_DIR}/istio/charts/galley/templates/deployment.yaml"
 patch_container_image '\{\{ .Chart.Name \}\}' "${HELM_DIR}/istio/charts/grafana/templates/deployment.yaml"
 patch_container_image citadel "${HELM_DIR}/istio/charts/security/templates/deployment.yaml"
 patch_container_image sidecar-injector-webhook "${HELM_DIR}/istio/charts/sidecarInjectorWebhook/templates/deployment.yaml"
 patch_oauth_proxy_image grafana-proxy "${HELM_DIR}/istio/charts/grafana/templates/deployment.yaml"
 patch_oauth_proxy_image prometheus-proxy "${HELM_DIR}/istio/charts/prometheus/templates/deployment.yaml"
-patch_3scale_container_image "${HELM_DIR}/maistra-threescale/templates/deployment.yaml"
diff --git a/deploy/maistra-operator.yaml b/deploy/maistra-operator.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"
     controller-gen.kubebuilder.io/version: v0.4.1
@@ -10332,7 +10332,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10511,7 +10511,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10980,11 +10980,19 @@ spec:
         olm.relatedImage.v2_4.proxyv2: quay.io/maistra/proxyv2-ubi8:2.4.0
         olm.relatedImage.v2_4.rls: quay.io/maistra/ratelimit-ubi8:2.4.0
 
+        olm.relatedImage.v2_5.cni: quay.io/maistra/istio-cni-ubi8:2.5.0
+        olm.relatedImage.v2_5.grafana: quay.io/maistra/grafana-ubi8:2.5.0
+        olm.relatedImage.v2_5.pilot: quay.io/maistra/pilot-ubi8:2.5.0
+        olm.relatedImage.v2_5.prometheus: quay.io/prometheus/prometheus:v2.42.0
+        olm.relatedImage.v2_5.prometheus-config-reloader: quay.io/prometheus-operator/prometheus-config-reloader:v0.63.0
+        olm.relatedImage.v2_5.proxyv2: quay.io/maistra/proxyv2-ubi8:2.5.0
+        olm.relatedImage.v2_5.rls: quay.io/maistra/ratelimit-ubi8:2.5.0
+
     spec:
       serviceAccountName: istio-operator
       containers:
       - name: istio-operator
-        image: quay.io/maistra/istio-ubi8-operator:2.4.0
+        image: quay.io/maistra/istio-ubi8-operator:2.5.0
         ports:
         - containerPort: 11999
           name: validation

diff --git a/deploy/servicemesh-operator.yaml b/deploy/servicemesh-operator.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"
     controller-gen.kubebuilder.io/version: v0.4.1
@@ -10332,7 +10332,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10511,7 +10511,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10973,13 +10973,21 @@ spec:
         olm.relatedImage.v2_3.wasm-cacher: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-pilot-rhel8:${OSSM_23}
         olm.relatedImage.v2_3.rls: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-ratelimit-rhel8:${OSSM_23}
         # 2.4 images
-        olm.relatedImage.v2_4.cni: ${OSSM_CNI_IMAGE}
-        olm.relatedImage.v2_4.grafana: ${OSSM_GRAFANA_IMAGE}
-        olm.relatedImage.v2_4.pilot: ${OSSM_PILOT_IMAGE}
+        olm.relatedImage.v2_4.cni: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-istio-cni-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.grafana: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-grafana-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.pilot: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-pilot-rhel8:${OSSM_24}
         olm.relatedImage.v2_4.prometheus: registry.redhat.io/openshift4/ose-prometheus:v4.12
         olm.relatedImage.v2_4.prometheus-config-reloader: registry.redhat.io/openshift4/ose-prometheus-config-reloader:v4.12
-        olm.relatedImage.v2_4.proxyv2: ${OSSM_PROXY_IMAGE}
-        olm.relatedImage.v2_4.rls: ${OSSM_RATELIMIT_IMAGE}
+        olm.relatedImage.v2_4.proxyv2: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-proxyv2-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.rls: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-ratelimit-rhel8:${OSSM_24}
+        # 2.5 images
+        olm.relatedImage.v2_5.cni: ${OSSM_CNI_IMAGE}
+        olm.relatedImage.v2_5.grafana: ${OSSM_GRAFANA_IMAGE}
+        olm.relatedImage.v2_5.pilot: ${OSSM_PILOT_IMAGE}
+        olm.relatedImage.v2_5.prometheus: registry.redhat.io/openshift4/ose-prometheus:v4.13
+        olm.relatedImage.v2_5.prometheus-config-reloader: registry.redhat.io/openshift4/ose-prometheus-config-reloader:v4.13
+        olm.relatedImage.v2_5.proxyv2: ${OSSM_PROXY_IMAGE}
+        olm.relatedImage.v2_5.rls: ${OSSM_RATELIMIT_IMAGE}
 
         oauth-proxy.query: "true"
         oauth-proxy.namespace: openshift

diff --git a/deploy/src/crd.yaml b/deploy/src/crd.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"
     controller-gen.kubebuilder.io/version: v0.4.1
@@ -10331,7 +10331,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10510,7 +10510,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.3
+    maistra-version: 2.5.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null

diff --git a/deploy/src/deployment-maistra.yaml b/deploy/src/deployment-maistra.yaml
@@ -47,11 +47,19 @@ spec:
         olm.relatedImage.v2_4.proxyv2: quay.io/maistra/proxyv2-ubi8:2.4.0
         olm.relatedImage.v2_4.rls: quay.io/maistra/ratelimit-ubi8:2.4.0
 
+        olm.relatedImage.v2_5.cni: quay.io/maistra/istio-cni-ubi8:2.5.0
+        olm.relatedImage.v2_5.grafana: quay.io/maistra/grafana-ubi8:2.5.0
+        olm.relatedImage.v2_5.pilot: quay.io/maistra/pilot-ubi8:2.5.0
+        olm.relatedImage.v2_5.prometheus: quay.io/prometheus/prometheus:v2.42.0
+        olm.relatedImage.v2_5.prometheus-config-reloader: quay.io/prometheus-operator/prometheus-config-reloader:v0.63.0
+        olm.relatedImage.v2_5.proxyv2: quay.io/maistra/proxyv2-ubi8:2.5.0
+        olm.relatedImage.v2_5.rls: quay.io/maistra/ratelimit-ubi8:2.5.0
+
     spec:
       serviceAccountName: istio-operator
       containers:
       - name: istio-operator
-        image: quay.io/maistra/istio-ubi8-operator:2.4.0
+        image: quay.io/maistra/istio-ubi8-operator:2.5.0
         ports:
         - containerPort: 11999
           name: validation