feat: allow passing additional flags to kubectl kustomize (#741)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.32.0
+
+- Allow passing additional flags to kubectl kustomize in
+  `KustomizeDeployForCluster` and `KustomizeDeleteForCluster`.
+  [#741](https://github.com/Kong/kubernetes-testing-framework/pull/741)
+
 ## v0.31.2
 
 - Bump Kong Gateway Enterprise default image to 3.3

pkg/clusters/utils.go

@@ -209,53 +209,57 @@ func CleanupGeneratedResources(ctx context.Context, cluster Cluster, creatorID s
 }
 
 // KustomizeDeployForCluster applies a given kustomizeURL to the provided cluster
-func KustomizeDeployForCluster(ctx context.Context, cluster Cluster, kustomizeURL string) error {
-	// generate the kustomize YAML
+func KustomizeDeployForCluster(ctx context.Context, cluster Cluster, kustomizeURL string, flags ...string) error {
 	stdout, stderr := new(bytes.Buffer), new(bytes.Buffer)
-	cmd := exec.CommandContext(ctx, "kubectl", "-v9", "kustomize", kustomizeURL)
+	args := append([]string{"-v9", "apply", "-k", kustomizeURL},
+		flags...,
+	)
+	cmd := exec.CommandContext(ctx, "kubectl", args...)
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr
 	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to deploy kong CRDs STDOUT=(%s) STDERR=(%s): %w", stdout.String(), stderr.String(), err)
+		return fmt.Errorf("failed to deploy %s for cluster %s: STDOUT=(%s) STDERR=(%s): %w",
+			kustomizeURL, cluster.Name(), stdout.String(), stderr.String(), err,
+		)
 	}
-
-	// apply the kustomize YAML to the cluster
-	return ApplyManifestByYAML(ctx, cluster, stdout.String())
+	return nil
 }
 
 // KustomizeDeleteForCluster deletes the provided kustomize manafests from the cluster
-func KustomizeDeleteForCluster(ctx context.Context, cluster Cluster, kustomizeURL string) error {
-	// generate the kustomize YAML
+func KustomizeDeleteForCluster(ctx context.Context, cluster Cluster, kustomizeURL string, flags ...string) error {
 	stdout, stderr := new(bytes.Buffer), new(bytes.Buffer)
-	cmd := exec.CommandContext(ctx, "kubectl", "-v9", "kustomize", kustomizeURL)
+	args := append([]string{"-v9", "delete", "-k", kustomizeURL},
+		flags...,
+	)
+	cmd := exec.CommandContext(ctx, "kubectl", args...)
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr
 	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to deploy kong CRDs STDOUT=(%s) STDERR=(%s): %w", stdout.String(), stderr.String(), err)
+		return fmt.Errorf("failed to delete %s for cluster %s: STDOUT=(%s) STDERR=(%s): %w",
+			kustomizeURL, cluster.Name(), stdout.String(), stderr.String(), err,
+		)
 	}
-
-	// apply the kustomize YAML to the cluster
-	return DeleteManifestByYAML(ctx, cluster, stdout.String())
+	return nil
 }
 
 // ApplyManifestByURL applies a given manifest URL to the cluster provided
 func ApplyManifestByURL(ctx context.Context, cluster Cluster, url string) error {
-	return kubectlSubcommandWithYAML(ctx, cluster, "apply", url, true)
+	return kubectlWithArgs(ctx, cluster, "apply", "-f", url)
 }
 
 // DeleteManifestByURL deletes a given manifest URL on the cluster provided
 func DeleteManifestByURL(ctx context.Context, cluster Cluster, url string) error {
-	return kubectlSubcommandWithYAML(ctx, cluster, "delete", url, true)
+	return kubectlWithArgs(ctx, cluster, "delete", "-f", url)
 }
 
 // ApplyManifestByYAML applies a given YAML manifest to the cluster provided
 func ApplyManifestByYAML(ctx context.Context, cluster Cluster, yaml string) error {
-	return kubectlSubcommandWithYAML(ctx, cluster, "apply", yaml, false)
+	return kubectlSubcommandWithYAML(ctx, cluster, "apply", yaml)
 }
 
 // DeleteManifestByYAML deletes a given YAML manifest on the cluster provided
 func DeleteManifestByYAML(ctx context.Context, cluster Cluster, yaml string) error {
-	return kubectlSubcommandWithYAML(ctx, cluster, "delete", yaml, false)
+	return kubectlSubcommandWithYAML(ctx, cluster, "delete", yaml)
 }
 
 // WaitForCondition waits for a condition to be true for an object on the
@@ -292,27 +296,36 @@ func WaitForCondition(ctx context.Context, cluster Cluster, namespace, objectTyp
 // Private Functions
 // -----------------------------------------------------------------------------
 
-func kubectlSubcommandWithYAML(ctx context.Context, cluster Cluster, subcommand, yaml string, isURL bool) error {
+func kubectlWithArgs(ctx context.Context, cluster Cluster, args ...string) error {
 	// generate a kubeconfig tempfile since we'll be using kubectl
 	kubeconfig, err := TempKubeconfig(cluster)
 	if err != nil {
 		return err
 	}
 	defer os.Remove(kubeconfig.Name())
 
-	// if the provided YAML comes from a URL, we can short circuit as kubectl
-	// will allow a URL to be provided directly.
-	if isURL {
-		stdout, stderr := new(bytes.Buffer), new(bytes.Buffer)
-		cmd := exec.CommandContext(ctx, "kubectl", "--kubeconfig", kubeconfig.Name(), subcommand, "-f", yaml) //nolint:gosec
-		cmd.Stdout = stdout
-		cmd.Stderr = stderr
-		if err := cmd.Run(); err != nil {
-			return fmt.Errorf("command %q failed STDERR=(%s) STDERR=(%s): %w", cmd.String(), stdout.String(), stderr.String(), err)
-		}
-		return nil
+	stdout, stderr := new(bytes.Buffer), new(bytes.Buffer)
+	args = append([]string{"--kubeconfig", kubeconfig.Name()},
+		args...,
+	)
+	cmd := exec.CommandContext(ctx, "kubectl", args...) //nolint:gosec
+	cmd.Stdout = stdout
+	cmd.Stderr = stderr
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("command %q failed STDERR=(%s) STDERR=(%s): %w", cmd.String(), stdout.String(), stderr.String(), err)
 	}
 
+	return nil
+}
+
+func kubectlSubcommandWithYAML(ctx context.Context, cluster Cluster, subcommand, yaml string) error {
+	// generate a kubeconfig tempfile since we'll be using kubectl
+	kubeconfig, err := TempKubeconfig(cluster)
+	if err != nil {
+		return err
+	}
+	defer os.Remove(kubeconfig.Name())
+
 	// configure the command to read YAML from STDIN
 	stdout, stderr := new(bytes.Buffer), new(bytes.Buffer)
 	cmd := exec.CommandContext(ctx, "kubectl", "--kubeconfig", kubeconfig.Name(), subcommand, "-f", "-") //nolint:gosec