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

Prepare for version 1.14 as istio source is already branched (#11212) 

* Prepare for version 1.14 as istio source is already branched

* Missed make gen
This commit is contained in:
Eric Van Norman 2022-04-25 12:24:04 -05:00 committed by GitHub
parent c3505dd37d
commit 84c40da017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.core.mk
View File

@ -77,7 +77,7 @@ baseurl := "$(URL)"
endif
# Which branch of the Istio source code do we fetch stuff from
export SOURCE_BRANCH_NAME ?= master
export SOURCE_BRANCH_NAME ?= release-1.14
site:
@scripts/gen_site.sh

2
content/en/docs/examples/virtual-machines/snips.sh
View File

@ -39,7 +39,7 @@ sudo systemctl restart mysql
}
snip_running_mysql_on_the_vm_3() {
curl -LO https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/src/mysql/mysqldb-init.sql
curl -LO https://raw.githubusercontent.com/istio/istio/release-1.14/samples/bookinfo/src/mysql/mysqldb-init.sql
mysql -u root -ppassword < mysqldb-init.sql
}

8
content/en/docs/tasks/security/authentication/authn-policy/snips.sh
View File

@ -324,7 +324,7 @@ spec:
istio: ingressgateway
jwtRules:
- issuer: "testing@secure.istio.io"
jwksUri: "https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/jwks.json"
jwksUri: "https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/jwks.json"
EOF
}
@ -345,7 +345,7 @@ curl --header "Authorization: Bearer deadbeef" "$INGRESS_HOST:$INGRESS_PORT/head
ENDSNIP
snip_enduser_authentication_7() {
TOKEN=$(curl https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/demo.jwt -s)
TOKEN=$(curl https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/demo.jwt -s)
curl --header "Authorization: Bearer $TOKEN" "$INGRESS_HOST:$INGRESS_PORT/headers" -s -o /dev/null -w "%{http_code}\n"
}
@ -354,11 +354,11 @@ curl --header "Authorization: Bearer $TOKEN" "$INGRESS_HOST:$INGRESS_PORT/header
ENDSNIP
snip_enduser_authentication_8() {
wget --no-verbose https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/gen-jwt.py
wget --no-verbose https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/gen-jwt.py
}
snip_enduser_authentication_9() {
wget --no-verbose https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/key.pem
wget --no-verbose https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/key.pem
}
snip_enduser_authentication_10() {

6
content/en/docs/tasks/security/authentication/jwt-route/snips.sh
View File

@ -47,7 +47,7 @@ spec:
istio: ingressgateway
jwtRules:
- issuer: "testing@secure.istio.io"
jwksUri: "https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/jwks.json"
jwksUri: "https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/jwks.json"
EOF
}
@ -97,7 +97,7 @@ HTTP/1.1 401 Unauthorized
ENDSNIP
snip_validating_ingress_routing_based_on_jwt_claims_3() {
TOKEN_GROUP=$(curl https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/groups-scope.jwt -s) && echo "$TOKEN_GROUP" | cut -d '.' -f2 - | base64 --decode -
TOKEN_GROUP=$(curl https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/groups-scope.jwt -s) && echo "$TOKEN_GROUP" | cut -d '.' -f2 - | base64 --decode -
}
! read -r -d '' snip_validating_ingress_routing_based_on_jwt_claims_3_out <<\ENDSNIP
@ -114,7 +114,7 @@ HTTP/1.1 200 OK
ENDSNIP
snip_validating_ingress_routing_based_on_jwt_claims_5() {
TOKEN_NO_GROUP=$(curl https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/demo.jwt -s) && echo "$TOKEN_NO_GROUP" | cut -d '.' -f2 - | base64 --decode -
TOKEN_NO_GROUP=$(curl https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/demo.jwt -s) && echo "$TOKEN_NO_GROUP" | cut -d '.' -f2 - | base64 --decode -
}
! read -r -d '' snip_validating_ingress_routing_based_on_jwt_claims_5_out <<\ENDSNIP

2
content/en/docs/tasks/security/authorization/authz-custom/snips.sh
View File

@ -36,7 +36,7 @@ kubectl exec "$(kubectl get pod -l app=sleep -n foo -o jsonpath={.items..metadat
ENDSNIP
snip_deploy_the_external_authorizer_1() {
kubectl apply -n foo -f https://raw.githubusercontent.com/istio/istio/master/samples/extauthz/ext-authz.yaml
kubectl apply -n foo -f https://raw.githubusercontent.com/istio/istio/release-1.14/samples/extauthz/ext-authz.yaml
}
! read -r -d '' snip_deploy_the_external_authorizer_1_out <<\ENDSNIP

6
content/en/docs/tasks/security/authorization/authz-jwt/snips.sh
View File

@ -47,7 +47,7 @@ spec:
app: httpbin
jwtRules:
- issuer: "testing@secure.istio.io"
jwksUri: "https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/jwks.json"
jwksUri: "https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/jwks.json"
EOF
}
@ -87,7 +87,7 @@ EOF
}
snip_allow_requests_with_valid_jwt_and_listtyped_claims_5() {
TOKEN=$(curl https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/demo.jwt -s) && echo "$TOKEN" | cut -d '.' -f2 - | base64 --decode -
TOKEN=$(curl https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/demo.jwt -s) && echo "$TOKEN" | cut -d '.' -f2 - | base64 --decode -
}
! read -r -d '' snip_allow_requests_with_valid_jwt_and_listtyped_claims_5_out <<\ENDSNIP
@ -133,7 +133,7 @@ EOF
}
snip_allow_requests_with_valid_jwt_and_listtyped_claims_9() {
TOKEN_GROUP=$(curl https://raw.githubusercontent.com/istio/istio/master/security/tools/jwt/samples/groups-scope.jwt -s) && echo "$TOKEN_GROUP" | cut -d '.' -f2 - | base64 --decode -
TOKEN_GROUP=$(curl https://raw.githubusercontent.com/istio/istio/release-1.14/security/tools/jwt/samples/groups-scope.jwt -s) && echo "$TOKEN_GROUP" | cut -d '.' -f2 - | base64 --decode -
}
! read -r -d '' snip_allow_requests_with_valid_jwt_and_listtyped_claims_9_out <<\ENDSNIP

2
data/args.yml
View File

@ -25,7 +25,7 @@ archive_date: YYYY-MM-DD
archive_search_refinement: "V1.1"
# GitHub branch names used when the docs have links to GitHub
source_branch_name: master
source_branch_name: release-1.14
doc_branch_name: master
# The list of supported versions described by the docs

10
go.mod
View File

@ -11,8 +11,8 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
require (
github.com/golang/sync v0.0.0-20180314180146-1d60e4601c6f
github.com/pmezard/go-difflib v1.0.0
istio.io/istio v0.0.0-20220415183222-f611f67505bb
istio.io/pkg v0.0.0-20220412163443-dc80e140671f
istio.io/istio v0.0.0-20220422041049-12fb9e24ccdb
istio.io/pkg v0.0.0-20220422005710-7533399e2655
k8s.io/apimachinery v0.23.5
k8s.io/client-go v0.23.5
)
@ -55,7 +55,7 @@ require (
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.12+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
github.com/envoyproxy/go-control-plane v0.10.2-0.20220413133113-27659a1a988e // indirect
github.com/envoyproxy/go-control-plane v0.10.2-0.20220420171917-689c2bccf0ec // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
@ -204,8 +204,8 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
helm.sh/helm/v3 v3.8.2 // indirect
istio.io/api v0.0.0-20220415145822-bfb8bb7bb3e2 // indirect
istio.io/client-go v1.12.0-alpha.5.0.20220415150322-7090720d58d2 // indirect
istio.io/api v0.0.0-20220422011810-465708df178f // indirect
istio.io/client-go v1.12.0-alpha.5.0.20220422012510-1d3e4957aaa0 // indirect
k8s.io/api v0.23.5 // indirect
k8s.io/apiextensions-apiserver v0.23.5 // indirect
k8s.io/cli-runtime v0.23.5 // indirect

20
go.sum
View File

@ -623,8 +623,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220413133113-27659a1a988e h1:c/zqqQmO937rp44iyAxYFP+oDYB5UxSxO3c0nqfYR/Y=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220413133113-27659a1a988e/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220420171917-689c2bccf0ec h1:np2MDgE07uAw/Z/0N5bPLVRzlPd8aAHng6cNKQUhxu0=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220420171917-689c2bccf0ec/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
@ -2904,14 +2904,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
istio.io/api v0.0.0-20220415145822-bfb8bb7bb3e2 h1:btBgL+puKso9+uDm66i3nfPIFlAOjhxwh0T6H1LTkHs=
istio.io/api v0.0.0-20220415145822-bfb8bb7bb3e2/go.mod h1:qGm6l1okCpLqVKyXSfYjB+UXXgpE/LCggALuK25cSFY=
istio.io/client-go v1.12.0-alpha.5.0.20220415150322-7090720d58d2 h1:H2/7BQvWKRur8EaBWjAGCzEBqykG25ehsLjZHjPuQtM=
istio.io/client-go v1.12.0-alpha.5.0.20220415150322-7090720d58d2/go.mod h1:gt/HP9Y9njq88P+fl1Sfy3b1mTjsuPeaEz0R1VLugJI=
istio.io/istio v0.0.0-20220415183222-f611f67505bb h1:EgQbWyt6X38sFd0YpnO3BietefNLFuI5xiE7dM3oWNc=
istio.io/istio v0.0.0-20220415183222-f611f67505bb/go.mod h1:5ejQMK9sEvZCHdcQprkDpLxbVwIxEkUlfPpDhOGGlFo=
istio.io/pkg v0.0.0-20220412163443-dc80e140671f h1:OoXO/LuJ8FwwoCzkutgIsSbSSStcKi2279clFN7h0SI=
istio.io/pkg v0.0.0-20220412163443-dc80e140671f/go.mod h1:kcBYN5TiyGFM2bs4b7K81j+YeDZ4JrINP+brV9ehZe0=
istio.io/api v0.0.0-20220422011810-465708df178f h1:KAZIX1X+0k5QfEc/Akf8FqA2dBHoETZc0RGB/84uixQ=
istio.io/api v0.0.0-20220422011810-465708df178f/go.mod h1:qGm6l1okCpLqVKyXSfYjB+UXXgpE/LCggALuK25cSFY=
istio.io/client-go v1.12.0-alpha.5.0.20220422012510-1d3e4957aaa0 h1:TJBflqTqsnveXWUN541o282uKpzvoGrw4B9P5ytTQcs=
istio.io/client-go v1.12.0-alpha.5.0.20220422012510-1d3e4957aaa0/go.mod h1:3D6uJeFdXVrLmBeRrR7T2iR2mv/bAH2BVtXflWA/07c=
istio.io/istio v0.0.0-20220422041049-12fb9e24ccdb h1:VlrmWBLwXQlHiPuFtehNBc4WFVIBI4wwBFbuo83kyDg=
istio.io/istio v0.0.0-20220422041049-12fb9e24ccdb/go.mod h1:YOVC/moVNyCuQzl74rYjixOW/FUfi+YnMrJlzM5/6ic=
istio.io/pkg v0.0.0-20220422005710-7533399e2655 h1:Phikti+a0oa03NA2ZYJkCV9dHUpLeuKMv5loxdFhfZw=
istio.io/pkg v0.0.0-20220422005710-7533399e2655/go.mod h1:kcBYN5TiyGFM2bs4b7K81j+YeDZ4JrINP+brV9ehZe0=
k8s.io/api v0.0.0-20180904230853-4e7be11eab3f/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=