Skip to content

Commit 5d38e61

Browse files
authored
Merge pull request #160 from rh-ai-quickstart/release/v0.2.37
Release v0.2.37
2 parents ef2718b + c83a4fa commit 5d38e61

12 files changed

Lines changed: 114 additions & 52 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,4 @@ deploy/helm/rag-values.yaml
186186
deploy/helm/rag/Chart.lock
187187
deploy/helm/values.yaml
188188
deploy/helm/bootstrap-values.yaml
189+
tenant/bootstrap/bootstrap-values.yaml

deploy/helm/bootstrap/templates/applicationset-rag.yaml

Lines changed: 0 additions & 44 deletions
This file was deleted.

deploy/helm/rag/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: rag
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 0.2.36
6-
appVersion: "0.2.36"
5+
version: 0.2.37
6+
appVersion: "0.2.37"
77

88
dependencies:
99
- name: pgvector

deploy/helm/rag/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ replicaCount: 1
33
image:
44
repository: quay.io/rh-ai-quickstart/llamastack-dist-ui
55
pullPolicy: Always
6-
tag: 0.2.36
6+
tag: 0.2.37
77

88
service:
99
type: ClusterIP

docs/RHDP_Onboarding.md

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# RHDP Onboarding
2+
3+
This document describes the intended repository layout for RHDP onboarding and how each bootstrap area fits into the GitOps flow for the RAG quickstart.
4+
5+
## Target Directory Structure
6+
7+
```text
8+
tenant/
9+
bootstrap/ # Helm chart to create Argo CD Application for the RAG quickstart
10+
infra/
11+
bootstrap/ # Helm chart to install required cluster operators/infrastructure
12+
platform/
13+
bootstrap/ # Helm chart to create platform CRs and OpenShift UI plugins
14+
```
15+
16+
## 1) `tenant/bootstrap`
17+
18+
Purpose:
19+
- Owns tenant-scoped onboarding for the quickstart.
20+
- Creates an Argo CD `Application` object.
21+
- That `Application` points to the RAG chart and drives deployment/sync of the quickstart application.
22+
23+
Typical responsibilities:
24+
- Argo CD `Application` definition (repo URL, path, revision, destination namespace).
25+
- Passing Helm values to the RAG chart.
26+
- Optional tenant-related RBAC needed for reconciliation.
27+
28+
## 2) `infra/bootstrap`
29+
30+
Purpose:
31+
- Owns cluster/operator prerequisites required by the quickstart.
32+
- Installs platform services and operators needed before tenant app deployment.
33+
34+
Typical responsibilities:
35+
- Operator subscriptions or chart-based operator installs.
36+
- Shared infra dependencies (for example: data science operators, serving stack prerequisites, pipeline dependencies, etc.).
37+
- Cluster-wide setup needed by multiple tenants.
38+
39+
## 3) `platform/bootstrap`
40+
41+
Purpose:
42+
- Owns platform-level custom resources and UI integrations.
43+
- Creates cluster/platform objects that are not tenant app manifests.
44+
45+
Typical responsibilities:
46+
- Custom resources used by the platform layer.
47+
- OpenShift console/UI plugins and related configuration.
48+
- Platform controls and integrations shared across workloads.
49+
50+
## Recommended Flow
51+
52+
1. `infra/bootstrap` provisions required operators and cluster prerequisites.
53+
2. `platform/bootstrap` applies platform-level CRs/plugins.
54+
3. `tenant/bootstrap` creates the Argo CD `Application` that deploys the RAG quickstart for a tenant namespace.
55+
56+
This separation keeps ownership clear:
57+
- Infra team manages prerequisites.
58+
- Platform team manages shared platform objects and plugins.
59+
- Tenant/app team manages quickstart app onboarding through GitOps `Application` objects.

infra/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Infra
2+
3+
The `bootstrap` directory contains a Helm chart with the files used to deploy the operators required by this quickstart.

platform/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Platform
2+
3+
The `bootstrap` directory contains a Helm chart with the files used to deploy cluster-wide resources and custom plugins for this quickstart.

tenant/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Tenant
2+
3+
The `bootstrap` directory contains a Helm chart with the files used to deploy an Argo CD `Application` that deploys the RAG quickstart application.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{{ if .Values.rag -}}
2+
---
3+
apiVersion: argoproj.io/v1alpha1
4+
kind: Application
5+
metadata:
6+
name: {{ .Values.tenant.name }}
7+
namespace: {{ .Values.gitops.namespace }}
8+
spec:
9+
project: default
10+
source:
11+
repoURL: {{ .Values.rag.git.url }}
12+
targetRevision: {{ .Values.rag.git.revision }}
13+
path: {{ .Values.rag.git.path }}
14+
helm:
15+
values: |
16+
{{ toYaml .Values.rag.values | nindent 12 }}
17+
destination:
18+
server: https://kubernetes.default.svc
19+
namespace: '{{ .Values.rag.namespace }}'
20+
syncPolicy:
21+
automated:
22+
prune: false
23+
selfHeal: false
24+
syncOptions:
25+
- CreateNamespace=true
26+
retry:
27+
limit: 30
28+
backoff:
29+
duration: "5s"
30+
factor: 2
31+
maxDuration: "5m"
32+
{{- end }}

0 commit comments

Comments
 (0)