Skip to content

Commit 4788522

Browse files
authored
fix: yq download issue & resolving pseudo-versions (kserve#5023)
Signed-off-by: Jooho Lee <jlee@redhat.com>
1 parent 71059c5 commit 4788522

13 files changed

+146
-130
lines changed

Makefile.tools.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ $(ENVTEST): $(LOCALBIN)
3737
## Download yq locally if necessary.
3838
.PHONY: yq
3939
yq: $(YQ)
40-
$(YQ): $(LOCALBIN)
41-
$(call go-install-tool,$(YQ),github.com/mikefarah/yq/v4,$(YQ_VERSION))
40+
$(YQ): $(LOCALBIN)
41+
BIN_DIR=$(LOCALBIN) hack/setup/cli/install-yq.sh ;\
42+
mv $(LOCALBIN)/yq $(YQ)-$(YQ_VERSION) ;\
43+
ln -sf "$$(basename $(YQ)-$(YQ_VERSION))" "$(YQ)"
4244

4345
## Download helm-docs locally if necessary.
4446
.PHONY: helm-docs

hack/setup/infra/gateway-api/manage.gateway-api-crd.sh

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -34,63 +34,9 @@ elif [[ "$*" == *"--reinstall"* ]]; then
3434
fi
3535
# INIT END
3636

37-
# Resolve the Gateway API version to an available GitHub release.
38-
# If the version is a pseudo-version (e.g., v1.3.1-0.20251106052652-079e4774d76b),
39-
# find the next available release version that is >= the base version.
40-
resolve_gateway_api_version() {
41-
local version="$1"
42-
local base_version
43-
44-
# Check if version is a pseudo-version (contains timestamp like -0.YYYYMMDD)
45-
if [[ "$version" =~ ^v([0-9]+\.[0-9]+\.[0-9]+)-0\.[0-9]{14}- ]]; then
46-
base_version="${BASH_REMATCH[1]}"
47-
log_info "Detected pseudo-version ${version}, base version is ${base_version}"
48-
49-
# Fetch available releases from GitHub and find versions matching vX.Y.Z pattern
50-
local releases
51-
releases=$(curl -s "https://api.github.com/repos/kubernetes-sigs/gateway-api/releases" | \
52-
grep -oE '"tag_name":\s*"v[0-9]+\.[0-9]+\.[0-9]+"' | \
53-
grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | \
54-
sort -V)
55-
56-
if [ -z "$releases" ]; then
57-
log_warning "Failed to fetch releases from GitHub, trying version as-is"
58-
echo "$version"
59-
return
60-
fi
61-
62-
# Find the smallest version >= base_version
63-
local next_version=""
64-
for release in $releases; do
65-
local release_num="${release#v}"
66-
if version_gte "$release_num" "$base_version"; then
67-
next_version="$release"
68-
break
69-
fi
70-
done
71-
72-
if [ -n "$next_version" ]; then
73-
log_info "Using next available release: ${next_version}"
74-
echo "$next_version"
75-
return
76-
fi
77-
78-
# Fallback to latest version if no suitable release found
79-
local latest_version
80-
latest_version=$(echo "$releases" | tail -1)
81-
log_warning "No suitable release found >= v${base_version}, using latest: ${latest_version}"
82-
echo "$latest_version"
83-
else
84-
# Version is a regular release tag, use as-is
85-
echo "$version"
86-
fi
87-
}
88-
8937
uninstall() {
9038
log_info "Uninstalling Gateway API CRDs..."
91-
local resolved_version
92-
resolved_version=$(resolve_gateway_api_version "$GATEWAY_API_VERSION")
93-
kubectl delete -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/${resolved_version}/standard-install.yaml" --ignore-not-found=true 2>/dev/null || true
39+
kubectl delete -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/${GATEWAY_API_VERSION}/standard-install.yaml" --ignore-not-found=true 2>/dev/null || true
9440
log_success "Gateway API CRDs uninstalled"
9541
}
9642

@@ -105,13 +51,10 @@ install() {
10551
fi
10652
fi
10753

108-
local resolved_version
109-
resolved_version=$(resolve_gateway_api_version "$GATEWAY_API_VERSION")
110-
111-
log_info "Installing Gateway API CRDs ${resolved_version}..."
112-
kubectl apply -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/${resolved_version}/standard-install.yaml"
54+
log_info "Installing Gateway API CRDs ${GATEWAY_API_VERSION}..."
55+
kubectl apply -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/${GATEWAY_API_VERSION}/standard-install.yaml"
11356

114-
log_success "Successfully installed Gateway API CRDs ${resolved_version}"
57+
log_success "Successfully installed Gateway API CRDs ${GATEWAY_API_VERSION}"
11558

11659
wait_for_crds "60s" \
11760
"gateways.gateway.networking.k8s.io" \

hack/setup/quick-install/kserve-knative-mode-dependency-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

hack/setup/quick-install/kserve-knative-mode-full-install-helm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

hack/setup/quick-install/kserve-knative-mode-full-install-with-manifests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

hack/setup/quick-install/kserve-standard-mode-dependency-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

hack/setup/quick-install/kserve-standard-mode-full-install-helm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

hack/setup/quick-install/kserve-standard-mode-full-install-with-manifests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

hack/setup/quick-install/llmisvc-dependency-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

hack/setup/quick-install/llmisvc-full-install-helm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ export RELEASE
500500
GOLANGCI_LINT_VERSION=v1.64.8
501501
CONTROLLER_TOOLS_VERSION=v0.19.0
502502
ENVTEST_VERSION=latest
503-
YQ_VERSION=v4.28.1
503+
YQ_VERSION=v4.52.1
504504
HELM_VERSION=v3.16.3
505505
KUSTOMIZE_VERSION=v5.5.0
506506
HELM_DOCS_VERSION=v1.12.0
@@ -520,7 +520,7 @@ ISTIO_VERSION=1.27.1
520520
KEDA_VERSION=2.17.2
521521
OPENTELEMETRY_OPERATOR_VERSION=0.74.3
522522
LWS_VERSION=v0.7.0
523-
GATEWAY_API_VERSION=v1.3.1-0.20251106052652-079e4774d76b
523+
GATEWAY_API_VERSION=v1.3.0
524524
GIE_VERSION=v1.2.0
525525

526526
#================================================

0 commit comments

Comments
 (0)