Skip to content

Bump Prow to v20260225, fix Spyglass S3 URI error, add smart deploy restarts #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-chau merged 8 commits into from
Apr 1, 2026
Merged

Bump Prow to v20260225, fix Spyglass S3 URI error, add smart deploy restarts #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d244a27
Bump all Prow images to v20260225-8287579aa
Mar 31, 2026
ae7258f
Fix S3 endpoint URI: add http:// scheme for minio
Mar 31, 2026
2d57eab
Fix S3 endpoint in test-pods namespace secret too
Mar 31, 2026
676c5ae
Add rollout restart after deploy to pick up secret changes
Mar 31, 2026
13730f8
Only restart Prow components when secrets actually change
Mar 31, 2026
73ae143
Fix: use hash annotation to detect secret-pod drift
Mar 31, 2026
f363c26
Add explicit --plugin-config flag to hook deployment
Mar 31, 2026
aed9025
Revert "Add explicit --plugin-config flag to hook deployment"
Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions .github/workflows/deploy-lts-prow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
GITHUB_REPO: ${{ vars.REPO }}
HMAC_TOKEN: ${{ secrets.HMAC_TOKEN }}
MINIO_CONSOLE_PORT: 8003
K8S_PROW_IMAGE_TAG: v20240802-66b115076
K8S_PROW_IMAGE_TAG: v20260225-8287579aa
steps:
- name: Generate fake mount secret
run: |
Expand Down Expand Up @@ -206,4 +206,26 @@ jobs:
- name: 'Apply test pod manifests'
run: for f in config/prow/k8s/test-pods/*.yaml; do envsubst < $f | kubectl apply -f -; done
env:
AZURE_RG: ${{ secrets.AZURE_RG }}
AZURE_RG: ${{ secrets.AZURE_RG }}

- name: 'Restart Prow components if secrets are out of sync'
run: |
# Compute current secret hash
SECRET_HASH=$(kubectl get secret s3-credentials -n prow -o jsonpath='{.data}' | md5sum | cut -d' ' -f1)
echo "Current s3-credentials hash: $SECRET_HASH"

# Check if Deck pods have the matching hash annotation
DECK_HASH=$(kubectl get deployment deck -n prow -o jsonpath='{.spec.template.metadata.annotations.s3-credentials-hash}' 2>/dev/null || echo "")
echo "Deck annotation hash: ${DECK_HASH:-<none>}"

if [ "$SECRET_HASH" != "$DECK_HASH" ]; then
echo "Secret hash mismatch — restarting Prow components..."
# Annotate deployments with the current hash (triggers rollout)
for deploy in deck crier; do
kubectl patch deployment "$deploy" -n prow -p \
"{\"spec\":{\"template\":{\"metadata\":{\"annotations\":{\"s3-credentials-hash\":\"$SECRET_HASH\"}}}}}"
done
kubectl rollout status deployment -n prow deck crier --timeout=300s
else
echo "Secret hash matches — no restart needed"
fi
2 changes: 1 addition & 1 deletion config/prow/k8s/app/ghproxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
agentpool: prow
containers:
- name: ghproxy
image: gcr.io/k8s-prow/ghproxy:$K8S_PROW_IMAGE_TAG
image: us-docker.pkg.dev/k8s-infra-prow/images/ghproxy:$K8S_PROW_IMAGE_TAG
args:
- --cache-dir=/cache
- --cache-sizeGB=99
Expand Down
2 changes: 1 addition & 1 deletion config/prow/k8s/app/minio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ stringData:
{
"region": "minio",
"access_key": "$AZURE_STORAGE_ACCOUNT_USER",
"endpoint": "minio.prow.svc.cluster.local",
"endpoint": "http://minio.prow.svc.cluster.local",
"insecure": true,
"s3_force_path_style": true,
"secret_key": "$AZURE_STORAGE_ACCOUNT_PASSWORD"
Expand Down
2 changes: 1 addition & 1 deletion config/prow/k8s/test-pods/s3-credentials.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stringData:
{
"region": "minio",
"access_key": "$AZURE_STORAGE_ACCOUNT_USER",
"endpoint": "minio.prow.svc.cluster.local",
"endpoint": "http://minio.prow.svc.cluster.local",
"insecure": true,
"s3_force_path_style": true,
"secret_key": "$AZURE_STORAGE_ACCOUNT_PASSWORD"
Expand Down