Skip to content

Commit 2e7a4ad

Browse files
dkennetzoracledkennetzoracle
committed
PR: Add Versioning and Data Persistence and Software Versioning Docs
 - Add specific anchored versions to all helm installs. - Add persistent storage volumes to MLFlow, Grafana, and Prometheus - Add initial software versioning documentation and templating - Some dead code cleanup.
1 parent d0520c1 commit 2e7a4ad

File tree

10 files changed

+284
-125
lines changed

10 files changed

+284
-125
lines changed

‎docs/software_versions/ControlPlaneVersions.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Blueprints Control Plane Software Versions
2+
3+
The following table describes software versions for tagged releases of blueprints control plane software, with most recent tags listed first.
4+
5+
<details>
6+
<summary><strong>latest</strong></summary>
7+
8+
## Software Used in Containers
9+
|Container Name|Provider|Name|Type|Version|
10+
|:------------:|:------:|:--:|:--:|:-----:|
11+
|oci-corrino-cp / pod-util-amd64|Oracle|oraclelinux|Container|8|
12+
|oci-corrino-cp / pod-util-amd64|Python|python311|Programming Language|3.11.11|
13+
|oci-corrino-cp / pod-util-amd64|Python Pip|python3.11-pip|Package Manager|22.3.1|
14+
|pod-util-amd64|Oracle|oci-cli|Application|3.12|
15+
16+
--------
17+
--------
18+
## Python Packages
19+
|Package Name|Version|
20+
|:----------:|:-----:|
21+
|Django|5.1.3|
22+
|django-extensions|3.2.3|
23+
|djangorestframework|3.14.0|
24+
|gunicorn|22.0.0|
25+
|jsonschema|4.23.0|
26+
|kubernetes|30.1.0
27+
|packaging|24.0|
28+
|psycopg2-binary|2.9.10|
29+
|pytz|2024.1|
30+
|sqlparse|0.5.0|
31+
|oci|2.138.1|
32+
|asgiref|3.8.1|
33+
|oracledb|2.5.0|
34+
|prometheus_client|0.21.1|
35+
</details>

‎docs/software_versions/PortalVersions.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Portal Versions
2+
3+
TODO

‎docs/software_versions/QuickStartVersions.md

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# OCI AI Blueprints Quickstart Software Versions
2+
3+
The following table describes software versions for tagged releases of this quickstart software repository, with most recent tags listed first.
4+
5+
This will be replaced as soon as we start tagging. Wanted framework in place.
6+
<details>
7+
<summary><strong>release-2025-04-22</strong></summary>
8+
9+
## Cluster Creation Terraform
10+
### 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|
20+
21+
### Oracle Services
22+
|Service|Version|
23+
|Oracle Kubernetes Engine|v1.31.1|
24+
25+
--------------
26+
--------------
27+
28+
## OCI AI Blueprints Terraform
29+
### 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|
39+
40+
### 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|
51+
52+
### 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|
57+
58+
### Oracle Services
59+
|Service|Version|
60+
|Oracle Autonomous Database|19c|
61+
62+
</details>
63+
64+
<details>
65+
<summary><strong>release-2025-04-01</strong></summary>
66+
67+
## Cluster Creation Terraform
68+
### 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|
78+
79+
### Oracle Services
80+
|Service|Version|
81+
|Oracle Kubernetes Engine|v1.31.1|
82+
83+
--------------
84+
--------------
85+
86+
## OCI AI Blueprints Terraform
87+
### 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|
97+
98+
### 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|
108+
109+
### 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|
114+
115+
### Oracle Services
116+
|Service|Version|
117+
|Oracle Autonomous Database|19c|
118+
119+
</details>
120+

‎docs/software_versions/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Software Versions
2+
3+
Each link provides software versions for tools utilized in the various components of the software managed by Blueprints:
4+
5+
- [OCI AI Blueprints Quickstart Software Versions](./QuickStartVersions.md)
6+
- [Blueprints Control Plane Software Versions](./ControlPlaneVersions.md)
7+
- [Blueprints Portal Software Versions](./PortalVersions.md)
8+

‎oci_ai_blueprints_terraform/app-portal.tf

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

‎oci_ai_blueprints_terraform/helm.tf

Lines changed: 53 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,64 @@
1-
2-
# REPO_NAME="community-charts"
3-
# CHART_CANONICAL_NAME="mlflow"
4-
# CHART_URL='https://community-charts.github.io/helm-charts'
5-
# RELEASE_NAME="mlflow"
6-
# NAMESPACE="default"
7-
# COMPONENT="mlflow"
8-
9-
101
resource "helm_release" "mlflow" {
112
name = "mlflow"
123
repository = "https://community-charts.github.io/helm-charts"
134
chart = "mlflow"
145
namespace = "default"
156
wait = false
7+
version = "0.16.5" # Trying to find latest working version.
8+
9+
values = [
10+
<<EOF
11+
extraVolumes:
12+
- name: mlflow-volume
13+
persistentVolumeClaim:
14+
claimName: mlflow-pvc
15+
16+
extraVolumeMounts:
17+
- name: mlflow-volume
18+
mountPath: /mlruns
19+
20+
extraArgs:
21+
backendStoreUri: file:///mlruns/store
22+
defaultArtifactRoot: /mlruns/artifacts
1623
24+
extraEnvVars:
25+
MLFLOW_TRACKING_URI: file:///mlruns/store
26+
EOF
27+
]
28+
29+
depends_on = [ kubernetes_persistent_volume_claim_v1.mlflow ]
1730
count = var.bring_your_own_mlflow ? 0 : 1
1831
}
1932

33+
resource "kubernetes_persistent_volume_claim_v1" "mlflow" {
34+
metadata {
35+
name = "mlflow-pvc"
36+
namespace = "default"
37+
}
38+
39+
spec {
40+
access_modes = ["ReadWriteOnce"]
41+
42+
resources {
43+
requests = {
44+
storage = "10Gi"
45+
}
46+
}
47+
48+
storage_class_name = "oci-bv"
49+
}
50+
51+
wait_until_bound = false
52+
53+
timeouts {
54+
create = "5m"
55+
}
56+
57+
depends_on = [ kubernetes_ingress_v1.grafana_ingress ]
58+
count = var.bring_your_own_mlflow ? 0 : 1
59+
}
60+
61+
2062
# REPO_NAME="nvidia"
2163
# CHART_CANONICAL_NAME="gpu-operator"
2264
# CHART_URL="https://helm.ngc.nvidia.com/nvidia"
@@ -31,6 +73,7 @@ resource "helm_release" "nvidia-dcgm" {
3173
namespace = "gpu-operator"
3274
create_namespace = true
3375
wait = false
76+
version = "v25.3.0"
3477

3578
# Create the release if either DCGM or MIG is enabled.
3679
count = var.bring_your_own_nvidia_gpu_operator ? 0 : 1
@@ -51,6 +94,7 @@ resource "helm_release" "keda" {
5194
namespace = "keda"
5295
create_namespace = true
5396
wait = false
97+
version = "2.17.0"
5498

5599
count = var.bring_your_own_keda ? 0 : 1
56100
}

‎oci_ai_blueprints_terraform/ingress.tf

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,41 +33,6 @@ resource "kubernetes_ingress_v1" "corrino_cp_ingress" {
3333
depends_on = [module.oke-quickstart.helm_release_ingress_nginx]
3434
}
3535

36-
# resource "kubernetes_ingress_v1" "corrino_portal_ingress" {
37-
# wait_for_load_balancer = true
38-
# metadata {
39-
# name = "corrino-portal-ingress"
40-
# annotations = {
41-
# "cert-manager.io/cluster-issuer" = "letsencrypt-prod"
42-
# "nginx.ingress.kubernetes.io/rewrite-target" = "/"
43-
# }
44-
# }
45-
# spec {
46-
# ingress_class_name = "nginx"
47-
# tls {
48-
# hosts = [local.public_endpoint.portal]
49-
# secret_name = "corrino-portal-tls"
50-
# }
51-
# rule {
52-
# host = local.public_endpoint.portal
53-
# http {
54-
# path {
55-
# path = "/"
56-
# backend {
57-
# service {
58-
# name = kubernetes_service.corrino_portal_service.metadata.0.name
59-
# port {
60-
# number = 80
61-
# }
62-
# }
63-
# }
64-
# }
65-
# }
66-
# }
67-
# }
68-
# depends_on = [module.oke-quickstart.helm_release_ingress_nginx]
69-
# }
70-
7136
resource "kubernetes_ingress_v1" "oci_ai_blueprints_portal_ingress" {
7237
wait_for_load_balancer = true
7338
metadata {
@@ -209,4 +174,4 @@ resource "kubernetes_ingress_v1" "mlflow_ingress" {
209174
}
210175
}
211176
depends_on = [module.oke-quickstart.helm_release_ingress_nginx]
212-
}
177+
}

0 commit comments

Comments
 (0)