Skip to content

Bump GWAPI CRDs to v1.4.1 OSSM 3.3.1 and Istio v1.28.5#1455

Open
rhamini3 wants to merge 4 commits into
openshift:release-4.20from
rhamini3:ocpbugs-84836
Open

Bump GWAPI CRDs to v1.4.1 OSSM 3.3.1 and Istio v1.28.5#1455
rhamini3 wants to merge 4 commits into
openshift:release-4.20from
rhamini3:ocpbugs-84836

Conversation

@rhamini3

Copy link
Copy Markdown
Contributor

Bumping the GWAPI CRDs to v1.4.1 OSSM 3.3.1 and Istio v1.28.5 to target CVE fixes

@coderabbitai

coderabbitai Bot commented May 28, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 8cbf0151-3fec-4b47-8de9-be55013d66dc

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from knobunc and rikatz May 28, 2026 21:33
@openshift-ci

openshift-ci Bot commented May 28, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign candita for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhamini3

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-gatewayapi-conformance

@rhamini3

Copy link
Copy Markdown
Contributor Author

/retest

@rhamini3

rhamini3 commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@Thealisyed Thealisyed left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another small nit, few yaml files are missing the newline at the end btw...

@coderabbitai maybe you can try and preemptively answer my questions? 👀

Comment thread hack/gatewayapi-conformance.sh Outdated
Comment on lines +46 to +49
if [[ "$BUNDLE_VERSION" = "v1.3.0" ]]; then
echo "Cherry-picking fix for CoreDNS deployment image tag shortname issue in v1.3.0"
git fetch origin 7f612b97fec9edd3aa32d193a4e9b4c3161ed09a
git cherry-pick 7f612b97fec9edd3aa32d193a4e9b4c3161ed09a

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the conformance tests will run against 1.4.1 right? How does this work then if bundle version is 1.3.0?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the bundle version is picked up by BUNDLE_VERSION=$(oc get crds gateways.gateway.networking.k8s.io -ojson | jq -r '.metadata.annotations."gateway.networking.k8s.io/bundle-version"') so it should get the CRD version with this change pointing to 1.4.1

@rhamini3

rhamini3 commented Jun 4, 2026

Copy link
Copy Markdown
Contributor Author

Another small nit, few yaml files are missing the newline at the end btw...

@coderabbitai maybe you can try and preemptively answer my questions? 👀

Hey, which files are you referring to? All the changed files are showing a new line on my end

@coderabbitai

coderabbitai Bot commented Jun 4, 2026

Copy link
Copy Markdown

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Get the list of changed files in the PR
gh pr view 1455 --repo openshift/cluster-ingress-operator --json files --jq '.files[].path' | grep -E '\.yaml$|\.yml$'

Length of output: 758


🏁 Script executed:

#!/bin/bash
# Check each changed YAML file for trailing newline
for f in $(gh pr view 1455 --repo openshift/cluster-ingress-operator --json files --jq '.files[].path' | grep -E '\.yaml$|\.yml$'); do
  echo "=== $f ==="
  # Check last byte of file
  last_char=$(tail -c 1 "$f" | xxd | head -1)
  echo "Last byte: $last_char"
  # Also show last line
  tail -1 "$f" | cat -A
done

Length of output: 1554


🏁 Script executed:

#!/bin/bash
# Get the diff to see which YAML files were modified and check for \No newline at end of file
gh pr diff 1455 --repo openshift/cluster-ingress-operator | grep -E '(^\+\+\+|No newline at end of file|\.yaml|\.yml)'

Length of output: 4007



@rhamini3 Found them! The git diff shows \ No newline at end of file for the following 5 files:

  1. pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gatewayclasses.yaml
  2. pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gateways.yaml
  3. pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_grpcroutes.yaml
  4. pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_httproutes.yaml
  5. pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_referencegrants.yaml

These are likely inherited from the upstream CRD sources (GWAPI/OSSM/Istio) as-is. If your editor is showing a newline, it may be auto-adding one on display — but the actual file bytes don't have a trailing \n. You can verify with:

tail -c 1 pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gateways.yaml | od -c

A quick fix would be to run:

for f in \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gatewayclasses.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gateways.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_grpcroutes.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_httproutes.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_referencegrants.yaml; do
  echo "" >> "$f"
done

@rhamini3

rhamini3 commented Jun 4, 2026

Copy link
Copy Markdown
Contributor Author

@coderabbitai can you check if the new line has been added now?

@coderabbitai

coderabbitai Bot commented Jun 4, 2026

Copy link
Copy Markdown

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check the current PR diff for the 5 YAML files to see if "No newline at end of file" still appears
gh pr diff 1455 --repo openshift/cluster-ingress-operator | grep -E '(No newline at end of file|gateway\.networking\.k8s\.io_)'

Length of output: 2683


🏁 Script executed:

#!/bin/bash
# Also verify by checking the last character of each file directly
for f in \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gatewayclasses.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gateways.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_grpcroutes.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_httproutes.yaml \
  pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_referencegrants.yaml; do
  echo "=== $f ==="
  tail -c 1 "$f" | od -c | head -1
done

Length of output: 1230



@rhamini3 Almost there! Here's the current status:

Fixed ✅ (trailing newline now present):

  • gateway.networking.k8s.io_gatewayclasses.yaml
  • gateway.networking.k8s.io_gateways.yaml
  • gateway.networking.k8s.io_grpcroutes.yaml
  • gateway.networking.k8s.io_httproutes.yaml

Still missing trailing newline ❌:

  • pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_referencegrants.yaml
  • pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_backendtlspolicies.yaml ← newly added file, also missing it

You can fix both remaining files with:

echo "" >> pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_referencegrants.yaml
echo "" >> pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_backendtlspolicies.yaml

@rhamini3

rhamini3 commented Jun 4, 2026

Copy link
Copy Markdown
Contributor Author

@coderabbitai check once more

@coderabbitai

coderabbitai Bot commented Jun 4, 2026

Copy link
Copy Markdown

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check current PR diff for "No newline at end of file" markers
gh pr diff 1455 --repo openshift/cluster-ingress-operator | grep -E '(No newline at end of file|gateway\.networking\.k8s\.io_)'

Length of output: 2590



@rhamini3 All clear! 🎉 No more \ No newline at end of file markers in the diff. Both previously flagged files are now fixed:

  • gateway.networking.k8s.io_referencegrants.yaml
  • gateway.networking.k8s.io_backendtlspolicies.yaml

All 6 YAML files in this PR now have proper trailing newlines.

@openshift-ci

openshift-ci Bot commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

@rhamini3: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-gatewayapi-conformance d82fcd1 link false /test e2e-aws-gatewayapi-conformance
ci/prow/e2e-azure-ovn 577f6c7 link false /test e2e-azure-ovn
ci/prow/e2e-aws-ovn 577f6c7 link true /test e2e-aws-ovn
ci/prow/e2e-aws-operator 577f6c7 link true /test e2e-aws-operator

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@gcs278

gcs278 commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

/assign @gcs278

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 8, 2026
@openshift-ci

openshift-ci Bot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants