istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Site improvements. (#6003) 

- Update common files.

- Switch to latest Hugo version.

- Thanks to the new Hugo, retire the text_hack shortcode.
The hack is no longer needed.
This commit is contained in:
Martin Taillefer 2019-12-06 06:59:22 -08:00 committed by GitHub
parent 40ea3106c2
commit ae41b8fcdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 109 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -33,6 +33,8 @@ ifeq ($(LOCAL_ARCH),x86_64)
TARGET_ARCH ?= amd64
else ifeq ($(shell echo $(LOCAL_ARCH) | head -c 5),armv8)
TARGET_ARCH ?= arm64
else ifeq ($(LOCAL_ARCH),aarch64)
TARGET_ARCH ?= arm64
else ifeq ($(shell echo $(LOCAL_ARCH) | head -c 4),armv)
TARGET_ARCH ?= arm
else
@ -56,7 +58,7 @@ ifeq ($(BUILD_WITH_CONTAINER),1)
export TARGET_OUT = /work/out/$(TARGET_OS)_$(TARGET_ARCH)
CONTAINER_CLI ?= docker
DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
IMG ?= gcr.io/istio-testing/build-tools:2019-10-24T14-05-17
IMG ?= gcr.io/istio-testing/build-tools:master-2019-12-05T22-22-12
UID = $(shell id -u)
GID = `grep docker /etc/group | cut -f3 -d:`
PWD = $(shell pwd)
@ -81,14 +83,22 @@ $(info Using gcr credential directory $(HOME)/.config/gcloud.)
DOCKER_CREDS_MOUNT+=--mount type=bind,source="$(HOME)/.config/gcloud",destination="/config/.config/gcloud",readonly
endif
ENV_VARS:=
ifdef HUB
ENV_VARS+=-e HUB="$(HUB)"
endif
ifdef TAG
ENV_VARS+=-e TAG="$(TAG)"
endif
RUN = $(CONTAINER_CLI) run -t -i --sig-proxy=true -u $(UID):$(GID) --rm \
-e IN_BUILD_CONTAINER="$(BUILD_WITH_CONTAINER)" \
-e TZ="$(TIMEZONE)" \
-e TARGET_ARCH="$(TARGET_ARCH)" \
-e TARGET_OS="$(TARGET_OS)" \
-e TARGET_OUT="$(TARGET_OUT)" \
-e HUB="$(HUB)" \
-e TAG="$(TAG)" \
-e USER="${USER}" \
$(ENV_VARS) \
-v /etc/passwd:/etc/passwd:ro \
$(DOCKER_SOCKET_MOUNT) \
$(CONTAINER_OPTIONS) \
@ -111,7 +121,7 @@ default:
else
$(info Building with your local toolchain.)
GOBIN ?= $(GOPATH)/bin
export GOBIN ?= $(GOPATH)/bin
include Makefile.core.mk
endif

2
SUPPORT.md
View File

@ -1,6 +1,6 @@
# Support
Test of checks Here are some resources to help you understand and use Istio:
Here are some resources to help you understand and use Istio:
- For in-depth information about how to use Istio, visit [istio.io](https://istio.io)
- To ask questions and get assistance from our community, visit [discuss.istio.io](https://discuss.istio.io)

2
common/.commonfiles.sha
View File

@ -1 +1 @@
5e3f91a86f114b45d26b0f4b6ab5116a6d2f87a4
64187da83baeac0bd7413cf7dea39450c8f0ad2a

9
common/Makefile.common.mk
View File

@ -19,7 +19,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FINDFILES=find . \( -path ./common-protos -o -path ./.git -o -path ./.github \) -prune -o -type f
FINDFILES=find . \( -path ./common-protos -o -path ./.git -o -path ./.github -o -path ./licenses \) -prune -o -type f
XARGS = xargs -0 -r
lint-dockerfiles:
@ -46,6 +46,8 @@ lint-python:
lint-markdown:
@${FINDFILES} -name '*.md' -print0 | ${XARGS} mdl --ignore-front-matter --style common/config/mdl.rb
lint-links:
@${FINDFILES} -name '*.md' -print0 | ${XARGS} awesome_bot --skip-save-results --allow_ssl --allow-timeout --allow-dupe --allow-redirect --white-list ${MARKDOWN_LINT_WHITELIST}
lint-sass:
@ -85,6 +87,7 @@ dump-licenses-csv:
mirror-licenses:
@go mod download
@rm -fr licenses
@license-lint --mirror
TMP := $(shell mktemp -d -u)
@ -95,7 +98,7 @@ update-common:
@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
@cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha
@rm -fr common
@cp -rT $(TMP)/common-files/files $(shell pwd)
@cp -a $(TMP)/common-files/files/* $(shell pwd)
@rm -fr $(TMP)/common-files
update-common-protos:
@ -103,7 +106,7 @@ update-common-protos:
@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
@cd $(TMP)/common-files ; git rev-parse HEAD > common-protos/.commonfiles.sha
@rm -fr common-protos
@cp -ar $(TMP)/common-files/common-protos $(shell pwd)/common-protos
@cp -a $(TMP)/common-files/common-protos $(shell pwd)
@rm -fr $(TMP)/common-files
check-clean-repo:

2
common/config/.golangci.yml
View File

@ -39,7 +39,6 @@ linters:
- funlen
- gochecknoglobals
- gochecknoinits
- gocognit
- goconst
- gocyclo
- godox
@ -48,7 +47,6 @@ linters:
- prealloc
- scopelint
- whitespace
- wsl
fast: false
linters-settings:

5
common/config/license-lint.yml
View File

@ -71,7 +71,6 @@ whitelisted_modules:
- github.com/daviddengcn/go-colortext
- github.com/dchest/siphash
- github.com/dnaeon/go-vcr
- github.com/docker/docker
- github.com/duosecurity/duo_api_golang
- github.com/dustin/go-humanize
- github.com/facebookgo/stack
@ -92,9 +91,6 @@ whitelisted_modules:
- github.com/JeffAshton/win_pdh
- github.com/jmespath/go-jmespath
- github.com/jteeuwen/go-bindata
- github.com/juju/errors
- github.com/juju/loggo
- github.com/juju/testing
- github.com/julienschmidt/httprouter
- github.com/koneu/natend
- github.com/kr/logfmt
@ -118,7 +114,6 @@ whitelisted_modules:
- github.com/russross/blackfriday
- github.com/russross/blackfriday/v2
- github.com/sean-/seed
- github.com/signalfx/com_signalfx_metrics_protobuf
- github.com/smartystreets/assertions
- github.com/smartystreets/goconvey
- github.com/storageos/go-api

7
common/scripts/check_clean_repo.sh
View File

@ -15,7 +15,8 @@
# limitations under the License.
if [[ -n $(git status --porcelain) ]]; then
git status
echo "ERROR: Some files need to be updated, please run 'make gen' and include any changed files in your PR"
exit 1
git status
git diff
echo "ERROR: Some files need to be updated, please run 'make gen' and include any changed files in your PR"
exit 1
fi

2
common/scripts/report_build_info.sh
View File

@ -43,7 +43,7 @@ if [[ -n ${ISTIO_VERSION} ]]; then
fi
GIT_DESCRIBE_TAG=$(git describe --tags)
HUB=${HUB:-""}
HUB=${HUB:-"docker.io/istio"}
# used by common/scripts/gobuild.sh
echo "istio.io/pkg/version.buildVersion=${VERSION}"

38
config.toml
View File

@ -16,15 +16,35 @@ staticDir = ["static", "generated"]
# we use Netlify server-side redirects instead of generated aliases
disableAliases = true
# MARKDOWN
## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
[blackfriday]
plainIDAnchors = true
# See https://github.com/gohugoio/hugo/issues/2424
hrefTargetBlank = false
angledQuotes = false
latexDashes = true
extensions = [""]
[markup]
[markup.goldmark]
[markup.goldmark.extensions]
definitionList = true
footnote = true
linkify = true
strikethrough = true
table = true
taskList = true
typographer = true
[markup.goldmark.parser]
attribute = true
autoHeadingID = true
[markup.goldmark.renderer]
hardWraps = false
unsafe = true
xHTML = false
[markup.highlight]
codeFences = true
hl_Lines = ""
lineNoStart = 1
lineNos = false
lineNumbersInTable = true
noClasses = true
style = "monokai"
tabWidth = 4
[markup.tableOfContents]
endLevel = 3
startLevel = 2
[mediaTypes]
[mediaTypes."text/netlify"]

8
content/en/blog/2018/egress-mongo/index.md
View File

@ -612,7 +612,7 @@ to be 443. The egress gateway accepts the MongoDB traffic on the port 443, match
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -687,13 +687,13 @@ to be 443. The egress gateway accepts the MongoDB traffic on the port 443, match
number: $MONGODB_PORT
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -757,7 +757,7 @@ to be 443. The egress gateway accepts the MongoDB traffic on the port 443, match
number: $MONGODB_PORT
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

8
content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md
View File

@ -106,7 +106,7 @@ be done by the egress gateway, as opposed to by the sidecar in the previous exam
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -146,13 +146,13 @@ be done by the egress gateway, as opposed to by the sidecar in the previous exam
mode: ISTIO_MUTUAL
sni: edition.cnn.com
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -178,7 +178,7 @@ be done by the egress gateway, as opposed to by the sidecar in the previous exam
subsets:
- name: cnn
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

24
content/en/docs/tasks/traffic-management/egress/egress-gateway/index.md
View File

@ -122,7 +122,7 @@ First create a `ServiceEntry` to allow direct traffic to an external service.
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -162,13 +162,13 @@ First create a `ServiceEntry` to allow direct traffic to an external service.
mode: ISTIO_MUTUAL
sni: edition.cnn.com
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -194,7 +194,7 @@ First create a `ServiceEntry` to allow direct traffic to an external service.
subsets:
- name: cnn
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
@ -330,7 +330,7 @@ You need to specify port 443 with protocol `TLS` in a corresponding `ServiceEntr
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -405,13 +405,13 @@ You need to specify port 443 with protocol `TLS` in a corresponding `ServiceEntr
number: 443
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -475,7 +475,7 @@ You need to specify port 443 with protocol `TLS` in a corresponding `ServiceEntr
number: 443
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
@ -667,7 +667,7 @@ external service.
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -n test-egress -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: DestinationRule
@ -687,13 +687,13 @@ external service.
mode: ISTIO_MUTUAL
sni: edition.cnn.com
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -n test-egress -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: DestinationRule
@ -704,7 +704,7 @@ external service.
subsets:
- name: cnn
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

8
content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/index.md
View File

@ -429,7 +429,7 @@ The SNI proxy will forward the traffic to port `443`.
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -540,13 +540,13 @@ The SNI proxy will forward the traffic to port `443`.
filterType: NETWORK
filterConfig: {}
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -611,7 +611,7 @@ The SNI proxy will forward the traffic to port `443`.
number: 8443
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

4
content/en/test/tabs_and_lists/index.md
View File

@ -66,13 +66,13 @@ skip_sitemap: true
{{< tab name="Seven" category-value="seven" >}}
1. Simple text with _markdown_ in a list in a tab
{{< text_hack bash >}}
{{< text bash >}}
$ NoIndent:
FourIndent:
- EightIndent
FourIndentAgain:
- EightIndentAgain
{{< /text_hack >}}
{{< /text >}}
1. Second bullet
{{< /tab >}}

8
content/zh/blog/2018/egress-mongo/index.md
View File

@ -612,7 +612,7 @@ to be 443. The egress gateway accepts the MongoDB traffic on the port 443, match
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -687,13 +687,13 @@ to be 443. The egress gateway accepts the MongoDB traffic on the port 443, match
number: $MONGODB_PORT
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -757,7 +757,7 @@ to be 443. The egress gateway accepts the MongoDB traffic on the port 443, match
number: $MONGODB_PORT
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

8
content/zh/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md
View File

@ -98,7 +98,7 @@ aliases:
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -138,13 +138,13 @@ aliases:
mode: ISTIO_MUTUAL
sni: edition.cnn.com
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -170,7 +170,7 @@ aliases:
subsets:
- name: cnn
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

24
content/zh/docs/tasks/traffic-management/egress/egress-gateway/index.md
View File

@ -102,7 +102,7 @@ Ingress gateway 使您可以定义所有输入流量流经的网格的入口点
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -142,13 +142,13 @@ Ingress gateway 使您可以定义所有输入流量流经的网格的入口点
mode: ISTIO_MUTUAL
sni: edition.cnn.com
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -174,7 +174,7 @@ Ingress gateway 使您可以定义所有输入流量流经的网格的入口点
subsets:
- name: cnn
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
@ -305,7 +305,7 @@ $ kubectl delete destinationrule egressgateway-for-cnn
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -380,13 +380,13 @@ $ kubectl delete destinationrule egressgateway-for-cnn
number: 443
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -450,7 +450,7 @@ $ kubectl delete destinationrule egressgateway-for-cnn
number: 443
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
@ -615,7 +615,7 @@ $ kubectl delete destinationrule egressgateway-for-cnn
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -n test-egress -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: DestinationRule
@ -635,13 +635,13 @@ $ kubectl delete destinationrule egressgateway-for-cnn
mode: ISTIO_MUTUAL
sni: edition.cnn.com
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -n test-egress -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: DestinationRule
@ -652,7 +652,7 @@ $ kubectl delete destinationrule egressgateway-for-cnn
subsets:
- name: cnn
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

8
content/zh/docs/tasks/traffic-management/egress/wildcard-egress-hosts/index.md
View File

@ -392,7 +392,7 @@ SNI 代理会将流量转发到 `443` 端口。
{{< tab name="mutual TLS enabled" category-value="enabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -498,13 +498,13 @@ SNI 代理会将流量转发到 `443` 端口。
filterType: NETWORK
filterConfig: {}
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}
{{< tab name="mutual TLS disabled" category-value="disabled" >}}
{{< text_hack bash >}}
{{< text bash >}}
$ kubectl apply -f - <<EOF
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
@ -569,7 +569,7 @@ SNI 代理会将流量转发到 `443` 端口。
number: 8443
weight: 100
EOF
{{< /text_hack >}}
{{< /text >}}
{{< /tab >}}

4
content/zh/test/tabs_and_lists/index.md
View File

@ -66,13 +66,13 @@ skip_sitemap: true
{{< tab name="Seven" category-value="seven" >}}
1. Simple text with _markdown_ in a list in a tab
{{< text_hack bash >}}
{{< text bash >}}
$ NoIndent:
FourIndent:
- EightIndent
FourIndentAgain:
- EightIndentAgain
{{< /text_hack >}}
{{< /text >}}
1. Second bullet
{{< /tab >}}

21
layouts/shortcodes/text_hack.html
View File

@ -1,21 +0,0 @@
{{- /* Inserts a text block into the HTML. See https://preliminary.istio.io/about/contribute/creating-and-editing-pages/#embedding-preformatted-blocks for details
This is a special simplified version of the normal text shortcode that doesn't support any features and is designed to work around a bug in Hugo
that occurs when using a text block inside a tab inside a list. This bug causes indent to be off in that case for certain lines in the text block.
This hack works around that problem.
*/ -}}
{{- $syntax := .Get "syntax" | default (.Get 0) -}}
{{- if not $syntax -}}
{{- errorf "Text block does not specify a syntax (%s)" .Position -}}
{{- $syntax = "plain" -}}
{{- end -}}
{{- if eq $syntax "bash" -}}
{{- if not (hasPrefix (trim .Inner "\n ") "$") -}}
{{- errorf "Text block specifies a bash syntax, but the first line of the block does not start with $ (%s)" .Position -}}
{{- end -}}
{{- end -}}
```{{ printf "%s" $syntax -}}
{{- .Inner -}}
```

2
netlify.toml
View File

@ -2,6 +2,6 @@
publish = "public"
[build.environment]
HUGO_VERSION = "0.59.1"
HUGO_VERSION = "0.60.1"
NODE_VERSION = "12.8.0"
BUILD_WITH_CONTAINER = "0"