Skip to content
This repository was archived by the owner on Dec 1, 2022. It is now read-only.

[RELEASE-1.4] Kourier Image injection 1.4 #1173

Merged
openshift-ci merged 1 commit into from
Jul 14, 2022
Merged

[RELEASE-1.4] Kourier Image injection 1.4 #1173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions openshift/e2e-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,10 @@ function update_csv(){
local KOURIER_VERSION=$(metadata.get dependencies.kourier)
local KOURIER_MINOR_VERSION=${KOURIER_VERSION%.*} # e.g. "0.21.0" => "0.21"

local KOURIER_CONTROL="registry.ci.openshift.org/openshift/knative-v${KOURIER_VERSION}:kourier"
local KOURIER_GATEWAY=$(grep -w "docker.io/maistra/proxyv2-ubi8" $SERVING_DIR/third_party/kourier-latest/kourier.yaml | awk '{print $NF}')
export KNATIVE_KOURIER_CONTROL="registry.ci.openshift.org/openshift/knative-v${KOURIER_VERSION}:kourier"
export KNATIVE_KOURIER_GATEWAY=$(grep -w "docker.io/maistra/proxyv2-ubi8" $SERVING_DIR/third_party/kourier-latest/kourier.yaml | awk '{print $NF}')
local CSV="olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml"

# Replace kourier's image with the latest ones from third_party/kourier-latest
sed -i -e "s|\"docker.io/maistra/proxyv2-ubi8:.*\"|\"${KOURIER_GATEWAY}\"|g" ${CSV}
sed -i -e "s|\"registry.ci.openshift.org/openshift/knative-.*:kourier\"|\"${KOURIER_CONTROL}\"|g" ${CSV}

# release-next branch keeps updating the latest manifest in knative-serving-ci.yaml for serving resources.
# see: https://github.com/openshift/knative-serving/blob/release-next/openshift/release/knative-serving-ci.yaml
# So mount the manifest and use it by KO_DATA_PATH env value.
Expand Down Expand Up @@ -183,7 +179,8 @@ function install_catalogsource(){
# And checkout the setup script based on that commit.
local SERVERLESS_DIR=$(mktemp -d)
local CURRENT_DIR=$(pwd)
git clone --depth 1 https://github.com/openshift-knative/serverless-operator.git ${SERVERLESS_DIR}
git clone --branch override_env_via_injection_net --depth 1 https://github.com/skonto/serverless-operator.git ${SERVERLESS_DIR}

pushd ${SERVERLESS_DIR}

source ./test/lib.bash
Expand Down