Fix installerset issue for resolver task and stepaction

tektoncd · Sep 3, 2024 · 4dc3d2c · 4dc3d2c
1 parent 8f219d2
commit 4dc3d2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/reconciler/openshift/tektonaddon/resolver_task.go b/pkg/reconciler/openshift/tektonaddon/resolver_task.go
@@ -26,12 +26,12 @@ import (
 )
 
 func (r *Reconciler) EnsureResolverTask(ctx context.Context, enable string, ta *v1alpha1.TektonAddon) error {
-	manifest := r.resolverTaskManifest
+	manifest := *r.resolverTaskManifest
 	return r.ensureCustomSet(ctx, enable, ResolverTaskInstallerSet, ta, manifest, r.getTransformer(ctx, KindTask, false))
 }
 
 func (r *Reconciler) EnsureResolverStepAction(ctx context.Context, enable string, ta *v1alpha1.TektonAddon) error {
-	manifest := r.resolverStepActionManifest
+	manifest := *r.resolverStepActionManifest
 	return r.ensureCustomSet(ctx, enable, ResolverStepActionInstallerSet, ta, manifest, r.getTransformer(ctx, KindStepAction, false))
 }
 
@@ -57,9 +57,9 @@ func (r *Reconciler) getTransformer(ctx context.Context, kind string, isVersione
 }
 
 func (r *Reconciler) ensureCustomSet(ctx context.Context, enable, installerSetName string, ta *v1alpha1.TektonAddon,
-	manifest *mf.Manifest, tfs []mf.Transformer) error {
+	manifest mf.Manifest, tfs []mf.Transformer) error {
 	if enable == "true" {
-		if err := r.installerSetClient.CustomSet(ctx, ta, installerSetName, manifest, filterAndTransformResolverTask(tfs), nil); err != nil {
+		if err := r.installerSetClient.CustomSet(ctx, ta, installerSetName, &manifest, filterAndTransformResolverTask(tfs), nil); err != nil {
 			return err
 		}
 	} else {

diff --git a/pkg/reconciler/openshift/tektonaddon/resolver_task_versioned.go b/pkg/reconciler/openshift/tektonaddon/resolver_task_versioned.go
@@ -24,19 +24,19 @@ import (
 )
 
 func (r *Reconciler) EnsureVersionedResolverTask(ctx context.Context, enable string, ta *v1alpha1.TektonAddon) error {
-	manifest := r.resolverTaskManifest
+	manifest := *r.resolverTaskManifest
 	return r.ensureVersionedCustomSet(ctx, enable, VersionedResolverTaskInstallerSet, installerSetNameForResolverTasks, ta, manifest, r.getTransformer(ctx, KindTask, true))
 }
 
 func (r *Reconciler) EnsureVersionedResolverStepAction(ctx context.Context, enable string, ta *v1alpha1.TektonAddon) error {
-	manifest := r.resolverStepActionManifest
+	manifest := *r.resolverStepActionManifest
 	return r.ensureVersionedCustomSet(ctx, enable, VersionedResolverStepActionInstallerSet, installerSetNameForResolverStepAction, ta, manifest, r.getTransformer(ctx, KindStepAction, true))
 }
 
 func (r *Reconciler) ensureVersionedCustomSet(ctx context.Context, enable, installerSetType, installerSetName string, ta *v1alpha1.TektonAddon,
-	manifest *mf.Manifest, tfs []mf.Transformer) error {
+	manifest mf.Manifest, tfs []mf.Transformer) error {
 	if enable == "true" {
-		if err := r.installerSetClient.VersionedTaskSet(ctx, ta, manifest, filterAndTransformResolverTask(tfs),
+		if err := r.installerSetClient.VersionedTaskSet(ctx, ta, &manifest, filterAndTransformResolverTask(tfs),
 			installerSetType, installerSetName); err != nil {
 			return err
 		}