feat(openapi): upgrade OpenShift Models #7376
Conversation
ash-thakur-rh
changed the title
- Move openshift-model-miscellaneous before openshift-model-installer in the reactor build order, as installer now depends on miscellaneous for cluster-api types (DataDisk, etc.) - Remove incorrect OSGi export for io.fabric8.kubernetes.api.model.clusterapi** which is not actually generated; cluster-api types are now in io.fabric8.openshift.api.model.miscellaneous.clusterapi.v1beta1 and io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1
PowerVC installer types are included in OpenAPI schema generation (packages.go:50) but were missing from the package mappings in openshift-model-installer pom.xml, causing OSGi bundle resolution failures for missing package com.github.openshift.installer.pkg.types.powervc
ash-thakur-rh
requested review from
manusa,
rohanKanojia and
shawkins
as code owners
manusa
left a comment
manusa
left a comment
There was a problem hiding this comment.
Thanks for looking into this.
Could you please extract the changes in openapi-gen-processors.go and openapi-gen.go to a separate PR so that it's clear that these changes don't affect the currently generated code.
| github.com/operator-framework/api v0.33.0 | ||
| github.com/operator-framework/operator-lifecycle-manager v0.33.0 | ||
| github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20241030140127-a68ef49d9441 | ||
| github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1 |
There was a problem hiding this comment.
monitoring apis in OpenShift comes from this dependency. 4.20 uses 0.85: https://docs.redhat.com/en/documentation/openshift_container_platform/4.20/html/release_notes/ocp-4-20-release-notes#ocp-4-20-monitoring-updates-to-monitoring-stack-components-and-dependencies
There was a problem hiding this comment.
will take of this in a separate PR, as there are too many changes in this PR.
|
CI checks will fail until is #7380 is done. |
|
There are reported changed files on the model of the structs affected by the inline/embedded structs. |
Hi @manusa , I am checking the same. Change in AzureManagedControlPlaneClassSpec, AzureManagedControlPlaneSpec and AzureManagedControlPlaneTemplateResourceSpec is expected but not in chaos-mesh. Also, I think introduction of cluster-api-provider-azure has introduced complexity to models generation, as it has types with same names which were already part of metal3 etc. I am figuring out a way to separate Azure related models from others. |
|
Issue for change in chaos openapi json might be timing issue. The issue might be that when processInlineDuplicateFields checks the embedded type's members, the processSwaggerIgnore hasn't processed the embedded type yet. That is why we are getting no changes in some runs. |
|
I was able to identify the issue and fix it for now. Lets discuss approaches for handling timing issue tomorrow. |
manusa
left a comment
manusa
left a comment
There was a problem hiding this comment.
Ignore previous comments, LGTM, thx!
3 participants
Description
Fixes #7371
This PR upgrades OpenShift models to the latest version, introducing new API resources including ClusterImagePolicy, ImagePolicy, and extensive policy management classes (FulcioCAWithRekor, PolicyRootOfTrust, PKI, etc.). It also adds cluster-api models including metal3 v1alpha1 resources and Azure cluster API v1beta1 support to miscellaneous module.
Key Changes
OpenAPI Generator (Go):
Java Model Fixes:
Type of change
test, version modification, documentation, etc.)
Checklist