Skip to content

Commit ae34b4f

Browse files
committed
chore: move to kuadrant v1.3 final
This updates install script to setup Kuadrant v1.3 final version. Additionally, the `installation.md` page has been updated to no longer require `jwt` tool, and to use the right hostname of the MaaS Gateway. Also, the namespace manifest is removed, because it is pre-created by `deploy-openshift.sh`. This is inline with other ODH components where manifests won't create namespaces, but the odh-operator will create.
1 parent 7893f0e commit ae34b4f

File tree

5 files changed

+6
-30
lines changed

5 files changed

+6
-30
lines changed

deployment/base/maas-api/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ kind: Kustomization
44
namespace: maas-api
55

66
resources:
7-
- namespace.yaml
87
- deployment.yaml
98
- service.yaml
109
- rbac

deployment/base/maas-api/namespace.yaml

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

deployment/scripts/deploy-openshift.sh

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
206206

207207
# Only clean up leftover CRDs if Kuadrant operators are NOT already installed
208208
echo " Checking for existing Kuadrant installation..."
209-
if ! kubectl get csv -n kuadrant-system kuadrant-operator.v1.3.0-rc2 &>/dev/null 2>&1; then
209+
if ! kubectl get csv -n kuadrant-system kuadrant-operator.v1.3.0 &>/dev/null 2>&1; then
210210
echo " No existing installation found, checking for leftover CRDs..."
211211
LEFTOVER_CRDS=$(kubectl get crd 2>/dev/null | grep -E "kuadrant|authorino|limitador" | awk '{print $1}')
212212
if [ -n "$LEFTOVER_CRDS" ]; then
@@ -286,7 +286,7 @@ fi
286286
echo ""
287287
echo "6️⃣ Waiting for Kuadrant operators to be installed by OLM..."
288288
# Wait for CSVs to reach Succeeded state (this ensures CRDs are created and deployments are ready)
289-
wait_for_csv "kuadrant-operator.v1.3.0-rc2" "kuadrant-system" 300 || \
289+
wait_for_csv "kuadrant-operator.v1.3.0" "kuadrant-system" 300 || \
290290
echo " ⚠️ Kuadrant operator CSV did not succeed, continuing anyway..."
291291

292292
wait_for_csv "authorino-operator.v0.22.0" "kuadrant-system" 60 || \
@@ -315,20 +315,6 @@ echo "8️⃣ Deploying MaaS API..."
315315
cd "$PROJECT_ROOT"
316316
kustomize build deployment/base/maas-api | envsubst | kubectl apply -f -
317317

318-
echo ""
319-
echo "9️⃣ Applying OpenShift-specific configurations..."
320-
321-
# Patch Kuadrant for OpenShift Gateway Controller
322-
echo " Patching Kuadrant operator..."
323-
if ! kubectl -n kuadrant-system get deployment kuadrant-operator-controller-manager -o jsonpath='{.spec.template.spec.containers[0].env[?(@.name=="ISTIO_GATEWAY_CONTROLLER_NAMES")]}' | grep -q "ISTIO_GATEWAY_CONTROLLER_NAMES"; then
324-
kubectl get csv kuadrant-operator.v1.3.0-rc2 -n kuadrant-system -o json | \
325-
jq '.spec.install.spec.deployments[0].spec.template.spec.containers[0].env |= map(if .name == "ISTIO_GATEWAY_CONTROLLER_NAMES" then . + {"value": "istio.io/gateway-controller,openshift.io/gateway-controller/v1"} else . end)' | \
326-
kubectl apply -f -
327-
echo " ✅ Kuadrant operator patched"
328-
else
329-
echo " ✅ Kuadrant operator already configured"
330-
fi
331-
332318
# Restart Kuadrant operator to pick up the new configuration
333319
echo " Restarting Kuadrant operator to apply Gateway API provider recognition..."
334320
kubectl rollout restart deployment/kuadrant-operator-controller-manager -n kuadrant-system

deployment/scripts/install-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ spec:
129129
displayName: Kuadrant Operators
130130
grpcPodConfig:
131131
securityContextConfig: restricted
132-
image: 'quay.io/kuadrant/kuadrant-operator-catalog:v1.3.0-rc2'
132+
image: 'quay.io/kuadrant/kuadrant-operator-catalog:v1.3.0'
133133
publisher: grpc
134134
sourceType: grpc
135135
EOF
@@ -178,7 +178,7 @@ EOF
178178
# Patch Kuadrant for OpenShift Gateway Controller
179179
echo " Patching Kuadrant operator..."
180180
if ! kubectl -n kuadrant-system get deployment kuadrant-operator-controller-manager -o jsonpath='{.spec.template.spec.containers[0].env[?(@.name=="ISTIO_GATEWAY_CONTROLLER_NAMES")]}' | grep -q "ISTIO_GATEWAY_CONTROLLER_NAMES"; then
181-
kubectl patch csv kuadrant-operator.v1.3.0-rc2 -n kuadrant-system --type='json' -p='[
181+
kubectl patch csv kuadrant-operator.v1.3.0 -n kuadrant-system --type='json' -p='[
182182
{
183183
"op": "add",
184184
"path": "/spec/install/spec/deployments/0/spec/template/spec/containers/0/env/-",

docs/content/installation.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ kubectl get pods -n opendatahub
6767

6868
#### Deploy Sample Models (Optional)
6969

70-
!!! note
71-
These models use KServe's `LLMInferenceService` custom resource, which requires ODH/RHOAI with KServe enabled.
72-
7370
**Simulator Model (CPU)**
7471
```bash
7572
PROJECT_DIR=$(git rev-parse --show-toplevel)
@@ -148,14 +145,13 @@ If you prefer to test manually or troubleshoot specific components, follow these
148145

149146
#### 1. Get Gateway Endpoint
150147

151-
For OpenShift:
152148
```bash
153-
HOST="$(kubectl get gateway maas-default-gateway -n openshift-ingress -o jsonpath='{.status.addresses[0].value}')"
149+
CLUSTER_DOMAIN=$(kubectl get ingresses.config.openshift.io cluster -o jsonpath='{.spec.domain}')
150+
HOST="maas.${CLUSTER_DOMAIN}"
154151
```
155152

156153
#### 2. Get Authentication Token
157154

158-
For OpenShift:
159155
```bash
160156
TOKEN_RESPONSE=$(curl -sSk \
161157
-H "Authorization: Bearer $(oc whoami -t)" \

0 commit comments

Comments
 (0)