Restore Pre upgrade fucntions

Author: pramodbindal

pkg/reconciler/shared/tektonconfig/upgrade/pre_upgrade.go

@@ -20,6 +20,9 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/tektoncd/operator/pkg/reconciler/kubernetes/tektonpruner"
+	"gopkg.in/yaml.v3"
+
 	"github.com/tektoncd/operator/pkg/apis/operator/v1alpha1"
 	"github.com/tektoncd/operator/pkg/client/clientset/versioned"
 	tektonresult "github.com/tektoncd/operator/pkg/reconciler/kubernetes/tektonresult"
@@ -115,6 +118,42 @@ func deleteTektonResultsTLSSecret(ctx context.Context, logger *zap.SugaredLogger
 	return nil
 }
 
+// TODO: Remove the preUpgradeTektonPruner upgrade function in next operator release
+func preUpgradeTektonPruner(ctx context.Context, logger *zap.SugaredLogger, k8sClient kubernetes.Interface, operatorClient versioned.Interface, restConfig *rest.Config) error {
+	// get tektonConfig CR
+	logger.Infof("Performing Preupgrade for TektonPruner")
+	tc, err := operatorClient.OperatorV1alpha1().TektonConfigs().Get(ctx, v1alpha1.ConfigResourceName, metav1.GetOptions{})
+	if err != nil {
+		logger.Errorw("error on getting TektonConfig CR", err)
+		return err
+	}
+
+	if tc.Spec.TektonPruner.IsDisabled() {
+		logger.Infof("TektonPruner is disabled, skipping pre-upgrade for TektonPruner")
+		return nil
+	}
+
+	var prunerConfig v1alpha1.TektonPrunerConfig
+	cm, err := k8sClient.CoreV1().ConfigMaps(tc.Spec.TargetNamespace).Get(ctx, tektonpruner.PrunerConfigMapName, metav1.GetOptions{})
+	if err != nil {
+		if apierrs.IsNotFound(err) {
+			prunerConfig = v1alpha1.TektonPrunerConfig{}
+		}
+	}
+	key := "global-config"
+	if cm != nil && cm.Data[key] != "" {
+		if err := yaml.Unmarshal([]byte(cm.Data[key]), &prunerConfig.GlobalConfig); err != nil {
+			logger.Errorf("error on Unmarshal TektonPruner ConfigMap data", err)
+			return err
+		}
+	}
+
+	tc.Spec.TektonPruner.GlobalConfig = prunerConfig.GlobalConfig
+
+	_, err = operatorClient.OperatorV1alpha1().TektonConfigs().Update(ctx, tc, metav1.UpdateOptions{})
+	return err
+}
+
 // preUpgradePipelinesAsCodeArtifacts checks if Pipelines as Code is installed and updates
 // the hub catalog settings to use the artifact hub URL. It cleans up hub-catalog-name from:
 // 1. TektonConfig CR settings

pkg/reconciler/shared/tektonconfig/upgrade/pre_upgrade_test.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/tektoncd/operator/pkg/reconciler/kubernetes/tektonpruner"
 	v1 "k8s.io/api/core/v1"
 	k8sFake "k8s.io/client-go/kubernetes/fake"
 
@@ -131,6 +132,69 @@ func TestUpgradePipelineProperties(t *testing.T) {
 	}
 }
 
+func TestPreUpgradeTektonPruner(t *testing.T) {
+	ctx := context.TODO()
+	operatorClient := operatorFake.NewSimpleClientset()
+	k8sClient := k8sFake.NewSimpleClientset()
+	logger := logging.FromContext(ctx).Named("unit-test")
+
+	// there is no tektonConfig CR available, returns error
+	err := preUpgradeTektonPruner(ctx, logger, k8sClient, operatorClient, nil)
+	assert.Error(t, err)
+
+	// create tekconConfig CR
+	tc := &v1alpha1.TektonConfig{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: v1alpha1.ConfigResourceName,
+		},
+		Spec: v1alpha1.TektonConfigSpec{
+			CommonSpec: v1alpha1.CommonSpec{
+				TargetNamespace: "foo",
+			},
+			TektonPruner: v1alpha1.Pruner{
+				Disabled: ptr.Bool(false),
+			},
+		},
+	}
+	_, err = operatorClient.OperatorV1alpha1().TektonConfigs().Create(ctx, tc, metav1.CreateOptions{})
+	assert.NoError(t, err)
+
+	// there is no tekton-config configMap, return no error
+	err = preUpgradeTektonPruner(ctx, logger, k8sClient, operatorClient, nil)
+	assert.NoError(t, err)
+
+	// verify chains existing field, should not be empty
+	tc, err = operatorClient.OperatorV1alpha1().TektonConfigs().Get(ctx, v1alpha1.ConfigResourceName, metav1.GetOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, false, *tc.Spec.TektonPruner.Disabled)
+
+	// create a config map with values
+	config := &v1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      tektonpruner.PrunerConfigMapName,
+			Namespace: tc.Spec.GetTargetNamespace(),
+		},
+		Data: map[string]string{
+			"global-config": "enforcedConfigLevel: global\nttlSecondsAfterFinished: 88\nsuccessfulHistoryLimit: 400\nfailedHistoryLimit: 10\nhistoryLimit: 10\nnamespaces: {}\n",
+		},
+	}
+	_, err = k8sClient.CoreV1().ConfigMaps(tc.Spec.GetTargetNamespace()).Create(ctx, config, metav1.CreateOptions{})
+	assert.NoError(t, err)
+
+	cm, _ := k8sClient.CoreV1().ConfigMaps(tc.Spec.GetTargetNamespace()).Get(ctx, tektonpruner.PrunerConfigMapName, metav1.GetOptions{})
+	assert.NotNil(t, cm.Data)
+
+	// execute chains upgrade
+	err = preUpgradeTektonPruner(ctx, logger, k8sClient, operatorClient, nil)
+	assert.NoError(t, err)
+
+	// verify chains with new configMap, map values should be updated
+	tc, err = operatorClient.OperatorV1alpha1().TektonConfigs().Get(ctx, v1alpha1.ConfigResourceName, metav1.GetOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, false, *tc.Spec.TektonPruner.Disabled)
+	assert.Equal(t, int32(88), *tc.Spec.TektonPruner.GlobalConfig.TTLSecondsAfterFinished)
+}
+
 func TestPreUpgradePipelinesAsCodeArtifacts(t *testing.T) {
 	t.Setenv("PLATFORM", "openshift")