Skip to content

Commit 7d45932

Browse files
dkennetzoracledkennetzoracle
committed
PR: Added CP and Quickstart versioning templates.
1 parent 43a46f4 commit 7d45932

File tree

5 files changed

+59
-142
lines changed

5 files changed

+59
-142
lines changed

‎docs/software_versions/ControlPlaneVersions.md

+29-26
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,34 @@
22

33
The following table describes software versions for tagged releases of blueprints control plane software, with most recent tags listed first.
44

5-
This will be replaced as soon as we start tagging. Wanted framework in place.
6-
<summary><strong>Version: latest</strong></summary>
7-
8-
##
9-
10-
<details>
11-
<summary><strong>Previous Versions</strong></summary>
12-
13-
<details>
14-
<summary><strong>v1.3.0</strong></summary>
15-
16-
| Component | Version |
17-
|----------------|----------|
18-
| Service A | 2.1.3 |
19-
| Service B | 4.0.1 |
20-
21-
</details>
22-
235
<details>
24-
<summary><strong>v1.2.0</strong></summary>
25-
26-
| Component | Version |
27-
|----------------|----------|
28-
| Service A | 2.0.9 |
29-
| Service B | 3.9.8 |
30-
31-
</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|
3235
</details>

‎docs/software_versions/QuickStartVersions.md

+28
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ This will be replaced as soon as we start tagging. Wanted framework in place.
1818
|Provider|local|hashicorp/local|>=2.5|
1919
|Provider|random|hashicorp/random|>=3.6|
2020

21+
### Oracle Services
22+
|Service|Version|
23+
|Oracle Kubernetes Engine|v1.31.1|
24+
2125
--------------
2226
--------------
2327

@@ -45,6 +49,16 @@ This will be replaced as soon as we start tagging. Wanted framework in place.
4549
|Keda|2.17.0|https://kedacore.github.io/charts|
4650
|LeaderWorkerSet|0.1.0|local|
4751

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+
4862
</details>
4963

5064
<details>
@@ -62,6 +76,10 @@ This will be replaced as soon as we start tagging. Wanted framework in place.
6276
|Provider|local|hashicorp/local|>=2.5|
6377
|Provider|random|hashicorp/random|>=3.6|
6478

79+
### Oracle Services
80+
|Service|Version|
81+
|Oracle Kubernetes Engine|v1.31.1|
82+
6583
--------------
6684
--------------
6785

@@ -88,5 +106,15 @@ This will be replaced as soon as we start tagging. Wanted framework in place.
88106
|NVIDIA GPU Operator|v25.3.0|https://helm.ngc.nvidia.com/nvidia|
89107
|Keda|2.17.0|https://kedacore.github.io/charts|
90108

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+
91119
</details>
92120

‎oci_ai_blueprints_terraform/app-portal.tf

-73
This file was deleted.

‎oci_ai_blueprints_terraform/ingress.tf

+1-36
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+
}

‎oci_ai_blueprints_terraform/outputs.tf

+1-7
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,6 @@ output "corrino_api_url" {
126126
depends_on = [module.oke-quickstart.helm_release_ingress_nginx]
127127
}
128128

129-
# output "corrino_portal_url" {
130-
# value = format("https://${local.public_endpoint.portal}")
131-
# description = "Portal Service"
132-
# depends_on = [module.oke-quickstart.helm_release_ingress_nginx]
133-
# }
134-
135129
output "blueprints_portal_url" {
136130
value = format("https://${local.public_endpoint.blueprint_portal}")
137131
description = "Blueprint Portal Service"
@@ -174,4 +168,4 @@ output "app_name" {
174168

175169
output "deploy_id" {
176170
value = random_string.generated_deployment_name.result
177-
}
171+
}

0 commit comments

Comments
 (0)