From f530af25dee350314f8a2b4bfad9249f89e35742 Mon Sep 17 00:00:00 2001
From: Emil Natan <ena@redhat.com>
Date: Thu, 21 Mar 2024 19:39:48 +0200
Subject: [PATCH] Reapply "remove tekton results migrator"

This reverts commit dfb5828501e9ec7b2027d37db4e16f8748091bd8.

This reintroduces the "remove tekton results migrator" change. Since
it's dependant on the migrator confuguration in the results fork now
removed, readding the change in pipeline service, broke the main
branch. This will fix the main branch.
---
 .../tekton-results/api-migrator-config.yaml   | 44 -------------------
 .../tekton-results/kustomization.yaml         | 10 ++---
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml

diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml
deleted file mode 100644
index 557632710..000000000
--- a/operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tekton-results-api
-  annotations:
-    argocd.argoproj.io/sync-wave: "0"
-spec:
-  template:
-    spec:
-      initContainers:
-        - name: migrator
-          env:
-            - name: DB_USER
-              valueFrom:
-                secretKeyRef:
-                  name: tekton-results-database
-                  key: db.user
-            - name: DB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: tekton-results-database
-                  key: db.password
-            - name: DB_HOST
-              value:
-              valueFrom:
-                secretKeyRef:
-                  name: tekton-results-database
-                  key: db.host
-            - name: DB_NAME
-              value:
-              valueFrom:
-                secretKeyRef:
-                  name: tekton-results-database
-                  key: db.name
-          resources:
-            requests:
-              cpu: 5m
-              memory: 32Mi
-            limits:
-              cpu: 100m
-              memory: 128Mi
-          securityContext:
-            readOnlyRootFilesystem: true
diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml
index 80498f412..6bb38b035 100644
--- a/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml
+++ b/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml
@@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: tekton-results
 resources:
-  - https://github.com/openshift-pipelines/tektoncd-results.git/config/overlays/base-only/?ref=1c5b3054ffb52f172fda31587d7dfd88a9724c8f
+  - https://github.com/openshift-pipelines/tektoncd-results.git/config/overlays/base-only/?ref=a602fb3e858f6a3195374d2175053db7e5db9f77
   - namespace.yaml
   - api-route.yaml
   - watcher-logging-rbac.yaml
@@ -13,13 +13,10 @@ resources:
 images:
   - name: ko://github.com/tektoncd/results/cmd/api
     newName: quay.io/redhat-appstudio/tekton-results-api
-    newTag: 1c5b3054ffb52f172fda31587d7dfd88a9724c8f
+    newTag: a602fb3e858f6a3195374d2175053db7e5db9f77
   - name: ko://github.com/tektoncd/results/cmd/watcher
     newName: quay.io/redhat-appstudio/tekton-results-watcher
-    newTag: 1c5b3054ffb52f172fda31587d7dfd88a9724c8f
-  - name: ko://github.com/tektoncd/results/tools/migrator
-    newName: quay.io/redhat-appstudio/tekton-results-migrator
-    newTag: 1c5b3054ffb52f172fda31587d7dfd88a9724c8f
+    newTag: a602fb3e858f6a3195374d2175053db7e5db9f77
 
 # generate a new configmap with updated values (logs api, db ssl mode) and replace the default one
 configMapGenerator:
@@ -32,7 +29,6 @@ configMapGenerator:
 
 patches:
   - path: api-db-config.yaml
-  - path: api-migrator-config.yaml
   - path: api-s3-config.yaml
   - path: api-sync.yaml
   - path: api-service-sync.yaml