rm dead code

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

Author: eddycharly

.crds/chainsaw.kyverno.io_configurations.yaml

@@ -845,6 +845,7 @@ spec:
                   tests (implies SkipClusterDelete).
                 type: boolean
               template:
+                default: true
                 description: Template determines whether resources should be considered
                   for templating.
                 type: boolean

.schemas/json/configuration-chainsaw-v1alpha1.json

@@ -1646,7 +1646,8 @@
           "type": [
             "boolean",
             "null"
-          ]
+          ],
+          "default": true
         },
         "testFile": {
           "description": "TestFile is the name of the file containing the test to run.\nIf no extension is provided, chainsaw will try with .yaml first and .yml if needed.",

pkg/apis/conversion/configuration.go

@@ -27,7 +27,7 @@ func Convert_v1alpha2_ConfigurationSpec_To_v1alpha1_ConfigurationSpec(in *v1alph
 		out.ReportPath = in.Path
 		out.ReportName = in.Name
 	}
-	out.Template = &in.Templating.Enabled
+	out.Template = in.Templating.Enabled
 	out.Timeouts = in.Timeouts
 	return nil
 }
@@ -65,14 +65,8 @@ func Convert_v1alpha1_ConfigurationSpec_To_v1alpha2_ConfigurationSpec(in *v1alph
 		Path:   in.ReportPath,
 		Name:   in.ReportName,
 	}
-	if in.Template == nil {
-		out.Templating = v1alpha2.TemplatingOptions{
-			Enabled: true,
-		}
-	} else {
-		out.Templating = v1alpha2.TemplatingOptions{
-			Enabled: *in.Template,
-		}
+	out.Templating = v1alpha2.TemplatingOptions{
+		Enabled: in.Template,
 	}
 	out.Timeouts = in.Timeouts
 	return nil

pkg/apis/v1alpha1/configuration.go

@@ -34,7 +34,8 @@ type ConfigurationSpec struct {
 
 	// Template determines whether resources should be considered for templating.
 	// +optional
-	Template *bool `json:"template,omitempty"`
+	// +kubebuilder:default:=true
+	Template bool `json:"template"`
 
 	// FailFast determines whether the test should stop upon encountering the first failure.
 	// +optional

pkg/apis/v1alpha1/zz_generated.deepcopy.go

@@ -14,7 +14,6 @@ import (
 	"github.com/kyverno/chainsaw/pkg/loaders/values"
 	"github.com/kyverno/chainsaw/pkg/runner"
 	"github.com/kyverno/chainsaw/pkg/runner/failer"
-	"github.com/kyverno/chainsaw/pkg/runner/template"
 	flagutils "github.com/kyverno/chainsaw/pkg/utils/flag"
 	fsutils "github.com/kyverno/chainsaw/pkg/utils/fs"
 	restutils "github.com/kyverno/chainsaw/pkg/utils/rest"
@@ -349,7 +348,7 @@ func Command() *cobra.Command {
 	// namespace options
 	cmd.Flags().StringVar(&options.namespace, "namespace", "", "Namespace to use for tests")
 	// templating options
-	cmd.Flags().BoolVar(&options.template, "template", template.DefaultTemplate, "If set, resources will be considered for templating")
+	cmd.Flags().BoolVar(&options.template, "template", config.Spec.Templating.Enabled, "If set, resources will be considered for templating")
 	// cleanup options
 	cmd.Flags().BoolVar(&options.skipDelete, "skip-delete", false, "If set, do not delete the resources after running the tests")
 	cmd.Flags().DurationVar(&options.delayBeforeCleanup.Duration, "cleanup-delay", 0, "Adds a delay between the time a test ends and the time cleanup starts")

pkg/commands/test/command.go

@@ -845,6 +845,7 @@ spec:
                   tests (implies SkipClusterDelete).
                 type: boolean
               template:
+                default: true
                 description: Template determines whether resources should be considered
                   for templating.
                 type: boolean

pkg/data/crds/chainsaw.kyverno.io_configurations.yaml

@@ -1646,7 +1646,8 @@
           "type": [
             "boolean",
             "null"
-          ]
+          ],
+          "default": true
         },
         "testFile": {
           "description": "TestFile is the name of the file containing the test to run.\nIf no extension is provided, chainsaw will try with .yaml first and .yml if needed.",

pkg/data/schemas/json/configuration-chainsaw-v1alpha1.json

@@ -852,7 +852,6 @@ func TestStepProcessor_Run(t *testing.T) {
 	}}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
 			registry := registryMock{}
 			if tc.client != nil {
 				registry.client = tc.client
@@ -874,7 +873,6 @@ func TestStepProcessor_Run(t *testing.T) {
 			ctx = logging.IntoContext(ctx, &fakeLogger.FakeLogger{})
 			tcontext := enginecontext.MakeContext(binding.NewBindings(), registry)
 			stepProcessor.Run(ctx, tcontext)
-			nt.Cleanup(func() {})
 			if tc.expectedFail {
 				assert.True(t, nt.FailedVar, "expected an error but got none")
 			} else {

pkg/runner/processors/step_test.go

@@ -6,6 +6,7 @@ metadata:
   name: configuration
 spec:
   parallel: 4
+  template: false
   timeouts:
     apply: 5m0s
     assert: 5m0s

pkg/runner/template/template.go

@@ -6,6 +6,7 @@ metadata:
   name: configuration
 spec:
   parallel: 4
+  template: false
   timeouts:
     apply: 5m0s
     assert: 5m0s