Skip to content
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.

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

NE-1400: Bump to OSSM 2.5 and Gateway API v0.6.2 CRDs #1018

Merged
merged 1 commit into from May 24, 2024

Conversation

candita
Copy link
Contributor

@candita candita commented Jan 24, 2024

OSSM 2.5 supports Istio 1.18 and therefore only Gateway API v0.6.2 CRDS.

  • Pull the new CRD yaml from upstream and update pkg/manifests/assets/gateway-api
  • Update the pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go to reflect changes required by OSSM 2.5.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 24, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 24, 2024

@candita: This pull request references NE-1400 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

OSSM 2.5 currently not working with latest Gateway API objects. Verify whether the old objects still work.

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 openshift-eng/jira-lifecycle-plugin repository.

@candita
Copy link
Contributor Author

candita commented Feb 27, 2024

NAME TestAll/parallel/TestRouteMetricsControllerOnlyRouteSelector
route_metrics_test.go:386: failed to update route: Operation cannot be fulfilled on routes.route.openshift.io "route-rs-foo-label": the object has been modified; please apply your changes to the latest version and try again
NAME TestAll/parallel/TestRouteMetricsControllerOnlyRouteSelector
panic.go:522: deleted ingresscontroller ic-rs-metrics-test

/test e2e-azure-operator

@candita
Copy link
Contributor Author

candita commented Feb 27, 2024

Installation failure on an optional test
/test e2e-aws-ovn-single-node

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 20, 2024

@candita: This pull request references NE-1400 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

OSSM 2.5 supports Istio 1.18 and therefore only Gateway API v0.6.2 CRDS.

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 openshift-eng/jira-lifecycle-plugin repository.

@candita candita changed the title NE-1400: Test OSSM 2.5 with old Gateway API objects NE-1400: Test OSSM 2.5 and Gateway API v0.6.2 CRDs Mar 20, 2024
@candita candita changed the title NE-1400: Test OSSM 2.5 and Gateway API v0.6.2 CRDs NE-1400: Add OSSM 2.5 and Gateway API v0.6.2 CRDs Apr 10, 2024
@candita candita changed the title NE-1400: Add OSSM 2.5 and Gateway API v0.6.2 CRDs NE-1400: Bump to OSSM 2.5 and Gateway API v0.6.2 CRDs Apr 10, 2024
// Istio will only create the default gateway class if this is true.
"PILOT_ENABLE_GATEWAY_API_GATEWAYCLASS_CONTROLLER": "true",
Copy link
Contributor

Choose a reason for hiding this comment

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

In the workflow from the EP, the cluster-admin creates the gatewayclass, not Istio.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can update that to say "Istio will only allow ...."

Copy link
Contributor Author

@candita candita Apr 11, 2024

Choose a reason for hiding this comment

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

Copy link
Contributor

@Miciah Miciah Apr 17, 2024

Choose a reason for hiding this comment

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

Hm, so OSSM doesn't reconcile gatewayclasses at all without PILOT_ENABLE_GATEWAY_API_GATEWAYCLASS_CONTROLLER=true? Is that a regression from OSSM 2.4? Then it seems like the options are (1) no Gateway API support at all or (2) cluster-admin and OSSM clash over ownership of the default gatewayclass object. Option 2 is better if we have no other option.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it is a regression from OSSM 2.4. I could ask OSSM to try to fix it in a 2.5 patch, but they don't consider this a bug. I would like to get this into the next release if possible, if only to let dev preview users play with OSSM 2.5 as-is, but it doesn't add much to the mix in terms of Gateway API.

@candita
Copy link
Contributor Author

candita commented Apr 10, 2024

/assign @rfredette
/assign @gcs278

- Pull the new CRD yaml from upstream and update pkg/manifests/assets/gateway-api
- Update the pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go to
reflect changes required by OSSM 2.5.
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 19, 2024

@candita: This pull request references NE-1400 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

OSSM 2.5 supports Istio 1.18 and therefore only Gateway API v0.6.2 CRDS.

  • Pull the new CRD yaml from upstream and update pkg/manifests/assets/gateway-api
  • Update the pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go to reflect changes required by OSSM 2.5.

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 openshift-eng/jira-lifecycle-plugin repository.

@candita
Copy link
Contributor Author

candita commented Apr 19, 2024

Was this an issue?

Querying https://api.integration.openshift.com/api/upgrades_info/graph?channel=candidate-4.16&arch=amd64 for version 4.16.0-0.ci.test-2024-04-19-184019-ci-op-q4j54j1m-latest
Version 4.16.0-0.ci.test-2024-04-19-184019-ci-op-q4j54j1m-latest is not available in candidate-4.16
Cluster cannot query OpenShift Update Service (OSUS/Cincinnati)

/test e2e-gcp-operator

@candita
Copy link
Contributor Author

candita commented Apr 19, 2024

level=error msg=failed to fetch Cluster: failed to generate asset "Cluster": failed to create cluster: failure applying terraform for "cluster" stage: error applying Terraform configs: failed to apply Terraform: exit status 1
level=error
level=error msg=Error: waiting for EC2 Instance (i-071625d5fd2353bd2) create: couldn't find resource (21 retries)

/test e2e-aws-operator

@rfredette
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 22, 2024
Copy link
Contributor

Choose a reason for hiding this comment

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

I tested this with our current DevPreview blog instructions: https://github.com/openshift/network-edge-tools/blob/main/docs/blogs/EnhancedDevPreviewGatewayAPI/GettingStarted.md.

And generally, everything looks good. However, the some blog instructions are now broken after this PR, for example:

Should we maintain our DevPreview blog instructions? Or let them go stale? Either way, I'm good with proceeding with this bump.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I noticed a couple of these too and made some notes on them. The DevPreview instructions are specific to a release. Hopefully we make enough progress with this release that we can issue an update in OpenShift docs.

@gcs278
Copy link
Contributor

gcs278 commented May 23, 2024

Looks good to me.
/approve

Copy link
Contributor

openshift-ci bot commented May 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gcs278

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

The pull request process is described here

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 23, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 487fe81 and 2 for PR HEAD d9a4fe9 in total

Copy link
Contributor

openshift-ci bot commented May 23, 2024

@candita: The following test 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-ovn-single-node d9a4fe9 link false /test e2e-aws-ovn-single-node

Full PR test history. Your PR dashboard.

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.

@candita
Copy link
Contributor Author

candita commented May 24, 2024

Failures in e2e-hypershift don't seem related to this change:

--- FAIL: TestCreateCluster (2454.22s)
--- PASS: TestCreateCluster/ValidateHostedCluster (1137.50s)
--- PASS: TestCreateCluster/ValidateHostedCluster/EnsureNodeCountMatchesNodePoolReplicas (0.09s)
--- PASS: TestCreateCluster/ValidateHostedCluster/EnsureNoCrashingPods (0.03s)
--- PASS: TestCreateCluster/ValidateHostedCluster/EnsureGuestWebhooksValidated (5.06s)
--- PASS: TestCreateCluster/ValidateHostedCluster/EnsureNodeCommunication (0.13s)
--- FAIL: TestCreateCluster/Main (765.27s)
--- FAIL: TestCreateCluster/Main/break-glass-credentials (600.41s)
--- FAIL: TestCreateCluster/Main/break-glass-credentials/independent_signers (600.41s)

Failure in e2e-aws-ovn-serial due to:

{ openshift cluster install failed with cluster creation}

/retest-required

@openshift-merge-bot openshift-merge-bot bot merged commit a479bee into openshift:master May 24, 2024
14 of 15 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-ingress-operator-container-v4.17.0-202405241212.p0.ga479bee.assembly.stream.el9 for distgit ose-cluster-ingress-operator.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants