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

Re-enable processing of gateway-api version in `make gen` (#13595) 

* Re-enable processing of gateway-api version in `make gen`

* Update gateway-api to be the publicly released base version

* remove script and add awk in Makefile

* rebase and make gen
This commit is contained in:
Eric Van Norman 2023-07-18 19:43:55 -05:00 committed by GitHub
parent e142c1eacf
commit f278e63825
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.core.mk
View File

@ -85,7 +85,7 @@ site:
snips:
@scripts/gen_snips.sh
gen: tidy-go format-go snips
gen: tidy-go format-go update-gateway-version snips
gen-check: gen check-clean-repo check-localization
@ -230,7 +230,7 @@ test_status:
@scripts/test_status.sh
update-gateway-version: tidy-go
@$(eval GATEWAY_VERSION := ${shell grep gateway-api go.mod | awk '{ print $$2 }'})
@$(eval GATEWAY_VERSION := ${shell grep gateway-api go.mod | awk '{ print $$2 }' | awk -F '-' '{ print $$1 }'})
@${shell sed -Ei 's|k8s_gateway_api_version: ".*"|k8s_gateway_api_version: "${GATEWAY_VERSION}"|' 'data/args.yml'}

2
content/en/boilerplates/snips/args.sh
View File

@ -21,7 +21,7 @@
####################################################################################################
! read -r -d '' bpsnip_args_gateway_api_version <<\ENDSNIP
6b9b7346ca5b54a50c3afb0a0573b16b1c84336a
v0.7.1
ENDSNIP
! read -r -d '' bpsnip_args_istio_previous_version <<\ENDSNIP

2
content/en/boilerplates/snips/gateway-api-experimental.sh
View File

@ -21,5 +21,5 @@
####################################################################################################
bpsnip_gateway_api_experimental_install_experimental_crds() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.7.1" | kubectl apply -f -
}

2
content/en/boilerplates/snips/gateway-api-gamma-support.sh
View File

@ -21,5 +21,5 @@
####################################################################################################
bpsnip_gateway_api_gamma_support_install_experimental_crds() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.7.1" | kubectl apply -f -
}

2
content/en/boilerplates/snips/gateway-api-install-crds.sh
View File

@ -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=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.7.1" | kubectl apply -f -; }
}

4
content/en/docs/ops/ambient/getting-started/snips.sh
View File

@ -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=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.7.1" | kubectl apply -f -; }
}
snip_download_and_install_3() {
@ -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=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.7.1" | kubectl delete -f -
}

2
content/en/docs/setup/additional-setup/getting-started/snips.sh
View File

@ -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=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.7.1" | kubectl apply -f -; }
}
snip_download_istio_1() {

2
content/en/docs/setup/install/external-controlplane/snips.sh
View File

@ -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=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.7.1" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; }
}
snip_configure_and_test_an_ingress_gateway_3() {

4
content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh
View File

@ -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=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.7.1" | kubectl apply -f -; }
}
snip_setup_2() {
@ -246,5 +246,5 @@ kubectl delete ns istio-ingress
}
snip_cleanup_2() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.7.1" | kubectl delete -f -
}

2
data/args.yml
View File

@ -49,4 +49,4 @@ supported_languages:
code: "zh"
# Kubernetes Gateway API
k8s_gateway_api_version: "6b9b7346ca5b54a50c3afb0a0573b16b1c84336a"
k8s_gateway_api_version: "v0.7.1"