mirror of https://github.com/istio/istio.io.git
Convert hardcoded values to read actual values (#10879)
* Convert hardcoded values to read actual values * Fix assigment * escape $
This commit is contained in:
parent
9ed4f7fbf0
commit
b00ed6db68
|
|
@ -205,6 +205,9 @@ ifdef VARIANT
|
|||
endif
|
||||
@export TAG
|
||||
@echo "TAG=${TAG}"
|
||||
$(eval BASE_VERSION := $(shell cd ${ISTIO_GO} && grep BASE_VERSION Makefile.core.mk | awk '{ print $$3}'))
|
||||
@echo "BASE_VERSION=${BASE_VERSION}"
|
||||
@export BASE_VERSION
|
||||
|
||||
# doc test framework
|
||||
include tests/tests.mk
|
||||
|
|
|
|||
|
|
@ -81,11 +81,6 @@ else
|
|||
make "${ISTIO_OUT}/release/istioctl-linux-amd64"
|
||||
cp -a "${ISTIO_OUT}/release/istioctl-linux-amd64" /gobin/istioctl
|
||||
fi
|
||||
# Get base version tag
|
||||
BASE_VERSION=$(grep BASE_VERSION Makefile.core.mk | awk '{ print $3}')
|
||||
export BASE_VERSION
|
||||
echo "BASE_VERSION=${BASE_VERSION}"
|
||||
|
||||
|
||||
popd > /dev/null
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ function setup_vm() {
|
|||
-v "${WORK_DIR}:/root" -v "${PWD}/content/en/docs/setup/install/virtual-machine:/test" \
|
||||
${EXTRA_VM_ARGS:-} \
|
||||
-w "/root" \
|
||||
gcr.io/istio-release/base:master-2022-01-14T19-01-09
|
||||
gcr.io/istio-release/base:${BASE_VERSION}
|
||||
|
||||
POD_CIDR=$(kubectl get node -ojsonpath='{.items[0].spec.podCIDR}')
|
||||
DOCKER_IP=$(docker inspect -f "{{ .NetworkSettings.Networks.kind.IPAddress }}" istio-testing-control-plane)
|
||||
|
|
@ -69,7 +69,7 @@ function setup_vm() {
|
|||
snip_configure_the_virtual_machine_1
|
||||
snip_configure_the_virtual_machine_2
|
||||
# TODO: we should probably have a better way to get the debian package
|
||||
curl -LO https://storage.googleapis.com/istio-build/dev/1.13-alpha.5698d7291554bad89fd9282dbc718c1c25be2982/deb/istio-sidecar.deb
|
||||
curl -LO https://storage.googleapis.com/istio-build/dev/${TAG}/deb/istio-sidecar.deb
|
||||
sudo dpkg -i istio-sidecar.deb
|
||||
snip_configure_the_virtual_machine_5
|
||||
snip_configure_the_virtual_machine_6
|
||||
|
|
|
|||
Loading…
Reference in New Issue