Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions api/v1/inferencepool_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ type InferencePoolSpec struct {
TargetPortNumber int32 `json:"targetPortNumber"`

// Extension configures an endpoint picker as an extension service.
//
// +kubebuilder:validation:Required
ExtensionRef *Extension `json:"extensionRef,omitempty"`
}

Expand Down
2 changes: 0 additions & 2 deletions apix/v1alpha2/inferencepool_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ type InferencePoolSpec struct {
// This type is intended to be a union of mutually exclusive configuration options that we may add in the future.
type EndpointPickerConfig struct {
// Extension configures an endpoint picker as an extension service.
//
// +kubebuilder:validation:Required
ExtensionRef *Extension `json:"extensionRef,omitempty"`
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ spec:
minimum: 1
type: integer
required:
- extensionRef
- selector
- targetPortNumber
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ spec:
minimum: 1
type: integer
required:
- extensionRef
- selector
- targetPortNumber
type: object
Expand Down
20 changes: 10 additions & 10 deletions conformance/conformance.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

// Package conformance contains the core setup and execution logic
// for the Gateway API Inference ExtensionRef conformance test suite.
// for the Gateway API Inference Extension conformance test suite.
package conformance

import (
Expand Down Expand Up @@ -54,7 +54,7 @@ import (
)

// GatewayLayerProfileName defines the name for the conformance profile that tests
// the Gateway API layer aspects of the Inference ExtensionRef (e.g., InferencePool, InferenceObjective CRDs).
// the Gateway API layer aspects of the Inference Extension (e.g., InferencePool, InferenceObjective CRDs).
// Future profiles will cover EPP and ModelServer layers.
const GatewayLayerProfileName confsuite.ConformanceProfileName = "Gateway"

Expand All @@ -66,7 +66,7 @@ const GatewayLayerProfileName confsuite.ConformanceProfileName = "Gateway"
const SupportInferencePool features.FeatureName = "SupportInferencePool"

// InferenceCoreFeatures defines the core features that implementations
// of the "Gateway" profile for the Inference ExtensionRef MUST support.
// of the "Gateway" profile for the Inference Extension MUST support.
var InferenceCoreFeatures = sets.New(
features.SupportGateway, // This is needed to ensure manifest gets applied during setup.
features.SupportHTTPRoute,
Expand Down Expand Up @@ -104,7 +104,7 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
// Add APIExtensions types (for CRDs)
require.NoError(t, apiextensionsv1.AddToScheme(scheme), "failed to add apiextensionsv1 types to scheme")

// Register Inference ExtensionRef API types
// Register Inference Extension API types
t.Logf("Attempting to install inferencev1alpha2 types into scheme from package: %s", inferencev1alpha2.GroupName)
require.NoError(t, inferencev1alpha2.Install(scheme), "failed to install inferencev1alpha2 types into scheme")
t.Logf("Attempting to install inferencev1 types into scheme from package: %s", inferencev1.GroupName)
Expand Down Expand Up @@ -134,7 +134,7 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
*confflags.ImplementationContact,
)

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

Expand Down Expand Up @@ -189,15 +189,15 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
return opts
}

// RunConformance runs the Inference ExtensionRef conformance tests using default options.
// RunConformance runs the Inference Extension conformance tests using default options.
func RunConformance(t *testing.T) {
RunConformanceWithOptions(t, DefaultOptions(t))
}

// RunConformanceWithOptions runs the Inference ExtensionRef conformance tests with specific options.
// RunConformanceWithOptions runs the Inference Extension conformance tests with specific options.
func RunConformanceWithOptions(t *testing.T, opts confsuite.ConformanceOptions) {
t.Helper()
t.Logf("Running Inference ExtensionRef conformance tests with GatewayClass %s", opts.GatewayClassName)
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)

// Register the GatewayLayerProfile with the suite runner.
Expand All @@ -211,13 +211,13 @@ func RunConformanceWithOptions(t *testing.T, opts confsuite.ConformanceOptions)

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

t.Log("Running Inference ExtensionRef conformance tests against all registered tests")
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 ExtensionRef conformance report")
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{
Expand Down
2 changes: 1 addition & 1 deletion conformance/conformancereport.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

// Package conformance contains the core setup and execution logic
// for the Gateway API Inference ExtensionRef conformance test suite.
// for the Gateway API Inference Extension conformance test suite.
package conformance

import (
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package tests is the root package for all Gateway API Inference ExtensionRef
// Package tests is the root package for all Gateway API Inference Extension
// conformance test implementations.
package tests

Expand All @@ -30,6 +30,6 @@ import (
)

// ConformanceTests holds all the conformance tests definitions for the
// Gateway API Inference ExtensionRef suite. Tests are registered from other packages
// Gateway API Inference Extension suite. Tests are registered from other packages
// using init() functions like the one in the basic package.
var ConformanceTests []suite.ConformanceTest
4 changes: 2 additions & 2 deletions conformance/utils/assertions.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ limitations under the License.
*/

// Package assertions contains custom assertion helper functions used within
// the Gateway API Inference ExtensionRef conformance test suite.
// the Gateway API Inference Extension conformance test suite.
package assertions

// TODO: Implement custom assertion functions specific to Inference ExtensionRef testing.
// TODO: Implement custom assertion functions specific to Inference Extension testing.
// Examples might include:
// - Asserting specific fields or structures within an inference API response body.
// - Asserting specific metrics reported by mock model servers or EPPs.
Expand Down
6 changes: 4 additions & 2 deletions pkg/epp/controller/inferencepool_reconciler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ func TestInferencePoolReconciler(t *testing.T) {
pool1 := utiltest.MakeInferencePool("pool1").
Namespace("pool1-ns").
Selector(selector_v1).
ExtensionRef("epp-service").
TargetPortNumber(8080).ObjRef()
pool1.SetGroupVersionKind(gvk)
pool2 := utiltest.MakeInferencePool("pool2").Namespace("pool2-ns").ObjRef()
pool2 := utiltest.MakeInferencePool("pool2").Namespace("pool2-ns").ExtensionRef("epp-service").ObjRef()
pool2.SetGroupVersionKind(gvk)

// Set up the scheme.
Expand Down Expand Up @@ -219,8 +220,9 @@ func TestXInferencePoolReconciler(t *testing.T) {
pool1 := utiltest.MakeXInferencePool("pool1").
Namespace("pool1-ns").
Selector(selector_v1).
ExtensionRef("epp-service").
TargetPortNumber(8080).ObjRef()
pool2 := utiltest.MakeXInferencePool("pool2").Namespace("pool2-ns").ObjRef()
pool2 := utiltest.MakeXInferencePool("pool2").Namespace("pool2-ns").ExtensionRef("epp-service").ObjRef()
pool1.SetGroupVersionKind(gvk)
pool2.SetGroupVersionKind(gvk)

Expand Down
2 changes: 1 addition & 1 deletion pkg/epp/flowcontrol/controller/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ limitations under the License.
// # Architectural Deep Dive: The `EnqueueAndWait` Model
//
// A fundamental design choice is the synchronous, blocking `EnqueueAndWait` method. In the context of the Gateway API
// Inference ExtensionRef's Endpoint Picker (EPP), which operates as an Envoy External Processing (`ext_proc`) server, this
// Inference Extension's Endpoint Picker (EPP), which operates as an Envoy External Processing (`ext_proc`) server, this
// model is deliberately chosen for its simplicity and robustness.
//
// - Alignment with `ext_proc`: The `ext_proc` protocol is stream-based. A single goroutine within the EPP manages the
Expand Down
2 changes: 1 addition & 1 deletion pkg/epp/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ var (
prometheus.GaugeOpts{
Subsystem: InferenceExtension,
Name: "info",
Help: metricsutil.HelpMsgWithStability("General information of the current build of Inference ExtensionRef.", compbasemetrics.ALPHA),
Help: metricsutil.HelpMsgWithStability("General information of the current build of Inference Extension.", compbasemetrics.ALPHA),
},
[]string{"commit", "build_ref"},
)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/epp/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ func getYamlsFromModelServerManifest(modelServerManifestPath string) []string {
return modelServerManifestArray
}

// createCRDs creates the Inference ExtensionRef CRDs used for testing.
// createCRDs creates the Inference Extension CRDs used for testing.
func createCRDs(k8sClient client.Client, crds map[string]string) {
for name, path := range crds {
ginkgo.By("Creating CRD resource from manifest: " + path)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/epp/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var _ = ginkgo.Describe("InferencePool", func() {
}, existsTimeout, interval).Should(gomega.Succeed())
})

ginkgo.When("The Inference ExtensionRef is running", func() {
ginkgo.When("The Inference Extension is running", func() {
ginkgo.It("Should route traffic to target model servers", func() {
verifyTrafficRouting()
})
Expand Down