Skip to content

feat(conformance): Use CRD annotation to populate the ConformanceReport GatewayAPIInferenceExtensionVersion #1214

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
merged 2 commits into from
Aug 28, 2025
Merged

feat(conformance): Use CRD annotation to populate the ConformanceReport GatewayAPIInferenceExtensionVersion #1214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e9fa29
Use CRD annotation to get the inferencePool BundleVersion for Conform…
zetxqx Jul 22, 2025
4e3a39d
ctx best practices.
zetxqx Aug 28, 2025
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
52 changes: 37 additions & 15 deletions conformance/conformance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,7 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
*confflags.ImplementationContact,
)

// Inference Extension Specific Report Fields
inferenceExtensionVersion := "v0.3.0"
_ = inferenceExtensionVersion // Avoid unused variable error until implemented

baseManifestsValue := "resources/base.yaml"

opts := confsuite.ConformanceOptions{
Client: c,
ClientOptions: clientOptions,
Expand All @@ -166,7 +161,6 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
// TODO: Add the inference extension specific fields to ConformanceOptions struct if needed,
// or handle them during report generation.
// GatewayAPIInferenceExtensionChannel: inferenceExtensionChannel,
// GatewayAPIInferenceExtensionVersion: inferenceExtensionVersion,
}

// Populate SupportedFeatures based on the GatewayLayerProfile.
Expand Down Expand Up @@ -197,6 +191,8 @@ func RunConformance(t *testing.T) {
// RunConformanceWithOptions runs the Inference Extension conformance tests with specific options.
func RunConformanceWithOptions(t *testing.T, opts confsuite.ConformanceOptions) {
t.Helper()
ctx := context.Background()

t.Logf("Running Inference Extension conformance tests with GatewayClass %s", opts.GatewayClassName)
logDebugf(t, opts.Debug, "RunConformanceWithOptions: BaseManifests path being used by opts: %q", opts.BaseManifests)

Expand All @@ -209,27 +205,36 @@ func RunConformanceWithOptions(t *testing.T, opts confsuite.ConformanceOptions)
cSuite, err := confsuite.NewConformanceTestSuite(opts)
require.NoError(t, err, "error initializing conformance suite")

SetupConformanceTestSuite(t, cSuite, opts, tests.ConformanceTests)

installedCRDs := &apiextensionsv1.CustomResourceDefinitionList{}
err = opts.Client.List(ctx, installedCRDs)
require.NoError(t, err, "error getting installedCRDs")
apiVersion, err := getGatewayInferenceExtentionVersion(installedCRDs.Items)
if err != nil {
if opts.AllowCRDsMismatch {
apiVersion = "UNDEFINED"
} else {
require.NoError(t, err, "error getting the gateway ineference extension version")
}
}
SetupConformanceTestSuite(ctx, t, cSuite, opts, tests.ConformanceTests)
t.Log("Running Inference Extension conformance tests against all registered tests")
err = cSuite.Run(t, tests.ConformanceTests)
require.NoError(t, err, "error running conformance tests")

// Generate and write the report if requested.
if opts.ReportOutputPath != "" {
t.Log("Generating Inference Extension conformance report")
report, err := cSuite.Report() // Use the existing report generation logic.
require.NoError(t, err, "error generating conformance report")
inferenceReport := GatewayAPIInferenceExtensionConformanceReport{
GatewayAPIInferenceExtensionVersion: version.BundleVersion,
GatewayAPIInferenceExtensionVersion: apiVersion,
ConformanceReport: *report,
}
err = inferenceReport.WriteReport(t.Logf, opts.ReportOutputPath)
require.NoError(t, err, "error writing conformance report")
}
}

func SetupConformanceTestSuite(t *testing.T, suite *confsuite.ConformanceTestSuite, opts confsuite.ConformanceOptions, tests []confsuite.ConformanceTest) {
func SetupConformanceTestSuite(ctx context.Context, t *testing.T, suite *confsuite.ConformanceTestSuite, opts confsuite.ConformanceOptions, tests []confsuite.ConformanceTest) {
suite.Applier.ManifestFS = suite.ManifestFS
if suite.RunTest != "" {
idx := slices.IndexFunc(tests, func(t confsuite.ConformanceTest) bool {
Expand Down Expand Up @@ -257,13 +262,31 @@ func SetupConformanceTestSuite(t *testing.T, suite *confsuite.ConformanceTestSui
}
apikubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, namespaces)

ensureGatewayAvailableAndReady(t, suite.Client, opts, resources.PrimaryGatewayNN)
ensureGatewayAvailableAndReady(t, suite.Client, opts, resources.SecondaryGatewayNN)
ensureGatewayAvailableAndReady(ctx, t, suite.Client, opts, resources.PrimaryGatewayNN)
ensureGatewayAvailableAndReady(ctx, t, suite.Client, opts, resources.SecondaryGatewayNN)
}

func getGatewayInferenceExtentionVersion(crds []apiextensionsv1.CustomResourceDefinition) (string, error) {
var inferenceVersion string
for _, crd := range crds {
v, okv := crd.Annotations[version.BundleVersionAnnotation]
if !okv {
continue
}
if inferenceVersion != "" && v != inferenceVersion {
return "", errors.New("multiple gateway api inference extension CRDs versions detected")
}
inferenceVersion = v
}
if inferenceVersion == "" {
return "", errors.New("no gateway api inference extension CRDs with the proper annotations found in the cluster")
}
return inferenceVersion, nil
}

// ensureGatewayAvailableAndReady polls for the specified Gateway to exist and become ready
// with an address and programmed condition.
func ensureGatewayAvailableAndReady(t *testing.T, k8sClient client.Client, opts confsuite.ConformanceOptions, gatewayNN types.NamespacedName) {
func ensureGatewayAvailableAndReady(ctx context.Context, t *testing.T, k8sClient client.Client, opts confsuite.ConformanceOptions, gatewayNN types.NamespacedName) {
t.Helper()

t.Logf("Attempting to fetch Gateway %s/%s.", gatewayNN.Namespace, gatewayNN.Name)
Expand All @@ -277,7 +300,6 @@ func ensureGatewayAvailableAndReady(t *testing.T, k8sClient client.Client, opts

logDebugf(t, opts.Debug, "Waiting up to %v for Gateway object %s/%s to appear after manifest application...", waitForGatewayCreationTimeout, gatewayNN.Namespace, gatewayNN.Name)

ctx := context.TODO()
pollErr := wait.PollUntilContextTimeout(ctx, extTimeoutConf.GatewayObjectPollInterval, waitForGatewayCreationTimeout, true, func(pollCtx context.Context) (bool, error) {
fetchErr := k8sClient.Get(pollCtx, gatewayNN, gw)
if fetchErr == nil {
Expand Down