Merge remote-tracking branch 'upstream/main'

Author: moulalis

.rules/helm-xks-chart.md

@@ -13,7 +13,7 @@ Template prefix: `rhai-on-xks-chart.` for all helpers.
 - `templates/hooks/` — post-install Jobs (CRs creation, gateway setup).
   - `_crs-definitions.tpl` — **single source of truth** for provider and component CR metadata; add new providers/CRs here only. All templates update automatically.
 - `templates/webhooks/` — MutatingWebhookConfiguration.
-- `templates/cloudmanager/{azure,coreweave}/` — cloud-specific resources (RBAC, CRDs, deployment).
+- `templates/cloudmanager/{aws,azure,coreweave}/` — cloud-specific resources (RBAC, CRDs, deployment).
 - `templates/pull-secret.yaml` — optional image pull secret.
 - `templates/validation.yaml` — calls `validateCloudProvider`.
 

charts/README.md

@@ -217,7 +217,7 @@ kubectl annotate validatingwebhookconfiguration istio-validator-istio-system sai
 
 See the [`rhai-on-xks-chart` README](rhai-on-xks-chart/README.md) for installation and usage details.
 
-The chart generates its templates from the [opendatahub-operator](https://github.com/opendatahub-io/opendatahub-operator) repository using kustomize and [helmtemplate-generator](https://github.com/davidebianchi/helmtemplate-generator). It also generates cloud-specific (Azure, CoreWeave) cloudmanager templates.
+The chart generates its templates from the [opendatahub-operator](https://github.com/opendatahub-io/opendatahub-operator) repository using kustomize and [helmtemplate-generator](https://github.com/davidebianchi/helmtemplate-generator). It also generates cloud-specific (AWS, Azure, CoreWeave) cloudmanager templates.
 
 **Prerequisites:** `go`, `kustomize`, and access to the ODH `opendatahub-operator` git repo.
 
@@ -264,7 +264,7 @@ The script:
 1. Clones (or uses a local) opendatahub-operator repo and runs `make manifests-all`
 2. Builds kustomize manifests from `config/rhaii/rhoai/default/`
 3. Pipes them through `helmtemplate-generator` to produce Helm templates
-4. Repeats for each cloudmanager target (Azure, CoreWeave) from `config/cloudmanager/<cloud>/rhoai/`
+4. Repeats for each cloudmanager target (AWS, Azure, CoreWeave) from `config/cloudmanager/<cloud>/rhoai/`
 5. Updates `Chart.yaml` with the new `appVersion`
 
 ### Dependency Operator Charts (bundle-derived)

charts/rhai-on-xks-chart/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: rhai-on-xks-chart
-description: RHAI on XKS Helm chart for non-OLM installation on non-OpenShift Kubernetes services (Azure, CoreWeave).
+description: RHAI on XKS Helm chart for non-OLM installation on non-OpenShift Kubernetes services (AWS, Azure, CoreWeave).
 type: application
 version: 3.5.0-ea.2
 appVersion: 3.5.0-ea.2

charts/rhai-on-xks-chart/README.md

@@ -1,8 +1,8 @@
 # RHAI on XKS Helm Chart
 
-Red Hat AI Inference Helm chart for non-OLM installation on external Kubernetes services (Azure, CoreWeave).
+Red Hat AI Inference Helm chart for non-OLM installation on external Kubernetes services (AWS, Azure, CoreWeave).
 
-This chart installs the RHAI operator and its cloud manager components. Exactly one cloud provider (Azure or CoreWeave) must be enabled.
+This chart installs the RHAI operator and its cloud manager components. Exactly one cloud provider (AWS, Azure, or CoreWeave) must be enabled.
 
 ## Table of Contents
 
@@ -13,6 +13,7 @@ This chart installs the RHAI operator and its cloud manager components. Exactly
     - [Obtaining credentials](#obtaining-credentials)
     - [What the pull secret does](#what-the-pull-secret-does)
   - [Installation](#installation)
+    - [AWS](#aws)
     - [Azure](#azure)
     - [CoreWeave](#coreweave)
   - [How It Works](#how-it-works)
@@ -59,6 +60,16 @@ The secret name defaults to `rhai-pull-secret` and **should not** be changed.
 > [!NOTE]
 > All commands below assume you are in the repository root directory.
 
+### AWS
+
+```bash
+helm upgrade rhaii ./charts/rhai-on-xks-chart/ \
+  --install --create-namespace \
+  --namespace rhai-gitops \
+  --set aws.enabled=true \
+  --set-file imagePullSecret.dockerConfigJson=/path/to/auth.json
+```
+
 ### Azure
 
 ```bash
@@ -114,7 +125,7 @@ components:
 
 ## Managed Dependencies
 
-The KubernetesEngine CRs (Azure or CoreWeave) manage the following dependencies. Each can be set to `Managed` (operator handles installation and lifecycle) or `Unmanaged` (you manage it yourself):
+The KubernetesEngine CRs (AWS, Azure, or CoreWeave) manage the following dependencies. Each can be set to `Managed` (operator handles installation and lifecycle) or `Unmanaged` (you manage it yourself):
 
 | Dependency | Description |
 | --- | --- |
@@ -175,6 +186,11 @@ kubectl delete crd llminferenceservices.serving.kserve.io
 kubectl delete crd llminferenceserviceconfigs.serving.kserve.io
 ```
 
+**AWS:**
+```bash
+kubectl delete crd awskubernetesengines.infrastructure.opendatahub.io
+```
+
 **Azure:**
 ```bash
 kubectl delete crd azurekubernetesengines.infrastructure.opendatahub.io

charts/rhai-on-xks-chart/api-docs.md

@@ -2,7 +2,7 @@
 
 ![Version: 3.5.0-ea.2](https://img.shields.io/badge/Version-3.5.0--ea.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.5.0-ea.2](https://img.shields.io/badge/AppVersion-3.5.0--ea.2-informational?style=flat-square)
 
-RHAI on XKS Helm chart for non-OLM installation on non-OpenShift Kubernetes services (Azure, CoreWeave).
+RHAI on XKS Helm chart for non-OLM installation on non-OpenShift Kubernetes services (AWS, Azure, CoreWeave).
 
 ## Values
 

charts/rhai-on-xks-chart/scripts/helmtemplate-config-cloudmanager.yaml

@@ -1,8 +1,8 @@
 # helmtemplate-generator configuration for cloudmanager resources
 #
 # Placeholders (replaced by update-bundle.sh via sed):
-#   CLOUD_NAME - cloud name (azure or coreweave)
-#   CLOUD_DIR  - output subdirectory (cloudmanager/azure or cloudmanager/coreweave)
+#   CLOUD_NAME - cloud name (aws, azure or coreweave)
+#   CLOUD_DIR  - output subdirectory (cloudmanager/aws, cloudmanager/azure or cloudmanager/coreweave)
 
 rules:
   # Replace namespace references with Helm template