Skip to content

Commit

Permalink
Update istio test ref to 1.20.0-rc.0 (istio#14091)
Browse files Browse the repository at this point in the history 
* Update istio test ref to 1.20.0-rc.0

* Remove added toolchain line

* Run make gen

* Update to set ENABLE_EXTERNAL_NAME_ALIAS to false (default) for testing

* Move gateway tcp-traffic shifting to demo

* Change gateway tcp-traffic shifting to not remove istio in demo...

* Change gateway tcp-traffic shifting to remove istiooperator in demo...

* Update to latest 1.20 commit

* Change to be a minimal test
  • Loading branch information
Eric Van Norman authored Nov 10, 2023
1 parent c4a3d13 commit a72fb91
Show file tree
Hide file tree
Showing 12 changed files with 158 additions and 142 deletions.
1 change: 1 addition & 0 deletions bin/init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ cp -a "${ISTIO_GO}/tools/certs" "${ISTIOIO_GO}/tools/certs"
mkdir "${ISTIOIO_GO}/tests/integration/"
cp -a "${ISTIO_GO}/tests/integration/iop-integration-test-defaults.yaml" "${ISTIOIO_GO}/tests/integration/"
cp -a "${ISTIO_GO}/tests/integration/base.yaml" "${ISTIOIO_GO}/tests/integration/"
sed -i "s/ENABLE_EXTERNAL_NAME_ALIAS: true$/ENABLE_EXTERNAL_NAME_ALIAS: false/" "${ISTIOIO_GO}/tests/integration/base.yaml"
cp -a "${ISTIO_GO}/manifests" "${ISTIOIO_GO}/manifests"

# For generating junit.xml files
Expand Down
2 changes: 1 addition & 1 deletion content/en/boilerplates/snips/args.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
####################################################################################################

! read -r -d '' bpsnip_args_gateway_api_version <<\ENDSNIP
f5d3a1f3e76a6c87620002d92e2b6c7f938339f9
v1.0.0
ENDSNIP

! read -r -d '' bpsnip_args_istio_previous_version <<\ENDSNIP
Expand Down
2 changes: 1 addition & 1 deletion content/en/boilerplates/snips/gateway-api-gamma-support.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
####################################################################################################

bpsnip_gateway_api_gamma_support_install_experimental_crds() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl apply -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.0.0" | kubectl apply -f -
}

bpsnip_gateway_api_gamma_support_enable_alpha_crds() {
Expand Down
2 changes: 1 addition & 1 deletion content/en/boilerplates/snips/gateway-api-install-crds.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@

bpsnip_gateway_api_install_crds_install_crds() {
kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.0.0" | kubectl apply -f -; }
}
4 changes: 2 additions & 2 deletions content/en/docs/ops/ambient/getting-started/snips.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

snip_download_and_install_2() {
kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.0.0" | kubectl apply -f -; }
}

snip_download_and_install_3() {
Expand Down Expand Up @@ -324,5 +324,5 @@ kubectl delete -f samples/sleep/notsleep.yaml
}

snip_uninstall_4() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.0.0" | kubectl delete -f -
}
6 changes: 3 additions & 3 deletions content/en/docs/setup/additional-setup/getting-started/snips.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ source "content/en/boilerplates/snips/trace-generation.sh"

snip__1() {
kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.0.0" | kubectl apply -f -; }
}

snip_download_istio_1() {
Expand Down Expand Up @@ -182,9 +182,9 @@ kubectl label namespace default istio-injection-
}

snip_uninstall_4() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.0.0" | kubectl delete -f -
}

snip_uninstall_5() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.0.0" | kubectl delete -f -
}
2 changes: 1 addition & 1 deletion content/en/docs/setup/install/external-controlplane/snips.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ ENDSNIP

snip_install_crds() {
kubectl get crd gateways.gateway.networking.k8s.io --context="${CTX_REMOTE_CLUSTER}" &> /dev/null || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.0.0" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; }
}

snip_configure_and_test_an_ingress_gateway_3() {
Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

snip_setup_1() {
kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.0.0" | kubectl apply -f -; }
}

snip_setup_2() {
Expand Down Expand Up @@ -247,5 +247,5 @@ kubectl delete ns istio-ingress
}

snip_cleanup_2() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=f5d3a1f3e76a6c87620002d92e2b6c7f938339f9" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.0.0" | kubectl delete -f -
}
7 changes: 4 additions & 3 deletions content/en/docs/tasks/traffic-management/tcp-traffic-shifting/gtwapi_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
source "tests/util/gateway-api.sh"
install_gateway_api_crds

# @setup profile=none
# @setup profile=minimal
source "content/en/boilerplates/snips/gateway-api-gamma-support.sh"
bpsnip_gateway_api_gamma_support_enable_alpha_crds
source "content/en/docs/tasks/traffic-management/tcp-traffic-shifting/test.sh"
Expand All @@ -27,6 +27,7 @@ source "content/en/docs/tasks/traffic-management/tcp-traffic-shifting/test.sh"
snip_cleanup_2
snip_cleanup_3

istioctl uninstall --purge -y
kubectl delete ns istio-system
# istioctl uninstall --purge -y
# kubectl delete ns istio-system
kubectl delete istiooperators installed-state -n istio-system
remove_gateway_api_crds
2 changes: 1 addition & 1 deletion data/args.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ supported_languages:
code: "zh"

# Kubernetes Gateway API
k8s_gateway_api_version: "f5d3a1f3e76a6c87620002d92e2b6c7f938339f9"
k8s_gateway_api_version: "v1.0.0"
85 changes: 42 additions & 43 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module istio.io/istio.io

go 1.20
go 1.21

// https://github.com/containerd/containerd/issues/5781
exclude k8s.io/kubernetes v1.13.0
Expand All @@ -10,10 +10,10 @@ 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-20231023015400-38a0bb45102a
k8s.io/apimachinery v0.28.2
k8s.io/client-go v0.28.2
golang.org/x/sync v0.4.0
istio.io/istio v0.0.0-20231109034306-486c6ca3836d
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3
)

require (
Expand Down Expand Up @@ -44,15 +44,15 @@ require (
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.7+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/envoyproxy/go-control-plane v0.11.2-0.20231019082134-6e4589f570e1 // 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
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -69,10 +69,10 @@ require (
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-containerregistry v0.16.1 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
Expand All @@ -90,7 +90,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/compress v1.17.1 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
Expand All @@ -106,8 +106,8 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/miekg/dns v1.1.55 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/miekg/dns v1.1.56 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
Expand All @@ -127,11 +127,11 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pires/go-proxyproto v0.7.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/prometheus v0.46.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/prometheus v0.48.0-rc.1 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-20 v0.3.2 // indirect
github.com/quic-go/quic-go v0.38.0 // indirect
Expand All @@ -156,35 +156,34 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yl2chen/cidranger v1.0.2 // indirect
go.opentelemetry.io/otel v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.39.1-0.20230714155235-03b8c47770f2 // indirect
go.opentelemetry.io/otel/metric v1.17.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
go.opentelemetry.io/otel/trace v1.17.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
golang.org/x/tools v0.14.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
Expand All @@ -195,23 +194,23 @@ 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.20231020014103-f04dabe883d3 // indirect
istio.io/client-go v1.19.0-alpha.1.0.20231020015056-c529c054a39d // indirect
k8s.io/api v0.28.2 // indirect
k8s.io/apiextensions-apiserver v0.28.2 // indirect
k8s.io/apiserver v0.28.2 // indirect
istio.io/api v1.20.0-beta.0.0.20231031143729-871b2914253f // indirect
istio.io/client-go v1.20.0-beta.0.0.20231031144329-30f00b62f7e9 // indirect
k8s.io/api v0.28.3 // indirect
k8s.io/apiextensions-apiserver v0.28.3 // indirect
k8s.io/apiserver v0.28.3 // indirect
k8s.io/cli-runtime v0.28.0 // indirect
k8s.io/component-base v0.28.2 // indirect
k8s.io/component-base v0.28.3 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230811205723-7ac0aad8c58d // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubectl v0.28.0 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/controller-runtime v0.16.2 // indirect
sigs.k8s.io/gateway-api v0.8.2-0.20230927170411-f5d3a1f3e76a // indirect
sigs.k8s.io/controller-runtime v0.16.3 // indirect
sigs.k8s.io/gateway-api v1.0.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
sigs.k8s.io/mcs-api v0.1.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit a72fb91

Please sign in to comment.