Reorganize tekton-results

Reorganize tekton-results manifest in order to:
- Prefer patchesStrategicMerge with kustomize rather than patchesJson6902, the first is clearer.
- Move s3 logging config from developer folder to operator one
- reflect s3 secrets layout from staging/prod

Author: Mo3m3n

developer/openshift/gitops/argocd/pipeline-service/kustomization.yaml

@@ -3,10 +3,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - openshift-pipelines
-  - pipelines-as-code
-  - tekton-chains
-  - tekton-results
+  - ../../../../../operator/gitops/argocd/pipeline-service
+
+patchesStrategicMerge:
+  - tekton-results/minio-create-bucket.yaml
 
   # Skip applying the Tekton operands while the Tekton operator is being installed.
   # See more information about this option, here:

developer/openshift/gitops/argocd/pipeline-service/openshift-pipelines/kustomization.yaml

@@ -3,9 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../../../../operator/gitops/argocd/pipeline-service/tekton-results/base
-  - log-clusterrolebinding.yaml
 
 patchesStrategicMerge:
-  - minio-tls-patch.yaml
-  - minio-user-cred-patch.yaml
-  - s3-configuration-patch.yaml
+  - minio-create-bucket.yaml

developer/openshift/gitops/argocd/pipeline-service/pipelines-as-code/kustomization.yaml

@@ -9,25 +9,6 @@ spec:
     spec:
       containers:
         - name: api
-          env:
-            # Enable logs api
-            - name: LOGS_API
-              value: "true"
-            # Set up log type "S3"
-            - name: LOGS_TYPE
-              value: S3
-            # Set up S3 bucket name, where will be stored logs
-            - name: S3_BUCKET_NAME
-              value: tekton-results
-            # Set up Minio tenant endpoint url
-            - name: S3_ENDPOINT
-              value: https://minio.tekton-results.svc.cluster.local
-            # Set up S3 endpoint host name without bucket prefix
-            - name: S3_HOSTNAME_IMMUTABLE
-              value: "true"
-            # Set up S3 region
-            - name: S3_REGION
-              value: us-east-1
       initContainers:
         - name: mc
           image: >-
@@ -43,24 +24,29 @@ spec:
                 echo "Minio bucket $S3_BUCKET_NAME successfully created.";
               fi
           imagePullPolicy: Always
-          volumeMounts:
-            - name: ca-s3
-              mountPath: /etc/ssl/certs/s3-cert.crt
-              subPath: s3-cert.crt
           env:
             - name: S3_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
-                  key: S3_ACCESS_KEY_ID
+                  key: aws_access_key_id
                   name: tekton-results-s3
             - name: S3_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
-                  key: S3_SECRET_ACCESS_KEY
+                  key: aws_secret_access_key
+                  name: tekton-results-s3
+            - name: S3_REGION
+              valueFrom:
+                secretKeyRef:
+                  key: aws_region
                   name: tekton-results-s3
             - name: S3_BUCKET_NAME
-              value: tekton-results
+              valueFrom:
+                secretKeyRef:
+                  key: bucket
+                  name: tekton-results-s3
             - name: S3_ENDPOINT
-              value: https://minio.tekton-results.svc.cluster.local
-            - name: S3_REGION
-              value: us-east-1
+              valueFrom:
+                secretKeyRef:
+                  key: endpoint
+                  name: tekton-results-s3

developer/openshift/gitops/argocd/pipeline-service/tekton-chains/kustomization.yaml

@@ -0,0 +1,34 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tekton-results-api
+  namespace: tekton-pipelines
+spec:
+  template:
+    spec:
+      containers:
+        - name: api
+          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