Fix: Pruner Config resetting to default when set to null

When HistoryLimit is set to null in tektonconfig then it resets back to 100
After this fix value will be retained

This also fisxes the issues ot pruner confog resetting to default on upgrade.
Now after upgrade pruner should retain the old config

Restore Pre upgrade fucntions

Author: pramodbindal

pkg/apis/operator/v1alpha1/tektonconfig_validation_test.go

@@ -318,7 +318,7 @@ func Test_ValidateTektonConfig_PrunerConfig_Valid(t *testing.T) {
 			TektonPruner: Pruner{
 				Disabled: &disabled,
 				TektonPrunerConfig: TektonPrunerConfig{
-					GlobalConfig: config.GlobalConfig{
+					GlobalConfig: &config.GlobalConfig{
 						PrunerConfig: config.PrunerConfig{
 							SuccessfulHistoryLimit: ptr.Int32(5),
 							HistoryLimit:           ptr.Int32(10),
@@ -354,7 +354,7 @@ func Test_ValidateTektonConfig_PrunerConfig_Invalid(t *testing.T) {
 			TektonPruner: Pruner{
 				Disabled: &disabled,
 				TektonPrunerConfig: TektonPrunerConfig{
-					GlobalConfig: config.GlobalConfig{
+					GlobalConfig: &config.GlobalConfig{
 						PrunerConfig: config.PrunerConfig{
 							SuccessfulHistoryLimit: ptr.Int32(-1), // Invalid: negative value
 						},

pkg/apis/operator/v1alpha1/tektonpruner_defaults.go

@@ -18,6 +18,8 @@ package v1alpha1
 
 import (
 	"context"
+
+	"github.com/tektoncd/pruner/pkg/config"
 )
 
 var DefaultPrunerDisabled = true
@@ -30,5 +32,8 @@ func (p *Pruner) SetDefaults() {
 	if p.Disabled == nil {
 		p.Disabled = &DefaultPrunerDisabled
 	}
-	p.GlobalConfig.SetDefaults()
+	if p.GlobalConfig == nil {
+		p.GlobalConfig = &config.GlobalConfig{}
+		p.GlobalConfig.SetDefaults()
+	}
 }

pkg/apis/operator/v1alpha1/tektonpruner_types.go

@@ -42,7 +42,7 @@ type TektonPruner struct {
 }
 
 type TektonPrunerConfig struct {
-	GlobalConfig config.GlobalConfig `json:"global-config"`
+	GlobalConfig *config.GlobalConfig `json:"global-config"`
 }
 
 type Pruner struct {

pkg/apis/operator/v1alpha1/tektonpruner_validation.go

@@ -59,7 +59,7 @@ func (p *Pruner) validate(path string) *apis.FieldError {
 	// Use the new ValidateGlobalConfig function from pruner package
 	// This validates the GlobalConfig struct directly without ConfigMap conversion
 	// This is the recommended approach for operator CRDs as documented in pruner PR #57
-	if err := config.ValidateGlobalConfig(&p.TektonPrunerConfig.GlobalConfig); err != nil {
+	if err := config.ValidateGlobalConfig(p.TektonPrunerConfig.GlobalConfig); err != nil {
 		return apis.ErrGeneric(
 			fmt.Sprintf("pruner config validation failed: %v", err),
 			path+".global-config",

pkg/apis/operator/v1alpha1/tektonpruner_validation_test.go

@@ -39,7 +39,7 @@ func Test_ValidateTektonPruner_ValidConfig(t *testing.T) {
 			Pruner: Pruner{
 				Disabled: &disabled,
 				TektonPrunerConfig: TektonPrunerConfig{
-					GlobalConfig: config.GlobalConfig{
+					GlobalConfig: &config.GlobalConfig{
 						PrunerConfig: config.PrunerConfig{
 							SuccessfulHistoryLimit: ptr.Int32(5),
 							HistoryLimit:           ptr.Int32(10),
@@ -70,7 +70,7 @@ func Test_ValidateTektonPruner_DisabledPruner(t *testing.T) {
 				Disabled: &disabled,
 				// Even with invalid config, validation should pass when disabled
 				TektonPrunerConfig: TektonPrunerConfig{
-					GlobalConfig: config.GlobalConfig{
+					GlobalConfig: &config.GlobalConfig{
 						PrunerConfig: config.PrunerConfig{
 							SuccessfulHistoryLimit: ptr.Int32(-1), // This would be invalid if enabled
 						},
@@ -99,7 +99,7 @@ func Test_ValidateTektonPruner_InvalidHistoryLimit(t *testing.T) {
 			Pruner: Pruner{
 				Disabled: &disabled,
 				TektonPrunerConfig: TektonPrunerConfig{
-					GlobalConfig: config.GlobalConfig{
+					GlobalConfig: &config.GlobalConfig{
 						PrunerConfig: config.PrunerConfig{
 							SuccessfulHistoryLimit: ptr.Int32(-1), // Invalid: must be >= 0
 						},
@@ -187,7 +187,7 @@ func Test_ValidateTektonPruner_ComplexValidConfig(t *testing.T) {
 			Pruner: Pruner{
 				Disabled: &disabled,
 				TektonPrunerConfig: TektonPrunerConfig{
-					GlobalConfig: config.GlobalConfig{
+					GlobalConfig: &config.GlobalConfig{
 						PrunerConfig: config.PrunerConfig{
 							SuccessfulHistoryLimit: ptr.Int32(5),
 							FailedHistoryLimit:     ptr.Int32(3),

pkg/reconciler/common/transformers_test.go

@@ -602,7 +602,7 @@ func TestAddConfigMapValues_StructValues(t *testing.T) {
 	manifest, err := mf.ManifestFrom(mf.Recursive(testData))
 	assertNoError(t, err)
 	prop := v1alpha1.TektonPrunerConfig{
-		GlobalConfig: config.GlobalConfig{
+		GlobalConfig: &config.GlobalConfig{
 			PrunerConfig: config.PrunerConfig{
 				SuccessfulHistoryLimit: ptr.Int32(123),
 				HistoryLimit:           ptr.Int32(456),

test/resources/tektonpruner.go

@@ -55,7 +55,7 @@ func EnsureTektonPrunerExists(clients TektonPrunerv1alpha1.TektonPrunerInterface
 				},
 				Pruner: v1alpha1.Pruner{
 					TektonPrunerConfig: v1alpha1.TektonPrunerConfig{
-						GlobalConfig: config.GlobalConfig{
+						GlobalConfig: &config.GlobalConfig{
 							PrunerConfig: config.PrunerConfig{
 								SuccessfulHistoryLimit: ptr.Int32(12),
 								HistoryLimit:           ptr.Int32(45),