diff --git a/Makefile.core.mk b/Makefile.core.mk index 9e2eba9723..48879dcb7d 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -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.13 site: @scripts/gen_site.sh diff --git a/content/en/docs/examples/virtual-machines/snips.sh b/content/en/docs/examples/virtual-machines/snips.sh index e444425bf6..2801954597 100644 --- a/content/en/docs/examples/virtual-machines/snips.sh +++ b/content/en/docs/examples/virtual-machines/snips.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.13/samples/bookinfo/src/mysql/mysqldb-init.sql mysql -u root -ppassword < mysqldb-init.sql } diff --git a/content/en/docs/examples/virtual-machines/test.sh b/content/en/docs/examples/virtual-machines/test_skip_10808.sh similarity index 100% rename from content/en/docs/examples/virtual-machines/test.sh rename to content/en/docs/examples/virtual-machines/test_skip_10808.sh diff --git a/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html b/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html index 033834f66e..5b725e8c9c 100644 --- a/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html +++ b/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html @@ -7,7 +7,7 @@ location: https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html layout: protoc-gen-docs generator: protoc-gen-docs weight: 20 -number_of_entries: 54 +number_of_entries: 51 ---

Configuration affecting the service mesh as a whole.

@@ -1122,17 +1122,6 @@ No

Configures an Envoy Access Logging Service provider for TCP traffic.

- - -No - - - -envoyOtelAls -EnvoyOpenTelemetryLogProvider (oneof) - -

Configures an Envoy Open Telemetry Access Logging Service provider.

- No @@ -2161,75 +2150,6 @@ No

Optional. Additional filter state objects to log.

- - -No - - - - - -

MeshConfig.ExtensionProvider.EnvoyOpenTelemetryLogProvider

-
-

Defines configuration for an Envoy OpenTelemetry (gRPC) Access Log

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FieldTypeDescriptionRequired
servicestring -

REQUIRED. Specifies the service that implements the Envoy ALS gRPC authorization service. -The format is [<Namespace>/]<Hostname>. The specification of <Namespace> is required only when it is insufficient -to unambiguously resolve a service in the service registry. The <Hostname> is a fully qualified host name of a -service defined by the Kubernetes service or ServiceEntry.

- -

Example: “envoy-als.foo.svc.cluster.local” or “bar/envoy-als.example.com”.

- -		 -No -
portuint32 -

REQUIRED. Specifies the port of the service.

- -		 -No -
logNamestring -

Optional. The friendly name of the access log. -Defaults: -- “otelenvoyaccesslog”

- -		 -No -
logFormatLogFormat -

Optional. Format for the proxy access log -Empty value results in proxy’s default access log format, following Envoy access logging formatting.

- 		No @@ -2317,60 +2237,6 @@ supported for some command operators (e.g. FILTERSTATE or DYNAMICMETADA message: "%LOCAL_REPLY_BODY%" - -No -
-
-

MeshConfig.ExtensionProvider.EnvoyOpenTelemetryLogProvider.LogFormat

-
- - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - -
FieldTypeDescriptionRequired
textstring -

Textual format for the envoy access logs. Envoy command operators may be -used in the format. The format string documentation -provides more information. -Alias to body filed in Open Telemetry -Example: text: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%"

- -		 -No -
labelsStruct -

Optional. Additional attributes that describe the specific event occurrence. -Structured format for the envoy access logs. Envoy command operators -can be used as values for fields within the Struct. Values are rendered -as strings, numbers, or boolean values, as appropriate -(see: format dictionaries). Nested JSON is -supported for some command operators (e.g. FILTERSTATE or DYNAMICMETADATA). -Alias to attributes filed in Open Telemetry

- -

Example:

- -
labels:
-  status: "%RESPONSE_CODE%"
-  message: "%LOCAL_REPLY_BODY%"
-
- 		No @@ -2620,9 +2486,9 @@ No No
serviceClusterstring (oneof)string

Service cluster defines the name for the service_cluster that is shared by all Envoy instances. This setting corresponds to @@ -2638,18 +2504,6 @@ receives API calls from Envoy, it uses the value of the service-node -

 -No -
tracingServiceNameTracingServiceName (oneof) -

Used by Envoy proxies to assign the values for the service names in trace -spans.

- 		No @@ -3806,45 +3660,6 @@ See the B3 header propagation README for details.

-
-
-

ProxyConfig.TracingServiceName

-
-

Allows specification of various Istio-supported naming schemes for the -Envoy service_cluster value. The servce_cluster value is primarily used -by Envoys to provide service names for tracing spans.

- - - - - - - - - - - - - - - - - - - - diff --git a/content/en/docs/setup/install/virtual-machine/common.sh b/content/en/docs/setup/install/virtual-machine/common.sh index 6120e2105a..f42620aa99 100644 --- a/content/en/docs/setup/install/virtual-machine/common.sh +++ b/content/en/docs/setup/install/virtual-machine/common.sh @@ -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:1.11-dev.6 + gcr.io/istio-release/base:master-2022-01-14T19-01-09 POD_CIDR=$(kubectl get node -ojsonpath='{.items[0].spec.podCIDR}') DOCKER_IP=$(docker inspect -f "{{ .NetworkSettings.Networks.kind.IPAddress }}" istio-testing-control-plane) diff --git a/content/en/docs/setup/install/virtual-machine/test.sh b/content/en/docs/setup/install/virtual-machine/test_skip_10808.sh similarity index 100% rename from content/en/docs/setup/install/virtual-machine/test.sh rename to content/en/docs/setup/install/virtual-machine/test_skip_10808.sh diff --git a/content/en/docs/tasks/security/authentication/authn-policy/snips.sh b/content/en/docs/tasks/security/authentication/authn-policy/snips.sh index bc2fe1f8f5..341ef65d01 100644 --- a/content/en/docs/tasks/security/authentication/authn-policy/snips.sh +++ b/content/en/docs/tasks/security/authentication/authn-policy/snips.sh @@ -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.13/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.13/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.13/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.13/security/tools/jwt/samples/key.pem } snip_enduser_authentication_10() { diff --git a/content/en/docs/tasks/security/authentication/jwt-route/snips.sh b/content/en/docs/tasks/security/authentication/jwt-route/snips.sh index a2ae5945e8..ec0f7eb90d 100644 --- a/content/en/docs/tasks/security/authentication/jwt-route/snips.sh +++ b/content/en/docs/tasks/security/authentication/jwt-route/snips.sh @@ -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.13/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.13/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.13/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 diff --git a/content/en/docs/tasks/security/authorization/authz-custom/snips.sh b/content/en/docs/tasks/security/authorization/authz-custom/snips.sh index 7387fae520..d36e8a18bf 100644 --- a/content/en/docs/tasks/security/authorization/authz-custom/snips.sh +++ b/content/en/docs/tasks/security/authorization/authz-custom/snips.sh @@ -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.13/samples/extauthz/ext-authz.yaml } ! read -r -d '' snip_deploy_the_external_authorizer_1_out <<\ENDSNIP diff --git a/content/en/docs/tasks/security/authorization/authz-jwt/snips.sh b/content/en/docs/tasks/security/authorization/authz-jwt/snips.sh index 084811319b..6d03ec89b4 100644 --- a/content/en/docs/tasks/security/authorization/authz-jwt/snips.sh +++ b/content/en/docs/tasks/security/authorization/authz-jwt/snips.sh @@ -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.13/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.13/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.13/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 diff --git a/data/args.yml b/data/args.yml index 981666982c..5b5b1cb317 100644 --- a/data/args.yml +++ b/data/args.yml @@ -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.13 doc_branch_name: master # The list of supported versions described by the docs diff --git a/go.mod b/go.mod index 136a3efde4..f9c13b7c7e 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,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-20220115102835-994621ac3efb - istio.io/pkg v0.0.0-20220110182003-89d2d53e36e1 + istio.io/istio v0.0.0-20220121083041-a34edcb29fd9 + istio.io/pkg v0.0.0-20220120222739-ac55e99349dc k8s.io/apimachinery v0.23.1 k8s.io/client-go v0.23.1 ) diff --git a/go.sum b/go.sum index 5ce3a7c905..44194c6adc 100644 --- a/go.sum +++ b/go.sum @@ -182,8 +182,8 @@ github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:o github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.42.32 h1:YRe7du5KeSa2jHKEccOSL6/1fNM1Qaj0JqSGTdmtaws= -github.com/aws/aws-sdk-go v1.42.32/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= +github.com/aws/aws-sdk-go v1.42.35 h1:N4N9buNs4YlosI9N0+WYrq8cIZwdgv34yRbxzZlTvFs= +github.com/aws/aws-sdk-go v1.42.35/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -564,8 +564,8 @@ github.com/gobuffalo/packd v1.0.0/go.mod h1:6VTc4htmJRFB7u1m/4LeMTWjFoYrUiBkU9Fd github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-json v0.8.1 h1:4/Wjm0JIJaTDm8K1KcGrLHJoa8EsJ13YWeX+6Kfq6uI= -github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.9.1 h1:xurvfvj3gq6SWUkkZ0opoUDTms7jif41uZ9z9s+hVlY= +github.com/goccy/go-json v0.9.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -830,8 +830,8 @@ github.com/lestrrat-go/httpcc v1.0.0 h1:FszVC6cKfDvBKcJv646+lkh4GydQg2Z29scgUfkO github.com/lestrrat-go/httpcc v1.0.0/go.mod h1:tGS/u00Vh5N6FHNkExqGGNId8e0Big+++0Gf8MBnAvE= github.com/lestrrat-go/iter v1.0.1 h1:q8faalr2dY6o8bV45uwrxq12bRa1ezKrB6oM9FUgN4A= github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc= -github.com/lestrrat-go/jwx v1.2.14 h1:69OeaiFKCTn8xDmBGzHTgv/GBoO1LJcXw99GfYCDKzg= -github.com/lestrrat-go/jwx v1.2.14/go.mod h1:3Q3Re8TaOcVTdpx4Tvz++OWmryDklihTDqrrwQiyS2A= +github.com/lestrrat-go/jwx v1.2.17 h1:e6IWTrTu4pI7B8wa9TfAY17Ra9o5ymZ95L5tAjWtfF8= +github.com/lestrrat-go/jwx v1.2.17/go.mod h1:UxIzTZAhlHvgx83iJpnm24r5luD7zlFrtHVbG7Qs9DU= github.com/lestrrat-go/option v1.0.0 h1:WqAWL8kh8VcSoD6xjSH34/1m8yxluXQbDeKNfvFeEO4= github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -839,8 +839,8 @@ github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= -github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= -github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= +github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc= +github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -865,6 +865,8 @@ github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2i github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= +github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM= +github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -1485,8 +1487,8 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211111160137-58aab5ef257a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220111093109-d55c255bac03 h1:0FB83qp0AzVJm+0wcIlauAjJ+tNdh7jLuacRYCIVv7s= -golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1643,8 +1645,8 @@ golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1881,8 +1883,8 @@ google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220111164026-67b88f271998 h1:g/x+MYjJYDEP3OBCYYmwIbt4x6k3gryb+ohyOR7PXfI= -google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= +google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= @@ -1994,16 +1996,17 @@ 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 v0.0.0-20220113014359-2bcfbc334255 h1:yTpCWv+OYoU2cBB0zr37xG6nL4IYe1soAIRMzK/D+XE= istio.io/api v0.0.0-20220113014359-2bcfbc334255/go.mod h1:RVwW5wv5bZYrmHvhYtyp0EQvM2VN3Gw4tLpUrynDCH0= +istio.io/api v0.0.0-20220121025919-208b21e16a93 h1:zwqlAAAHnO2bxsfNyoZVqlkhpiJZTGs7TFitDCQ0oBw= +istio.io/api v0.0.0-20220121025919-208b21e16a93/go.mod h1:RVwW5wv5bZYrmHvhYtyp0EQvM2VN3Gw4tLpUrynDCH0= istio.io/client-go v1.12.0-alpha.5.0.20220113014857-3b7795784525 h1:8/meYcL2uIKcopQZlVEiqZam8VDCNp9f+tD7IDPesxk= istio.io/client-go v1.12.0-alpha.5.0.20220113014857-3b7795784525/go.mod h1:jCiz6CWAxq0NSfl0K5T07zPwF1lztXR6BEPgXBQDX5s= istio.io/gogo-genproto v0.0.0-20211208193508-5ab4acc9eb1e h1:z2WI3y55w0K3c6hmarcp5EcOiP4vVpTBXA8nYstP+cE= istio.io/gogo-genproto v0.0.0-20211208193508-5ab4acc9eb1e/go.mod h1:vJDAniIqryf/z///fgZqVPKJ7N2lBk7Gg8DCTB7oCfU= -istio.io/istio v0.0.0-20220115102835-994621ac3efb h1:SW3YbUJ2HC9X5j6BfjcHXTbKl/Gztwf42UdLZNpfFYs= -istio.io/istio v0.0.0-20220115102835-994621ac3efb/go.mod h1:WS5IoQtMPe8goVNocLN2oaQYtPjqKrcVzRvBLoYhB6k= -istio.io/pkg v0.0.0-20220110182003-89d2d53e36e1 h1:weT3EbBS4nFZDhlB4JwOuAXgwxYVWSBCkKUoejzbxlE= -istio.io/pkg v0.0.0-20220110182003-89d2d53e36e1/go.mod h1:i95AmfHLCp5JThoiCGCyzZ6bOHJk5fD+BicBvGDr9Xg= +istio.io/istio v0.0.0-20220121083041-a34edcb29fd9 h1:+nyCStetYppy5VS783EtBubPKQ+n3PDiWLaIXTCghcA= +istio.io/istio v0.0.0-20220121083041-a34edcb29fd9/go.mod h1:dJOH9hafvNfSPdU+13GOMZIIh6qKX9e/DOdOq6LZTRQ= +istio.io/pkg v0.0.0-20220120222739-ac55e99349dc h1:Q/UN5kwcEo8SWm6D15yAaGY2k0xITxnH7OveOpre75I= +istio.io/pkg v0.0.0-20220120222739-ac55e99349dc/go.mod h1:i95AmfHLCp5JThoiCGCyzZ6bOHJk5fD+BicBvGDr9Xg= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA= k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= @@ -2109,8 +2112,8 @@ k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iL k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/kube-openapi v0.0.0-20220112074636-c1fc1de9c3c8 h1:yD3NGETQgUc1nFIFwPPYE5VtCxQjR+23Lqt2E92wLo4= -k8s.io/kube-openapi v0.0.0-20220112074636-c1fc1de9c3c8/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/kube-openapi v0.0.0-20220114203427-a0453230fd26 h1:2G24ndYyfk0l23ZrGutxb0s9TRe4m1ZjFlcu4cEU1zA= +k8s.io/kube-openapi v0.0.0-20220114203427-a0453230fd26/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kubectl v0.22.4/go.mod h1:ok2qRT6y2Gy4+y+mniJVyUMKeBHP4OWS9Rdtf/QTM5I= k8s.io/kubectl v0.23.1 h1:gmscOiV4Y4XIRIn14gQBBADoyyVrDZPbxRCTDga4RSA= k8s.io/kubectl v0.23.1/go.mod h1:Ui7dJKdUludF8yWAOSN7JZEkOuYixX5yF6E6NjoukKE= diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh index aadf2f8880..6018c70f67 100755 --- a/scripts/prepare_release.sh +++ b/scripts/prepare_release.sh @@ -25,7 +25,7 @@ git checkout "${MASTER}" git pull --ff-only "${ISTIOIO_GIT_SOURCE}" "${MASTER}" sed -i "s/^source_branch_name: .*$/source_branch_name: release-${VERSION}/" data/args.yml -sed -i "s/^SOURCE_BRANCH_NAME ?=.*$/SOURCE_BRANCH_NAME ?= release-${VERSION}/" Makefile.core.mk +sed -i "s/^export SOURCE_BRANCH_NAME ?=.*$/export SOURCE_BRANCH_NAME ?= release-${VERSION}/" Makefile.core.mk echo "Running make update_all..." make update_all
NameDescription
APP_LABEL_AND_NAMESPACE -

Default scheme. Uses the app label and workload namespace to construct -a cluster name. If the app label does not exist istio-proxy is used.

- -
CANONICAL_NAME_ONLY -

Uses the canonical name for a workload (excluding namespace).

- -
CANONICAL_NAME_AND_NAMESPACE -

Uses the canonical name and namespace for a workload.

-