Skip to content

Commit 29e940a

Browse files
authored
282 iac if k8s endpoint is not public helm cannot be applied (#307)
* Fix ORM install when API is not public * BYO - ADB-S * BYODB - OTHER * BYO VCN
1 parent cc974f2 commit 29e940a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1844
-465
lines changed

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Install dependencies
5050
run: |
5151
python -m pip install --upgrade pip wheel setuptools uv
52-
uv pip install torch==2.8.0+cpu -f https://download.pytorch.org/whl/cpu/torch --system
52+
uv pip install torch==2.9.0+cpu -f https://download.pytorch.org/whl/cpu/torch --system
5353
uv pip install -e ".[all-test]" --system
5454
5555
- name: Run Pylint on Client Code

.gitignore

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ tests/db_startup_temp/**
3030
**/.scannerwork
3131
**/.cursorignore
3232
**/tns_admin
33+
**/*.pem
3334
sonar-project.properties
3435

3536
##############################################################################
@@ -42,16 +43,6 @@ __pycache__/
4243
**/*.egg-info
4344
**/build/
4445

45-
##############################################################################
46-
# IaC
47-
##############################################################################
48-
**/**.tfvars
49-
**/.terraform*
50-
**/terraform.tfstate*
51-
**/*.pem
52-
opentofu/**/stage/*.*
53-
opentofu/**/stage/kubeconfig
54-
5546
##############################################################################
5647
# AI Code Assists
5748
##############################################################################
@@ -64,6 +55,13 @@ helm/**/*.tgz
6455
helm/values*.yaml
6556
!helm/values.yaml
6657

58+
##############################################################################
59+
# IaC
60+
##############################################################################
61+
**/**.tfvars
62+
**/.terraform*
63+
**/terraform.tfstate*
64+
6765
##############################################################################
6866
# Random
6967
##############################################################################

docs/content/advanced/helm.md

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,26 @@ Configure the Oracle Database used by the {{< short_app_ref >}} API Server.
109109

110110
| Key | Type | Default | Description |
111111
|-----|------|---------|-------------|
112-
| server.database.type | string | `""` | Either SIDB-FREE, ADB-FREE, or ADB-S |
113-
| server.database.image | object | | For SIDB-FREE/ADB-FREE, location of the image and its tag; Exclude for ADB-S |
112+
| server.database.type | string | `""` | Either SIDB-FREE, ADB-FREE, ADB-S, or OTHER |
113+
| server.database.image | object | | For SIDB-FREE/ADB-FREE, location of the image and its tag; Exclude for ADB-S/OTHER |
114114
| server.database.image.repository | string | `""` | For SIDB-FREE/ADB-FREE, repository location of the image |
115115
| server.database.image.tag | string | `"latest"` | For SIDB-FREE/ADB-FREE, tag of the image |
116+
| server.database.oci | Optional | | For ADB-S, OCID of the Autonomous Database Exclude for SIDB-FREE/ADB-FREE/OTHER |
117+
| server.database.oci.ocid | string | `""` | OCID of the Autonomous Database |
118+
| server.database.other | Optional | | For OTHER, connection details for external database |
119+
| server.database.other.dsn | string | `""` | Full DSN string (e.g: host:port/service) - Either dsn OR (host+port+service_name) |
120+
| server.database.other.host | string | `""` | Database host (required if dsn not provided) |
121+
| server.database.other.port | string/int | `""` | Database port (required if dsn not provided) |
122+
| server.database.other.service_name | string | `""` | Database service name (required if dsn not provided) |
116123
| server.database.authN | Required | | Application User Authentication/Connection Details If defined, used to create the user defined in the authN secret |
117124
| server.database.authN.secretName | string | `"db-authn"` | Name of Secret containing the authentication/connection details |
118125
| server.database.authN.usernameKey | string | `"username"` | Key in secretName containing the username |
119126
| server.database.authN.passwordKey | string | `"password"` | Key in secretName containing the password |
120127
| server.database.authN.serviceKey | string | `"service"` | Key in secretName containing the connection service name |
121128
| server.database.privAuthN | Optional | | Privileged User Authentication/Connection Details If defined, used to create the user defined in the authN secret |
122129
| server.database.privAuthN.secretName | string | `"db-priv-authn"` | secretName containing privileged user (i.e. ADMIN/SYSTEM) password |
130+
| server.database.privAuthN.usernameKey | string | `"username"` | Key in secretName containing the username |
123131
| server.database.privAuthN.passwordKey | string | `"password"` | Key in secretName containing the password |
124-
| server.database.oci_db | Optional | | For ADB-S, OCID of the Autonomous Database Exclude for SIDB-FREE/ADB-FREE |
125-
| server.database.oci_db.ocid | string | `""` | OCID of the DB |
126132

127133

128134
###### Examples
@@ -156,10 +162,32 @@ A pre-deployed Oracle Autonomous Database (_requires_ the [OraOperator](https://
156162
```yaml
157163
database:
158164
type: "ADB-S"
159-
oci_db:
165+
oci:
160166
ocid: "ocid1.autonomousdatabase.oc1..."
161167
```
162168

169+
**OTHER**
170+
171+
An external or bring-your-own Oracle Database:
172+
173+
Option 1 - Using full DSN string:
174+
```yaml
175+
database:
176+
type: "OTHER"
177+
other:
178+
dsn: "mydbhost.example.com:1521/MYSERVICE"
179+
```
180+
181+
Option 2 - Using individual components:
182+
```yaml
183+
database:
184+
type: "OTHER"
185+
other:
186+
host: "mydbhost.example.com"
187+
port: "1521"
188+
service_name: "MYSERVICE"
189+
```
190+
163191
##### Server Oracle Cloud Infrastructure Settings
164192

165193
Configure Oracle Cloud Infrastructure used by the {{< short_app_ref >}} API Server for access to Object Storage and OCI GenAI Services.

0 commit comments

Comments
 (0)