Add pipeline-service-storage argocd app

The pipeline-service-storage app will install both postgres and minio
used only for development purpose

Author: Mo3m3n

developer/config.yaml

@@ -14,7 +14,6 @@ git_ref: main
 # Applications to be deployed on the cluster
 apps:
   - openshift-gitops # openshift-gitops is a pre-requisite for Pipeline Service
-  - minio # for development purposes, install minio as the storage backend for tekton-results
   - pipeline_service # pipeline_service sets up Pipeline Service on the cluster.
 
 # Tekton results database credentials
@@ -23,6 +22,6 @@ tekton_results_db:
   password:
 
 # Minio S3 compatible storage credentials for tekton results
-tekton_results_log:
+tekton_results_s3:
   user:
   password:

developer/openshift/dev_setup.sh

@@ -195,57 +195,6 @@ install_openshift_gitops() {
   fi
 }
 
-install_minio() {
-  local APP="minio"
-
-  #############################################################################
-  # Install the minio operator
-  #############################################################################
-
-  echo -n "- Secret: "
-  TEKTON_RESULTS_MINIO_USER="$(yq '.tekton_results_log.user // "minio"' "$CONFIG")"
-  TEKTON_RESULTS_MINIO_PASSWORD="$(yq ".tekton_results_log.password // \"$(openssl rand -base64 20)\"" "$CONFIG")"
-  
-  COMPUTE_DIR="$WORK_DIR"/credentials/manifests/compute/tekton-results
-  mkdir -p "$COMPUTE_DIR"
-
-  minio_configuration_secret="minio-storage-configuration"
-  # secret with minio tenant configuration
-  results_minio_conf_secret_path="$COMPUTE_DIR/${minio_configuration_secret}.yaml"
-
-  minio_credentials_secret="s3-credentials"
-  # secret with minio credentials for tekton-results api server
-  results_minio_cred_secret_path="$COMPUTE_DIR/${minio_credentials_secret}.yaml"
-
-  export TEKTON_RESULTS_MINIO_USER
-  export TEKTON_RESULTS_MINIO_PASSWORD
-  minio_conf_template="$DEV_DIR/gitops/argocd/pipeline-service/tekton-results/templates/${minio_configuration_secret}.yaml"
-  envsubst < "$minio_conf_template" > "$results_minio_conf_secret_path"
-  # unset env variables, but save their values
-  export -n TEKTON_RESULTS_MINIO_USER
-  export -n TEKTON_RESULTS_MINIO_PASSWORD
-
-  kubectl create secret generic "${minio_credentials_secret}" \
-  --from-literal=S3_ACCESS_KEY_ID="$TEKTON_RESULTS_MINIO_USER" \
-  --from-literal=S3_SECRET_ACCESS_KEY="$TEKTON_RESULTS_MINIO_PASSWORD" \
-  -n tekton-results --dry-run=client -o yaml >> "$results_minio_cred_secret_path"
-
-  kubectl apply -f "$PROJECT_DIR/operator/gitops/argocd/pipeline-service/tekton-results/base/namespace.yaml" >/dev/null
-  kubectl apply -f "$results_minio_conf_secret_path" >/dev/null
-  kubectl apply -f "$results_minio_cred_secret_path" >/dev/null
-  echo "OK"
-
-  echo -n "- Installing minio: "
-  kubectl apply -f "$DEV_DIR/gitops/argocd/$APP/application.yaml" >/dev/null
-  echo "OK"
-
-  # Subscription information for potential debug
-  mkdir -p "$WORK_DIR/logs/$APP"
-
-  echo "- Checking deployment status:"
-  check_deployments "openshift-operators" "minio-operator" | indent 2
-  check_pod_by_label "tekton-results" "app=minio" | indent 2 
-}
 
 setup_compute_access() {
   if [ -n "${USE_CURRENT_BRANCH:-}" ]; then
@@ -263,10 +212,18 @@ setup_compute_access() {
 
 install_pipeline_service() {
 
+  #############################################################################
+  # Setup working directory
+  #############################################################################
+
   TEKTON_RESULTS_DATABASE_USER="$(yq '.tekton_results_db.user' "$CONFIG")"
   TEKTON_RESULTS_DATABASE_PASSWORD="$(yq '.tekton_results_db.password' "$CONFIG")"
   export TEKTON_RESULTS_DATABASE_USER
   export TEKTON_RESULTS_DATABASE_PASSWORD
+  TEKTON_RESULTS_S3_USER="$(yq '.tekton_results_s3.user // "minio"' "$CONFIG")"
+  TEKTON_RESULTS_S3_PASSWORD="$(yq ".tekton_results_s3.password // \"$(openssl rand -base64 20)\"" "$CONFIG")"
+  export TEKTON_RESULTS_S3_USER
+  export TEKTON_RESULTS_S3_PASSWORD
 
   echo "- Setup working directory:"
   "$PROJECT_DIR/operator/images/access-setup/content/bin/setup_work_dir.sh" \
@@ -275,8 +232,9 @@ install_pipeline_service() {
     --kustomization "git::$GIT_URL/developer/openshift/gitops/argocd?ref=$GIT_REF" |
     indent 2
 
-  echo "- Installing local postgres DB for tekton results:"
-  kubectl apply -f "$PROJECT_DIR/developer/local/postgres" | indent 4
+  #############################################################################
+  # Deploy Applications
+  #############################################################################
 
   echo "- Deploy applications:"
   if [ -n "${USE_CURRENT_BRANCH:-}" ]; then

developer/openshift/gitops/argocd/kustomization.yaml

@@ -1,5 +1,6 @@
 ---
 resources:
+  - pipeline-service-storage.yaml
   - pipeline-service.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

developer/openshift/gitops/argocd/minio/application.yaml renamed to developer/openshift/gitops/argocd/pipeline-service-storage.yaml

@@ -2,14 +2,14 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: minio
+  name: pipeline-service-storage
   namespace: openshift-gitops
 spec:
   destination:
     namespace: openshift-gitops
     server: https://kubernetes.default.svc
   source:
-    path: developer/openshift/gitops/argocd/minio
+    path: developer/openshift/gitops/argocd/pipeline-service-storage
     repoURL: https://github.com/openshift-pipelines/pipeline-service.git
     targetRevision: main
   project: default
@@ -22,8 +22,6 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
-      # workaround to make working both minio: newer and old 4.5.4
-      - Validate=false
     retry:
       limit: -1 # number of failed sync attempt retries; unlimited number of attempts if less than 0
       backoff:

developer/openshift/gitops/argocd/minio/kustomization.yaml renamed to developer/openshift/gitops/argocd/pipeline-service-storage/kustomization.yaml

@@ -3,5 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - operator
-  - tenant
+  - postgres
+  - minio/operator
+  - minio/tenant