Skip to content

Commit 12ecc07

Browse files
dkennetzoracledkennetzoracle
authored
Merge pull request #55 from oracle-quickstart/add_kueue_helm
Add Kueue Helm
2 parents 4ef3bfd + 41ef83c commit 12ecc07

File tree

4 files changed

+155
-81
lines changed

4 files changed

+155
-81
lines changed

‎docs/software_versions/QuickStartVersions.md‎

Lines changed: 98 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -3,118 +3,140 @@
33
The following table describes software versions for tagged releases of this quickstart software repository, with most recent tags listed first.
44

55
This will be replaced as soon as we start tagging. Wanted framework in place.
6+
67
<details>
78
<summary><strong>release-2025-04-22</strong></summary>
89

910
## Cluster Creation Terraform
11+
1012
### Terraform / Provider Versions
11-
|Component Type|Component Name|Component Source|Component Version|
12-
|:------------:|:------------:|:--------------:|:---------------:|
13-
|Language|Terraform|hashicorp|>=1.5|
14-
|Provider|oci|oracle/oci|>=5|
15-
|Provider|kubernetes|hashicorp/kubernetes|>=2.27|
16-
|Provider|helm|hashicorp/helm|>=2.12|
17-
|Provider|tls|hashicorp/tls|>=4|
18-
|Provider|local|hashicorp/local|>=2.5|
19-
|Provider|random|hashicorp/random|>=3.6|
13+
14+
| Component Type | Component Name | Component Source | Component Version |
15+
| :------------: | :------------: | :------------------: | :---------------: |
16+
| Language | Terraform | hashicorp | >=1.5 |
17+
| Provider | oci | oracle/oci | >=5 |
18+
| Provider | kubernetes | hashicorp/kubernetes | >=2.27 |
19+
| Provider | helm | hashicorp/helm | >=2.12 |
20+
| Provider | tls | hashicorp/tls | >=4 |
21+
| Provider | local | hashicorp/local | >=2.5 |
22+
| Provider | random | hashicorp/random | >=3.6 |
2023

2124
### Oracle Services
22-
|Service|Version|
23-
|Oracle Kubernetes Engine|v1.31.1|
2425

25-
--------------
26-
--------------
26+
| Service | Version |
27+
| :----------------------: | :-----: |
28+
| Oracle Kubernetes Engine | v1.31.1 |
29+
30+
---
31+
32+
---
2733

2834
## OCI AI Blueprints Terraform
35+
2936
### Terraform / Provider Versions
30-
|Component Type|Component Name|Component Source|Component Version|
31-
|:------------:|:------------:|:--------------:|:---------------:|
32-
|Language|Terraform|hashicorp|>=1.1|
33-
|Provider|oci|oracle/oci| 4 <= version < 5|
34-
|Provider|kubernetes|hashicorp/kubernetes|>=2|
35-
|Provider|helm|hashicorp/helm|>=2|
36-
|Provider|tls|hashicorp/tls|>=4|
37-
|Provider|local|hashicorp/local|>=2|
38-
|Provider|random|hashicorp/random|>=3|
37+
38+
| Component Type | Component Name | Component Source | Component Version |
39+
| :------------: | :------------: | :------------------: | :---------------: |
40+
| Language | Terraform | hashicorp | >=1.1 |
41+
| Provider | oci | oracle/oci | 4 <= version < 5 |
42+
| Provider | kubernetes | hashicorp/kubernetes | >=2 |
43+
| Provider | helm | hashicorp/helm | >=2 |
44+
| Provider | tls | hashicorp/tls | >=4 |
45+
| Provider | local | hashicorp/local | >=2 |
46+
| Provider | random | hashicorp/random | >=3 |
3947

4048
### Helm Chart Versions
41-
|Chart Name|Version|Chart URL|
42-
|:--------:|:-----:|:-------:|
43-
|Grafana|6.47.1|https://grafana.github.io/helm-charts|
44-
|Prometheus|19.0.1|https://prometheus-community.github.io/helm-charts|
45-
|Metrics Server|3.8.3|https://kubernetes-sigs.github.io/metrics-server|
46-
|Ingress Nginx|4.4.0|https://kubernetes.github.io/ingress-nginx|
47-
|MLFlow|0.16.5|https://community-charts.github.io/helm-charts|
48-
|NVIDIA GPU Operator|v25.3.0|https://helm.ngc.nvidia.com/nvidia|
49-
|Keda|2.17.0|https://kedacore.github.io/charts|
50-
|LeaderWorkerSet|0.1.0|local|
49+
50+
| Chart Name | Version | Chart URL |
51+
| :-----------------: | :-----: | :------------------------------------------------: |
52+
| Grafana | 6.47.1 | https://grafana.github.io/helm-charts |
53+
| Prometheus | 19.0.1 | https://prometheus-community.github.io/helm-charts |
54+
| Metrics Server | 3.8.3 | https://kubernetes-sigs.github.io/metrics-server |
55+
| Ingress Nginx | 4.4.0 | https://kubernetes.github.io/ingress-nginx |
56+
| MLFlow | 0.16.5 | https://community-charts.github.io/helm-charts |
57+
| NVIDIA GPU Operator | v25.3.0 | https://helm.ngc.nvidia.com/nvidia |
58+
| Keda | 2.17.0 | https://kedacore.github.io/charts |
59+
| LeaderWorkerSet | 0.1.0 | local |
5160

5261
### Container Versions
53-
|Container|Version|Repository|
54-
|:--------|:------|:---------|
55-
|oci-corrino-cp|latest|iad.ocir.io/iduyx1qnmway/corrino-devops-repository|
56-
|oci-ai-blueprints-portal|latest|iad.ocir.io/iduyx1qnmway/corrino-devops-repository|
62+
63+
| Container | Version | Repository |
64+
| :----------------------- | :-----: | :------------------------------------------------: |
65+
| oci-corrino-cp | latest | iad.ocir.io/iduyx1qnmway/corrino-devops-repository |
66+
| oci-ai-blueprints-portal | latest | iad.ocir.io/iduyx1qnmway/corrino-devops-repository |
5767

5868
### Oracle Services
59-
|Service|Version|
60-
|Oracle Autonomous Database|19c|
69+
70+
| Service | Version |
71+
| :------------------------: | :-----: |
72+
| Oracle Autonomous Database | 19c |
6173

6274
</details>
6375

6476
<details>
6577
<summary><strong>release-2025-04-01</strong></summary>
6678

6779
## Cluster Creation Terraform
80+
6881
### Terraform / Provider Versions
69-
|Component Type|Component Name|Component Source|Component Version|
70-
|:------------:|:------------:|:--------------:|:---------------:|
71-
|Language|Terraform|hashicorp|>=1.5|
72-
|Provider|oci|oracle/oci|>=5|
73-
|Provider|kubernetes|hashicorp/kubernetes|>=2.27|
74-
|Provider|helm|hashicorp/helm|>=2.12|
75-
|Provider|tls|hashicorp/tls|>=4|
76-
|Provider|local|hashicorp/local|>=2.5|
77-
|Provider|random|hashicorp/random|>=3.6|
82+
83+
| Component Type | Component Name | Component Source | Component Version |
84+
| :------------: | :------------: | :------------------: | :---------------: |
85+
| Language | Terraform | hashicorp | >=1.5 |
86+
| Provider | oci | oracle/oci | >=5 |
87+
| Provider | kubernetes | hashicorp/kubernetes | >=2.27 |
88+
| Provider | helm | hashicorp/helm | >=2.12 |
89+
| Provider | tls | hashicorp/tls | >=4 |
90+
| Provider | local | hashicorp/local | >=2.5 |
91+
| Provider | random | hashicorp/random | >=3.6 |
7892

7993
### Oracle Services
80-
|Service|Version|
81-
|Oracle Kubernetes Engine|v1.31.1|
8294

83-
--------------
84-
--------------
95+
| Service | Version |
96+
| :----------------------: | :-----: |
97+
| Oracle Kubernetes Engine | v1.31.1 |
98+
99+
---
100+
101+
---
85102

86103
## OCI AI Blueprints Terraform
104+
87105
### Terraform / Provider Versions
88-
|Component Type|Component Name|Component Source|Component Version|
89-
|:------------:|:------------:|:--------------:|:---------------:|
90-
|Language|Terraform|hashicorp|>=1.1|
91-
|Provider|oci|oracle/oci| 4 <= version < 5|
92-
|Provider|kubernetes|hashicorp/kubernetes|>=2|
93-
|Provider|helm|hashicorp/helm|>=2|
94-
|Provider|tls|hashicorp/tls|>=4|
95-
|Provider|local|hashicorp/local|>=2|
96-
|Provider|random|hashicorp/random|>=3|
106+
107+
| Component Type | Component Name | Component Source | Component Version |
108+
| :------------: | :------------: | :------------------: | :---------------: |
109+
| Language | Terraform | hashicorp | >=1.1 |
110+
| Provider | oci | oracle/oci | 4 <= version < 5 |
111+
| Provider | kubernetes | hashicorp/kubernetes | >=2 |
112+
| Provider | helm | hashicorp/helm | >=2 |
113+
| Provider | tls | hashicorp/tls | >=4 |
114+
| Provider | local | hashicorp/local | >=2 |
115+
| Provider | random | hashicorp/random | >=3 |
97116

98117
### Helm Chart Versions
99-
|Chart Name|Version|Chart URL|
100-
|:--------:|:-----:|:-------:|
101-
|Grafana|6.47.1|https://grafana.github.io/helm-charts|
102-
|Prometheus|19.0.1|https://prometheus-community.github.io/helm-charts|
103-
|Metrics Server|3.8.3|https://kubernetes-sigs.github.io/metrics-server|
104-
|Ingress Nginx|4.4.0|https://kubernetes.github.io/ingress-nginx|
105-
|MLFlow|0.16.5|https://community-charts.github.io/helm-charts|
106-
|NVIDIA GPU Operator|v25.3.0|https://helm.ngc.nvidia.com/nvidia|
107-
|Keda|2.17.0|https://kedacore.github.io/charts|
118+
119+
| Chart Name | Version | Chart URL |
120+
| :-----------------: | :-----: | :------------------------------------------------: |
121+
| Grafana | 6.47.1 | https://grafana.github.io/helm-charts |
122+
| Prometheus | 19.0.1 | https://prometheus-community.github.io/helm-charts |
123+
| Metrics Server | 3.8.3 | https://kubernetes-sigs.github.io/metrics-server |
124+
| Ingress Nginx | 4.4.0 | https://kubernetes.github.io/ingress-nginx |
125+
| MLFlow | 0.16.5 | https://community-charts.github.io/helm-charts |
126+
| NVIDIA GPU Operator | v25.3.0 | https://helm.ngc.nvidia.com/nvidia |
127+
| Keda | 2.17.0 | https://kedacore.github.io/charts |
108128

109129
### Container Versions
110-
|Container|Version|Repository|
111-
|:--------|:------|:---------|
112-
|oci-corrino-cp|latest|iad.ocir.io/iduyx1qnmway/corrino-devops-repository|
113-
|oci-ai-blueprints-portal|latest|iad.ocir.io/iduyx1qnmway/corrino-devops-repository|
130+
131+
| Container | Version | Repository |
132+
| :----------------------- | :------ | :------------------------------------------------- |
133+
| oci-corrino-cp | latest | iad.ocir.io/iduyx1qnmway/corrino-devops-repository |
134+
| oci-ai-blueprints-portal | latest | iad.ocir.io/iduyx1qnmway/corrino-devops-repository |
114135

115136
### Oracle Services
116-
|Service|Version|
117-
|Oracle Autonomous Database|19c|
118137

119-
</details>
138+
| Service | Version |
139+
| :------------------------: | :-----: |
140+
| Oracle Autonomous Database | 19c |
120141

142+
</details>

‎oci_ai_blueprints_terraform/helm.tf‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ extraEnvVars:
2626
EOF
2727
]
2828

29-
depends_on = [ kubernetes_persistent_volume_claim_v1.mlflow ]
30-
count = var.bring_your_own_mlflow ? 0 : 1
29+
depends_on = [kubernetes_persistent_volume_claim_v1.mlflow]
30+
count = var.bring_your_own_mlflow ? 0 : 1
3131
}
3232

3333
resource "kubernetes_persistent_volume_claim_v1" "mlflow" {
@@ -54,8 +54,8 @@ resource "kubernetes_persistent_volume_claim_v1" "mlflow" {
5454
create = "5m"
5555
}
5656

57-
depends_on = [ kubernetes_ingress_v1.grafana_ingress ]
58-
count = var.bring_your_own_mlflow ? 0 : 1
57+
depends_on = [kubernetes_ingress_v1.grafana_ingress]
58+
count = var.bring_your_own_mlflow ? 0 : 1
5959
}
6060

6161
resource "helm_release" "nvidia-dcgm" {
@@ -102,3 +102,16 @@ resource "helm_release" "lws" {
102102
count = var.bring_your_own_lws ? 0 : 1
103103
}
104104

105+
106+
resource "helm_release" "kueue" {
107+
name = "kueue"
108+
repository = "oci://registry.k8s.io/kueue/charts"
109+
chart = "kueue"
110+
namespace = "kueue-system"
111+
create_namespace = true
112+
wait = false
113+
version = "0.11.4"
114+
115+
count = var.bring_your_own_kueue ? 0 : 1
116+
}
117+

‎oci_ai_blueprints_terraform/schema.yaml‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,16 @@ variableGroups:
233233
- ${bring_your_own_cluster}
234234
- true
235235

236+
- title: "Kubernetes Queue System"
237+
variables:
238+
- bring_your_own_kueue
239+
- existent_kueue_namespace
240+
visible:
241+
and:
242+
- eq:
243+
- ${bring_your_own_cluster}
244+
- true
245+
236246
# - title: "Oracle Digital Assistant support"
237247
# variables:
238248
# - oda_enabled
@@ -1034,7 +1044,24 @@ variables:
10341044
visible:
10351045
and:
10361046
- bring_your_own_lws
1037-
1047+
1048+
bring_your_own_kueue:
1049+
type: boolean
1050+
title: "Use your own Kueue installation from existing cluster?"
1051+
description: "Only use this if you already have Kueue installed on your existing cluster."
1052+
visible:
1053+
and:
1054+
- bring_your_own_cluster
1055+
1056+
existent_kueue_namespace:
1057+
type: string
1058+
title: "Existing Kueue Namespace"
1059+
description: "Kubernetes namespace of existing Kueue Installation."
1060+
required: true
1061+
visible:
1062+
and:
1063+
- bring_your_own_kueue
1064+
10381065
# Data Sharing
10391066
share_data_with_corrino_team_enabled:
10401067
type: boolean

‎oci_ai_blueprints_terraform/variables.tf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,18 @@ variable "bring_your_own_lws" {
188188
type = bool
189189
default = false
190190
}
191+
192+
variable "bring_your_own_kueue" {
193+
type = bool
194+
default = false
195+
}
196+
197+
variable "existent_kueue_namespace" {
198+
type = string
199+
default = ""
200+
}
201+
202+
191203
# -----------------------------------
192204
# Helm
193205
# -----------------------------------

0 commit comments

Comments
 (0)