Skip to content

Commit b5e115d

Browse files
authored
chore: add conformance suite client options (#3343)
pass options to the Kubernetes client
1 parent f5b5bab commit b5e115d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

conformance/conformance.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ import (
4545
func DefaultOptions(t *testing.T) suite.ConformanceOptions {
4646
cfg, err := config.GetConfig()
4747
require.NoError(t, err, "error loading Kubernetes config")
48-
client, err := client.New(cfg, client.Options{})
48+
clientOptions := client.Options{}
49+
client, err := client.New(cfg, clientOptions)
4950
require.NoError(t, err, "error initializing Kubernetes client")
5051

5152
// This clientset is needed in addition to the client only because
@@ -79,6 +80,7 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {
7980
AllowCRDsMismatch: *flags.AllowCRDsMismatch,
8081
CleanupBaseResources: *flags.CleanupBaseResources,
8182
Client: client,
83+
ClientOptions: clientOptions,
8284
Clientset: clientset,
8385
ConformanceProfiles: conformanceProfiles,
8486
Debug: *flags.ShowDebug,

conformance/utils/suite/suite.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import (
5656
// conformance tests.
5757
type ConformanceTestSuite struct {
5858
Client client.Client
59+
ClientOptions client.Options
5960
Clientset clientset.Interface
6061
RESTClient *rest.RESTClient
6162
RestConfig *rest.Config
@@ -123,6 +124,7 @@ type ConformanceTestSuite struct {
123124
// Options can be used to initialize a ConformanceTestSuite.
124125
type ConformanceOptions struct {
125126
Client client.Client
127+
ClientOptions client.Options
126128
Clientset clientset.Interface
127129
RestConfig *rest.Config
128130
GatewayClassName string
@@ -234,6 +236,7 @@ func NewConformanceTestSuite(options ConformanceOptions) (*ConformanceTestSuite,
234236

235237
suite := &ConformanceTestSuite{
236238
Client: options.Client,
239+
ClientOptions: options.ClientOptions,
237240
Clientset: options.Clientset,
238241
RestConfig: options.RestConfig,
239242
RoundTripper: roundTripper,
@@ -398,7 +401,7 @@ func (suite *ConformanceTestSuite) setClientsetForTest(test ConformanceTest) err
398401
strings.Join(featureNames, ","),
399402
},
400403
"::")
401-
client, err := client.New(suite.RestConfig, client.Options{})
404+
client, err := client.New(suite.RestConfig, suite.ClientOptions)
402405
if err != nil {
403406
return err
404407
}

0 commit comments

Comments
 (0)