Merge pull request #273 from 3scale-ops/fix-tekton-resources-reconcile

Fix tekton reconciliation after upgrade to ocp 4.12
3scale-ops · Oct 13, 2023 · 08ac506 · 08ac506
2 parents 8904936 + 10c3005
commit 08ac506
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/3scale/saas-operator
 go 1.20
 
 require (
-	github.com/3scale-ops/basereconciler v0.3.2
+	github.com/3scale-ops/basereconciler v0.3.3
 	github.com/3scale-ops/marin3r v0.12.2
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/aws/aws-sdk-go-v2 v1.21.0

diff --git a/go.sum b/go.sum
@@ -35,8 +35,8 @@ contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/g
 contrib.go.opencensus.io/exporter/prometheus v0.4.0 h1:0QfIkj9z/iVZgK31D9H9ohjjIDApI2GOPScCKwxedbs=
 contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/3scale-ops/basereconciler v0.3.2 h1:mBekSSp4ccMK1inBWYnlbFmSGcEWtixq2yZrqdMYfQc=
-github.com/3scale-ops/basereconciler v0.3.2/go.mod h1:SY0phdSkPSdE1BFR0MzS9Ze9y33+hGhuZGJIk2+AxFk=
+github.com/3scale-ops/basereconciler v0.3.3 h1:NEr9cfQuouUjTMMnqgdvsbTorVONw/8AHrwHOtNAdOY=
+github.com/3scale-ops/basereconciler v0.3.3/go.mod h1:tPJ50gfzbDC52reWkDDaEHO1leuRx9JzqggwIRA+cL0=
 github.com/3scale-ops/marin3r v0.12.2 h1:sU4N7RZ5AQzfejrfP0KgpagmL/XD8a5NdSIv1qvaAnU=
 github.com/3scale-ops/marin3r v0.12.2/go.mod h1:BOU7EFv58PgPMgKgJFDd4ingfBhH6KC2AGJoD7i9SaU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

diff --git a/pkg/generators/system/tekton_pipeline.go b/pkg/generators/system/tekton_pipeline.go
@@ -30,6 +30,7 @@ func (gen *SystemTektonGenerator) pipeline() func() *pipelinev1beta1.Pipeline {
 							StringVal: fmt.Sprint(*gen.Image.Name),
 							Type:      pipelinev1beta1.ParamTypeString,
 						},
+						Type: pipelinev1beta1.ParamTypeString,
 					},
 					{
 						Name:        "container-tag",
@@ -38,6 +39,7 @@ func (gen *SystemTektonGenerator) pipeline() func() *pipelinev1beta1.Pipeline {
 							StringVal: fmt.Sprint(*gen.Image.Tag),
 							Type:      pipelinev1beta1.ParamTypeString,
 						},
+						Type: pipelinev1beta1.ParamTypeString,
 					},
 				},
 				Tasks: []pipelinev1beta1.PipelineTask{

diff --git a/pkg/generators/system/tekton_task.go b/pkg/generators/system/tekton_task.go
@@ -34,6 +34,7 @@ func (gen *SystemTektonGenerator) task() func() *pipelinev1beta1.Task {
 							StringVal: fmt.Sprint(*gen.Image.Name),
 							Type:      pipelinev1beta1.ParamTypeString,
 						},
+						Type: pipelinev1beta1.ParamTypeString,
 					},
 					{
 						Name:        "container-tag",
@@ -42,6 +43,7 @@ func (gen *SystemTektonGenerator) task() func() *pipelinev1beta1.Task {
 							StringVal: fmt.Sprint(*gen.Image.Tag),
 							Type:      pipelinev1beta1.ParamTypeString,
 						},
+						Type: pipelinev1beta1.ParamTypeString,
 					},
 				},
 				StepTemplate: &pipelinev1beta1.StepTemplate{