mirror of https://github.com/istio/istio.io.git
Preare istio.io for 1.20 as other repos have branched. (#14025)
This commit is contained in:
Eric Van Norman
GitHub
parent
f1f7489f49
commit
a8ccc83d83
|
|
@ -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.20
|
||||
|
||||
site:
|
||||
@scripts/gen_site.sh
|
||||
|
|
|
|||
|
|
@ -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.20/samples/bookinfo/src/mysql/mysqldb-init.sql
|
||||
mysql -u root -ppassword < mysqldb-init.sql
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ killall istioctl
|
|||
}
|
||||
|
||||
snip_cleanup_2() {
|
||||
kubectl delete -f https://raw.githubusercontent.com/istio/istio/master/samples/addons/jaeger.yaml
|
||||
kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.20/samples/addons/jaeger.yaml
|
||||
}
|
||||
|
||||
snip_cleanup_3() {
|
||||
|
|
|
|||
|
|
@ -298,7 +298,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.20/security/tools/jwt/samples/jwks.json"
|
||||
EOF
|
||||
}
|
||||
|
||||
|
|
@ -315,7 +315,7 @@ spec:
|
|||
istio.io/gateway-name: httpbin-gateway
|
||||
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.20/security/tools/jwt/samples/jwks.json"
|
||||
EOF
|
||||
}
|
||||
|
||||
|
|
@ -336,7 +336,7 @@ curl --header "Authorization: Bearer deadbeef" "$INGRESS_HOST:$INGRESS_PORT/head
|
|||
ENDSNIP
|
||||
|
||||
snip_enduser_authentication_9() {
|
||||
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.20/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"
|
||||
}
|
||||
|
||||
|
|
@ -345,11 +345,11 @@ curl --header "Authorization: Bearer $TOKEN" "$INGRESS_HOST:$INGRESS_PORT/header
|
|||
ENDSNIP
|
||||
|
||||
snip_enduser_authentication_10() {
|
||||
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.20/security/tools/jwt/samples/gen-jwt.py
|
||||
}
|
||||
|
||||
snip_enduser_authentication_11() {
|
||||
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.20/security/tools/jwt/samples/key.pem
|
||||
}
|
||||
|
||||
snip_enduser_authentication_12() {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,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.20/security/tools/jwt/samples/jwks.json"
|
||||
outputClaimToHeaders:
|
||||
- header: "x-jwt-claim-foo"
|
||||
claim: "foo"
|
||||
|
|
@ -64,7 +64,7 @@ kubectl exec "$(kubectl get pod -l app=sleep -n foo -o jsonpath={.items..metadat
|
|||
ENDSNIP
|
||||
|
||||
snip_allow_requests_with_valid_jwt_and_listtyped_claims_3() {
|
||||
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.20/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_3_out <<\ENDSNIP
|
||||
|
|
|
|||
|
|
@ -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.20/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.20/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.20/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
|
||||
|
|
|
|||
|
|
@ -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.20/samples/extauthz/ext-authz.yaml
|
||||
}
|
||||
|
||||
! read -r -d '' snip_deploy_the_external_authorizer_1_out <<\ENDSNIP
|
||||
|
|
|
|||
|
|
@ -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.20/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.20/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.20/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
|
||||
|
|
|
|||
|
|
@ -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.20
|
||||
doc_branch_name: master
|
||||
|
||||
####### Static values
|
||||
|
|
|
|||
8
go.mod
8
go.mod
|
|
@ -11,7 +11,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
|
|||
require (
|
||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
|
||||
golang.org/x/sync v0.3.0
|
||||
istio.io/istio v0.0.0-20231014140635-071fc10d4b23
|
||||
istio.io/istio v0.0.0-20231019131809-e9979e03c44c
|
||||
k8s.io/apimachinery v0.28.2
|
||||
k8s.io/client-go v0.28.2
|
||||
)
|
||||
|
|
@ -45,7 +45,7 @@ require (
|
|||
github.com/docker/docker v24.0.4+incompatible // indirect
|
||||
github.com/docker/docker-credential-helpers v0.7.0 // indirect
|
||||
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
|
||||
github.com/envoyproxy/go-control-plane v0.11.2-0.20231012203354-9454891c1279 // indirect
|
||||
github.com/envoyproxy/go-control-plane v0.11.2-0.20231017012829-64509a050b5c // indirect
|
||||
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
|
||||
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
|
||||
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
|
||||
|
|
@ -195,8 +195,8 @@ require (
|
|||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
helm.sh/helm/v3 v3.12.3 // indirect
|
||||
istio.io/api v1.19.0-alpha.1.0.20231005164637-4881de7246ff // indirect
|
||||
istio.io/client-go v1.19.0-alpha.1.0.20231005165138-e8a971be23eb // indirect
|
||||
istio.io/api v1.19.0-alpha.1.0.20231019025540-9340af219d4b // indirect
|
||||
istio.io/client-go v1.19.0-alpha.1.0.20231019030527-3c0f6688b4b1 // indirect
|
||||
k8s.io/api v0.28.2 // indirect
|
||||
k8s.io/apiextensions-apiserver v0.28.2 // indirect
|
||||
k8s.io/apiserver v0.28.2 // indirect
|
||||
|
|
|
|||
16
go.sum
16
go.sum
|
|
@ -176,8 +176,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
|
|||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
|
||||
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
|
||||
github.com/envoyproxy/go-control-plane v0.11.2-0.20231012203354-9454891c1279 h1:A8zqdq95fKFEnYUMcSa8C51ZbUUHuva7G9NI0ZX4O/Q=
|
||||
github.com/envoyproxy/go-control-plane v0.11.2-0.20231012203354-9454891c1279/go.mod h1:WXpbIuS9YKCA16EZOAqUsYfvGf1ghGg9oQHQh7bvTQ0=
|
||||
github.com/envoyproxy/go-control-plane v0.11.2-0.20231017012829-64509a050b5c h1:DdXtAZXawz1MMkTdhgwpGwY3JdiJfA3qqtzjISrjx8E=
|
||||
github.com/envoyproxy/go-control-plane v0.11.2-0.20231017012829-64509a050b5c/go.mod h1:3X10o7QcAVxP4y/hnTLgkXLwuZV2DxAEh6uaYD5PoxI=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
|
||||
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
|
||||
|
|
@ -1217,12 +1217,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
|
|||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
istio.io/api v1.19.0-alpha.1.0.20231005164637-4881de7246ff h1:D7RWLJ045Bb6MryDt2HTCWG22YXRAYR3hfdcvoZwH84=
|
||||
istio.io/api v1.19.0-alpha.1.0.20231005164637-4881de7246ff/go.mod h1:hFqNwCBpXIy5jboW4geFoz3io9ZR3nVJ4oLI7udf6Vo=
|
||||
istio.io/client-go v1.19.0-alpha.1.0.20231005165138-e8a971be23eb h1:EtrpYxQrejldv0s40Aawskb8uQHHwMBwaNYaPGysG2Q=
|
||||
istio.io/client-go v1.19.0-alpha.1.0.20231005165138-e8a971be23eb/go.mod h1:NpSpbrMKVT2N1k54mdix1iPEHBiWGq6/+cA21jWZ2XA=
|
||||
istio.io/istio v0.0.0-20231014140635-071fc10d4b23 h1:0ViqF0xEPryrqpUAzjAEv3R1SqklUA4PfONEpZiI7ZA=
|
||||
istio.io/istio v0.0.0-20231014140635-071fc10d4b23/go.mod h1:RwVtFS1LzBQPE36HP2qfiTSJWAM1bnb9kMU9wB1N3lo=
|
||||
istio.io/api v1.19.0-alpha.1.0.20231019025540-9340af219d4b h1:JiOxxGu/4rHpVMA4RuYRQTemwhxQKh0RzZLup0drz9U=
|
||||
istio.io/api v1.19.0-alpha.1.0.20231019025540-9340af219d4b/go.mod h1:hm1PE/mGdIAsjCDkTIAplP53H7TjO5LUQCiVvF26SVg=
|
||||
istio.io/client-go v1.19.0-alpha.1.0.20231019030527-3c0f6688b4b1 h1:+/xOXh6aH/qYT5KFCobQwbjOeYvK2uchn/MkJzztGBc=
|
||||
istio.io/client-go v1.19.0-alpha.1.0.20231019030527-3c0f6688b4b1/go.mod h1:yTrdpjCbP+FErlMErRxvvgj2PmUjA4/dEXD+AurRb74=
|
||||
istio.io/istio v0.0.0-20231019131809-e9979e03c44c h1:TkZb2ordlb/iTnRKK9x0um4ZXbZ0Q3gXnNrwOMmVkPk=
|
||||
istio.io/istio v0.0.0-20231019131809-e9979e03c44c/go.mod h1:k5guVRqC/JKrCYUjrBzDmP24cXuzAfh7C5ifhstxfg4=
|
||||
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
|
||||
k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=
|
||||
k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw=
|
||||
|
|
|
|||
Loading…
Reference in New Issue