From 62717597a98a1c1eaf1fa3365ceb54a4cff94cad Mon Sep 17 00:00:00 2001 From: gabemontero Date: Sun, 12 Jan 2025 18:18:30 -0500 Subject: [PATCH] RHDHPAI-160: merge ai-lab-helm-chart pipeline/task with rhdh-pipeline With this change and associated changes in the ai-lab-helm-charts and rhdh-pipeline repos, we allow for multiple forms of deployment update: - via argocd gitops, where the launching of rhdh-pipelines from via RHDH SW templates defined in this repo employ this form of deployment update - via k8s patch of the deployment instance, which our helm charts in ai-lab-helm-charts employ, and application repos are not managed through argocd --- skeleton/source-repo/.tekton/docker-pull-request.yaml | 9 ++++----- skeleton/source-repo/.tekton/docker-push.yaml | 7 +++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/skeleton/source-repo/.tekton/docker-pull-request.yaml b/skeleton/source-repo/.tekton/docker-pull-request.yaml index 5f43a364..25588ded 100644 --- a/skeleton/source-repo/.tekton/docker-pull-request.yaml +++ b/skeleton/source-repo/.tekton/docker-pull-request.yaml @@ -6,13 +6,12 @@ metadata: pipelinesascode.tekton.dev/on-event: "[pull_request]" pipelinesascode.tekton.dev/on-target-branch: "[${{ values.defaultBranch }}]" pipelinesascode.tekton.dev/max-keep-runs: "2" - pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/pipelines/docker-build-ai-rhdh.yaml" + pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/gabemontero/rhdh-pipelines/refs/heads/upd-deploy-optional-steps/pac/pipelines/docker-build-ai-rhdh-pull-request.yaml" pipelinesascode.tekton.dev/task-0: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/init.yaml" pipelinesascode.tekton.dev/task-1: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/git-clone.yaml" pipelinesascode.tekton.dev/task-2: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/buildah-ai-rhdh.yaml" - pipelinesascode.tekton.dev/task-3: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/update-deployment.yaml" - pipelinesascode.tekton.dev/task-4: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/show-sbom-rhdh.yaml" - pipelinesascode.tekton.dev/task-5: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/summary.yaml" + pipelinesascode.tekton.dev/task-3: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/show-sbom-rhdh.yaml" + pipelinesascode.tekton.dev/task-4: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/summary.yaml" labels: argocd/app-name: ${{ values.name }} janus-idp.io/tekton: ${{ values.name }} @@ -38,7 +37,7 @@ spec: - name: gitops-auth-secret-name value: ${{ values.gitopsSecretName }} pipelineRef: - name: docker-build-ai-rhdh + name: docker-build-ai-rhdh-pull-request workspaces: - name: git-auth secret: diff --git a/skeleton/source-repo/.tekton/docker-push.yaml b/skeleton/source-repo/.tekton/docker-push.yaml index b6f15e41..6a937cdc 100644 --- a/skeleton/source-repo/.tekton/docker-push.yaml +++ b/skeleton/source-repo/.tekton/docker-push.yaml @@ -6,11 +6,11 @@ metadata: pipelinesascode.tekton.dev/on-event: "[push]" pipelinesascode.tekton.dev/on-target-branch: "[${{ values.defaultBranch }}]" pipelinesascode.tekton.dev/max-keep-runs: "2" - pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/pipelines/docker-build-ai-rhdh.yaml" + pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/gabemontero/rhdh-pipelines/refs/heads/upd-deploy-optional-steps/pac/pipelines/docker-build-ai-rhdh-push-gitops.yaml" pipelinesascode.tekton.dev/task-0: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/init.yaml" pipelinesascode.tekton.dev/task-1: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/git-clone.yaml" pipelinesascode.tekton.dev/task-2: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/buildah-ai-rhdh.yaml" - pipelinesascode.tekton.dev/task-3: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/update-deployment.yaml" + pipelinesascode.tekton.dev/task-3: "https://raw.githubusercontent.com/gabemontero/rhdh-pipelines/refs/heads/upd-deploy-optional-steps/pac/tasks/update-deployment-gitops.yaml" pipelinesascode.tekton.dev/task-4: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/show-sbom-rhdh.yaml" pipelinesascode.tekton.dev/task-5: "https://raw.githubusercontent.com/redhat-ai-dev/rhdh-pipelines/main/pac/tasks/summary.yaml" labels: @@ -43,6 +43,9 @@ spec: - name: git-auth secret: secretName: "{{ git_auth_secret }}" + - name: gitops-auth + secret: + secretName: $(params.gitops-auth-secret-name) - name: workspace volumeClaimTemplate: spec: