Skip to content

Commit

Permalink
RHDHPAI-160: merge ai-lab-helm-chart pipeline/task with rhdh-pipeline
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gabemontero committed Jan 16, 2025
1 parent 2047936 commit 6271759
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
9 changes: 4 additions & 5 deletions skeleton/source-repo/.tekton/docker-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions skeleton/source-repo/.tekton/docker-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 6271759

Please sign in to comment.