-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
93 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
...t/en/docs/quick-start/istio/istio-diff.md → ...ocs/quick-start/istio/istio-diff/index.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| --- | ||
| date: 2022-03-25 | ||
| weight: 2 | ||
| --- | ||
|
|
||
| bin/init.sh | ||
|
|
||
| ```diff | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
content/zh/docs/user-guide/start/istio/istio-diff/index.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| --- | ||
| date: 2022-03-25 | ||
| weight: 2 | ||
| --- | ||
|
|
||
| bin/init.sh | ||
|
|
||
| ```diff | ||
| -WASM_RELEASE_DIR=${ISTIO_ENVOY_LINUX_RELEASE_DIR} | ||
| -for plugin in stats metadata_exchange | ||
| -do | ||
| - FILTER_WASM_URL="${ISTIO_ENVOY_BASE_URL}/${plugin}-${ISTIO_ENVOY_VERSION}.wasm" | ||
| - download_wasm_if_necessary "${FILTER_WASM_URL}" "${WASM_RELEASE_DIR}"/"${plugin//_/-}"-filter.wasm | ||
| - FILTER_WASM_URL="${ISTIO_ENVOY_BASE_URL}/${plugin}-${ISTIO_ENVOY_VERSION}.compiled.wasm" | ||
| - download_wasm_if_necessary "${FILTER_WASM_URL}" "${WASM_RELEASE_DIR}"/"${plugin//_/-}"-filter.compiled.wasm | ||
| -done | ||
| +#WASM_RELEASE_DIR=${ISTIO_ENVOY_LINUX_RELEASE_DIR} | ||
| +#for plugin in stats metadata_exchange | ||
| +#do | ||
| +# FILTER_WASM_URL="${ISTIO_ENVOY_BASE_URL}/${plugin}-${ISTIO_ENVOY_VERSION}.wasm" | ||
| +# download_wasm_if_necessary "${FILTER_WASM_URL}" "${WASM_RELEASE_DIR}"/"${plugin//_/-}"-filter.wasm | ||
| +# FILTER_WASM_URL="${ISTIO_ENVOY_BASE_URL}/${plugin}-${ISTIO_ENVOY_VERSION}.compiled.wasm" | ||
| +# download_wasm_if_necessary "${FILTER_WASM_URL}" "${WASM_RELEASE_DIR}"/"${plugin//_/-}"-filter.compiled.wasm | ||
| +#done | ||
| ``` | ||
|
|
||
| bin/update_proxy.sh | ||
|
|
||
| ```diff | ||
| -WASM_URL=${ISTIO_ENVOY_BASE_URL}/${plugin}-${ISTIO_ENVOY_VERSION}.wasm | ||
| -printf "Verifying %s is available\n" "$WASM_URL" | ||
| -until curl --output /dev/null --silent --head --fail "$WASM_URL"; do | ||
| - printf '.' | ||
| - sleep $SLEEP_TIME | ||
| -done | ||
| +#WASM_URL=${ISTIO_ENVOY_BASE_URL}/${plugin}-${ISTIO_ENVOY_VERSION}.wasm | ||
| +#printf "Verifying %s is available\n" "$WASM_URL" | ||
| +#until curl --output /dev/null --silent --head --fail "$WASM_URL"; do | ||
| +# printf '.' | ||
| +# sleep $SLEEP_TIME | ||
| +#done | ||
| ``` | ||
|
|
||
| pilot/docker/Dockerfile.proxyv2 | ||
|
|
||
| ```diff | ||
| -COPY stats-filter.wasm /etc/istio/extensions/stats-filter.wasm | ||
| -COPY stats-filter.compiled.wasm /etc/istio/extensions/stats-filter.compiled.wasm | ||
| -COPY metadata-exchange-filter.wasm /etc/istio/extensions/metadata-exchange-filter.wasm | ||
| -COPY metadata-exchange-filter.compiled.wasm /etc/istio/extensions/metadata-exchange-filter.compiled.wasm | ||
| +#COPY stats-filter.wasm /etc/istio/extensions/stats-filter.wasm | ||
| +#COPY stats-filter.compiled.wasm /etc/istio/extensions/stats-filter.compiled.wasm | ||
| +#COPY metadata-exchange-filter.wasm /etc/istio/extensions/metadata-exchange-filter.wasm | ||
| +#COPY metadata-exchange-filter.compiled.wasm /etc/istio/extensions/metadata-exchange-filter.compiled.wasm | ||
| ``` | ||
|
|
||
| tools/istio-docker.mk | ||
|
|
||
| ```diff | ||
| # rule for wasm extensions. | ||
| -$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.wasm: init | ||
| -$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.compiled.wasm: init | ||
| -$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.wasm: init | ||
| -$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.compiled.wasm: init | ||
| +#$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.wasm: init | ||
| +#$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.compiled.wasm: init | ||
| +#$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.wasm: init | ||
| +#$(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.compiled.wasm: init | ||
|
|
||
| -docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.wasm | ||
| -docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.compiled.wasm | ||
| -docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.wasm | ||
| -docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.compiled.wasm | ||
| +#docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.wasm | ||
| +#docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/stats-filter.compiled.wasm | ||
| +#docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.wasm | ||
| +#docker.proxyv2: $(ISTIO_ENVOY_LINUX_RELEASE_DIR)/metadata-exchange-filter.compiled.wasm | ||
| ``` | ||
|
|
||
| pkg/config/constants/constants.go | ||
|
|
||
| ```diff | ||
| - BinaryPathFilename = "/usr/local/bin/envoy" | ||
| + BinaryPathFilename = "/usr/local/bin/mosn" | ||
| ``` |