From 8abf66ce0f7c280c0052f80ebdaa9000f4846d19 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 1 Jun 2022 09:49:36 +0200 Subject: [PATCH] fixup --- .../crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml | 2 +- .../internal/controllers/extensionconfig_controller_test.go | 4 ++-- test/e2e/cluster_upgrade_runtimesdk_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml b/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml index 5dcbc543e4bc..944839fbfc3e 100644 --- a/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml +++ b/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml @@ -71,7 +71,7 @@ spec: type: string port: description: Port is the port on the service that hosting - ExtensionHandler. Default to 8443. `port` should be a valid + ExtensionHandler. Default to 443. `port` should be a valid port number (1-65535, inclusive). format: int32 type: integer diff --git a/exp/runtime/internal/controllers/extensionconfig_controller_test.go b/exp/runtime/internal/controllers/extensionconfig_controller_test.go index ea877a51247e..75bf10fc0ade 100644 --- a/exp/runtime/internal/controllers/extensionconfig_controller_test.go +++ b/exp/runtime/internal/controllers/extensionconfig_controller_test.go @@ -200,7 +200,7 @@ func TestExtensionReconciler_discoverExtensionConfig(t *testing.T) { extensionConfig := fakeExtensionConfigForURL(ns.Name, extensionName, srv1.URL) - discoveredExtensionConfig, err := discoverExtensionConfig(ctx, runtimeClient, extensionConfig) + discoveredExtensionConfig, err := discoverExtensionConfig(ctx, nil, runtimeClient, extensionConfig) g.Expect(err).To(BeNil()) // Expect exactly one handler and expect the name to be the handler name plus the extension name. @@ -232,7 +232,7 @@ func TestExtensionReconciler_discoverExtensionConfig(t *testing.T) { extensionConfig := fakeExtensionConfigForURL(ns.Name, extensionName, "http://localhost:31239") - discoveredExtensionConfig, err := discoverExtensionConfig(ctx, runtimeClient, extensionConfig) + discoveredExtensionConfig, err := discoverExtensionConfig(ctx, nil, runtimeClient, extensionConfig) g.Expect(err).ToNot(BeNil()) // Expect exactly one handler and expect the name to be the handler name plus the extension name. diff --git a/test/e2e/cluster_upgrade_runtimesdk_test.go b/test/e2e/cluster_upgrade_runtimesdk_test.go index aada165fbb8d..1107f6ecd504 100644 --- a/test/e2e/cluster_upgrade_runtimesdk_test.go +++ b/test/e2e/cluster_upgrade_runtimesdk_test.go @@ -148,7 +148,7 @@ func clusterUpgradeWithRuntimeSDKConformanceSpec(ctx context.Context, inputGette clusterResources = new(clusterctl.ApplyClusterTemplateAndWaitResult) }) - It("Should create and upgrade a workload cluster and eventually run kubetest", func() { + It("Should create and upgrade a workload cluster", func() { // FIXME(sbueringer): should we create an additional cluster and then deploy the extension there? (like self-hosted, ...) By("Deploy Test Extension") testExtensionDeployment, err := os.ReadFile(testExtensionPath) //nolint:gosec