chore: remove unused references of kubernetes-configuration and webhook constants (#2384)

Author: programmer04

ingress-controller/test/consts/consts.go

@@ -45,7 +45,6 @@ import (
 
 	"github.com/kong/kong-operator/ingress-controller/internal/annotations"
 	"github.com/kong/kong-operator/ingress-controller/test"
-	conststest "github.com/kong/kong-operator/ingress-controller/test/consts"
 	"github.com/kong/kong-operator/ingress-controller/test/internal/helpers"
 	"github.com/kong/kong-operator/ingress-controller/test/internal/testenv"
 )
@@ -109,8 +108,9 @@ func setupE2ETest(t *testing.T, addons ...clusters.Addon) (context.Context, envi
 	require.NoError(t, err)
 	logClusterInfo(t, env.Cluster())
 
-	t.Logf("deploying KIC Incubator CRDs from %s (since they are not packaged with base CRDs)", conststest.IncubatorCRDKustomizeDir)
-	require.NoError(t, clusters.KustomizeDeployForCluster(ctx, env.Cluster(), conststest.IncubatorCRDKustomizeDir))
+	const incubatorCRDKustomizeDir = "../../config/crd/incubator"
+	t.Logf("deploying KIC Incubator CRDs from %s (since they are not packaged with base CRDs)", incubatorCRDKustomizeDir)
+	require.NoError(t, clusters.KustomizeDeployForCluster(ctx, env.Cluster(), incubatorCRDKustomizeDir))
 
 	t.Cleanup(func() {
 		output := helpers.DumpDiagnosticsIfFailed(ctx, t, env.Cluster())

ingress-controller/test/e2e/helpers_test.go

@@ -11,10 +11,6 @@ import (
 )
 
 const (
-	// kubernetesConfigurationModulePath is the kubernetes-configuration path used by the kustomize.
-	// It's different than the path used by Go mod related functions as these do change
-	// based on the major version of the module used whereas this one doesn't.
-	kubernetesConfigurationModulePath = "github.com/kong/kubernetes-configuration"
 	// ingressControllerModulePath points to Kubernetes configuration for KGO, since KIC part
 	// only needs a subset of it, so a dedicated one is not needed.
 	ingressControllerLocalPath = "./"

ingress-controller/test/util/gomod.go

@@ -137,28 +137,6 @@ const (
 	KongClusterCertVolumeMountPath = "/etc/secrets/kong-cluster-cert"
 )
 
-// -----------------------------------------------------------------------------
-// Consts - Webhook-related parameters
-// -----------------------------------------------------------------------------
-
-const (
-	// WebhookCertificateConfigBaseImage is the image to use by the certificate config Jobs.
-	WebhookCertificateConfigBaseImage = "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.3.0"
-	// WebhookCertificateConfigShellImage is the image to use by the certificate config Jobs.
-	WebhookCertificateConfigShellImage = "busybox"
-	// WebhookName is the ValidatingWebhookConfiguration name.
-	WebhookName = "gateway-operator-validation.konghq.com"
-	// WebhookCertificateConfigSecretName is the name of the secret containing the webhook certificate.
-	WebhookCertificateConfigSecretName = "gateway-operator-webhook-certs"
-	// WebhookCertificateConfigName is the name given to the resources related by the certificate config Jobs.
-	WebhookCertificateConfigName = "gateway-operator-admission"
-	// WebhookCertificateConfigLabelvalue is the default label for all the resources related
-	// to the certificate config Jobs.
-	WebhookCertificateConfigLabelvalue = "gateway-operator-certificate-config"
-	// WebhookServiceName is the name of the service that exposes the validating webhook
-	WebhookServiceName = "gateway-operator-validating-webhook"
-)
-
 // -----------------------------------------------------------------------------
 // Consts - Kong proxy environment variables
 // -----------------------------------------------------------------------------

ingress-controller/test/util/kustomize_consts.go

@@ -30,17 +30,6 @@ import (
 	operatorclient "github.com/kong/kong-operator/pkg/clientset"
 )
 
-const (
-	// KubernetesConfigurationModuleName is the name of the module where we import and install Kong configuration CRDs from.
-	KubernetesConfigurationModuleName = "github.com/kong/kubernetes-configuration/v2"
-	// GatewayAPIModuleName is the name of the module where we import and install Gateway API CRDs from.
-	GatewayAPIModuleName = "sigs.k8s.io/gateway-api"
-)
-
-func noOpClose() error {
-	return nil
-}
-
 // SetupControllerLogger sets up the controller logger.
 // This functions needs to be called before 30sec after the controller packages
 // is loaded, otherwise the logger will not be initialized.
@@ -57,7 +46,10 @@ func SetupControllerLogger(controllerManagerOut string) (func() error, error) {
 	if controllerManagerOut != "stdout" {
 		out, err := os.CreateTemp("", "gateway-operator-controller-logs")
 		if err != nil {
-			return noOpClose, err
+			// noOpClose
+			return func() error {
+				return nil
+			}, err
 		}
 		fmt.Printf("INFO: controller output is being logged to %s\n", out.Name())
 		destWriter = out

pkg/consts/consts.go

@@ -17,15 +17,15 @@ func TestConstructModulePath(t *testing.T) {
 	}{
 		{
 			name:       "simple module",
-			moduleName: "github.com/kong/kubernetes-configuration",
+			moduleName: "github.com/kong/example-module",
 			version:    "v1.0.0",
-			expected:   filepath.Join(build.Default.GOPATH, "pkg", "mod", "github.com", "kong", "kubernetes-configuration@v1.0.0"),
+			expected:   filepath.Join(build.Default.GOPATH, "pkg", "mod", "github.com", "kong", "example-module@v1.0.0"),
 		},
 		{
 			name:       "simple module v2",
-			moduleName: "github.com/kong/kubernetes-configuration/v2",
+			moduleName: "github.com/kong/example-module/v2",
 			version:    "v2.0.0",
-			expected:   filepath.Join(build.Default.GOPATH, "pkg", "mod", "github.com", "kong", "kubernetes-configuration", "[email protected]"),
+			expected:   filepath.Join(build.Default.GOPATH, "pkg", "mod", "github.com", "kong", "example-module", "[email protected]"),
 		},
 		{
 			name:       "module with subdomain",

pkg/utils/test/setup_helpers.go

@@ -29,10 +29,12 @@ import (
 func Setup(t *testing.T, ctx context.Context, scheme *k8sruntime.Scheme) (*rest.Config, *corev1.Namespace) {
 	t.Helper()
 
-	gwAPIVersion, err := testutil.ExtractModuleVersion(testutil.GatewayAPIModuleName)
+	// GatewayAPIModuleName is the name of the module where we import and install Gateway API CRDs from.
+	const gatewayAPIModuleName = "sigs.k8s.io/gateway-api"
+	gwAPIVersion, err := testutil.ExtractModuleVersion(gatewayAPIModuleName)
 	require.NoError(t, err)
 	gwAPICRDPath := filepath.Join(
-		testutil.ConstructModulePath(testutil.GatewayAPIModuleName, gwAPIVersion),
+		testutil.ConstructModulePath(gatewayAPIModuleName, gwAPIVersion),
 		"config", "crd", "standard",
 	)