Skip to content

Commit 5c4f985

Browse files
chore: promote stable to rhoai (#964)
## Promotion: stable → rhoai Automated promotion of **11 commit(s)** from `stable` to `rhoai`. | Detail | Value | | --- | --- | | Promotion | `stable` → `rhoai` | | Commits to merge | **11** | | Conflict check | ✅ Passed | ### Commits included ```` 81628d8 feat: add pre-auth ext_proc stage for body-based model routing (#948) 5127624 fix: use tiny-gpt2 URI for premium simulator in CI (#961) 3bb5b77 fix: route subscription latency to odh monitoring stack (#906) 06ffb2d fix: revert "feat: move external cronjob to run timely cleanup to goroutin… (#953) 44613ee feat: move external cronjob to run timely cleanup to goroutine+configable for internval of cleanup (#934) a7f20f0 fix: update ODH version in scripts to get up-to-date TLS feature (#945) dfb6bb3 test: enable OIDC by default in E2E and expand test coverage (3→16 tests) (#679) 37e9be9 fix: remove namespace field from model refs in GET /subscriptions response (#915) ae511cc feat: alert on authorino maas-api metadata evaluator failures (#895) d1cfced docs: add payload processing namespace configuration reference (#822) ```` --- ⚠️ **Merge this PR with a merge commit** (do not squash or rebase).
2 parents bbc8091 + 40c840d commit 5c4f985

41 files changed

Lines changed: 1703 additions & 271 deletions

Some content is hidden

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

.github/hack/install-odh.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
# OPERATOR_CATALOG - Custom catalog image (optional). When unset, uses community-operators.
99
# Set to e.g. quay.io/opendatahub/opendatahub-operator-catalog:latest for custom builds.
1010
# OPERATOR_CHANNEL - Subscription channel (default: fast-3)
11-
# OPERATOR_STARTING_CSV - Pin Subscription startingCSV (default: opendatahub-operator.v3.4.0-ea.1). Set to "-" to omit.
11+
# OPERATOR_STARTING_CSV - Pin Subscription startingCSV (optional). When unset,
12+
# follow the channel head (latest in fast-3 by default).
1213
# OPERATOR_INSTALL_PLAN_APPROVAL - Manual (default) or Automatic; use "-" to omit.
1314
# Manual: blocks auto-upgrades; this script auto-approves only the first InstallPlan so install does not stall.
1415
# OPERATOR_IMAGE - Custom operator image to patch into CSV (optional)
@@ -124,9 +125,9 @@ else
124125
channel="${OPERATOR_CHANNEL:-fast-3}"
125126
fi
126127

127-
# Pin to ODH 3.4 EA1 unless overridden (omit with OPERATOR_STARTING_CSV=- to follow channel head)
128-
starting_csv="${OPERATOR_STARTING_CSV:-opendatahub-operator.v3.4.0-ea.1}"
129-
[[ "$starting_csv" == "-" ]] && starting_csv=""
128+
# Follow the configured channel head by default unless OPERATOR_STARTING_CSV
129+
# explicitly pins a CSV.
130+
starting_csv="${OPERATOR_STARTING_CSV:-}"
130131

131132
# Manual = no auto-upgrades; install_olm_operator still approves the first InstallPlan programmatically
132133
plan_approval="${OPERATOR_INSTALL_PLAN_APPROVAL:-Manual}"

.github/workflows/openapi-validation.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ jobs:
112112
git fetch origin "$BASE_REF"
113113
git show "origin/$BASE_REF:maas-api/openapi3.yaml" > base-spec.yaml
114114
115-
# Run breaking change detection
116-
oasdiff breaking base-spec.yaml maas-api/openapi3.yaml > breaking-changes.txt || true
115+
# Run breaking change detection (--warn-ignore suppresses acknowledged warnings)
116+
oasdiff breaking base-spec.yaml maas-api/openapi3.yaml \
117+
--warn-ignore maas-api/oasdiff-warn-ignore.txt > breaking-changes.txt || true
117118
118119
# Check if actual breaking changes were detected.
119120
# oasdiff outputs "No changes detected" when specs are identical, and
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# PrometheusRule: alert when Authorino HTTP metadata evaluators for maas-api fail often.
2+
#
3+
# Scraped metrics come from Authorino /server-metrics (see authorino-server-metrics-servicemonitor.yaml).
4+
# Requires metadata rules apiKeyValidation + subscription-info with metrics enabled (MaaS controller).
5+
#
6+
# Deployed by: scripts/observability/install-observability.sh → kustomize build deployment/base/observability
7+
apiVersion: monitoring.coreos.com/v1
8+
kind: PrometheusRule
9+
metadata:
10+
name: authorino-maas-metadata-evaluator-high-failure-rate
11+
namespace: kuadrant-system
12+
labels:
13+
app.kubernetes.io/part-of: maas-observability
14+
app.kubernetes.io/component: alerting
15+
spec:
16+
groups:
17+
- name: maas.authorino.metadata
18+
rules:
19+
- alert: MaaSAuthorinoMetadataEvaluatorHighFailureRate
20+
annotations:
21+
summary: Authorino maas-api metadata HTTP evaluators are failing often
22+
description: >-
23+
Over the last 5 minutes, more than 10% of Authorino HTTP metadata evaluations
24+
for apiKeyValidation or subscription-info (calls to maas-api) were cancelled/failed.
25+
Investigate maas-api health, network policies, TLS trust between Authorino and maas-api,
26+
and subscription/API-key validation paths.
27+
expr: |
28+
(
29+
sum(rate(auth_server_evaluator_cancelled{namespace=~"rh-connectivity-link|kuadrant-system",evaluator_type="METADATA_GENERIC_HTTP",evaluator_name=~"apiKeyValidation|subscription-info"}[5m]))
30+
/
31+
sum(rate(auth_server_evaluator_total{namespace=~"rh-connectivity-link|kuadrant-system",evaluator_type="METADATA_GENERIC_HTTP",evaluator_name=~"apiKeyValidation|subscription-info"}[5m]))
32+
) > 0.1
33+
and
34+
sum(rate(auth_server_evaluator_total{namespace=~"rh-connectivity-link|kuadrant-system",evaluator_type="METADATA_GENERIC_HTTP",evaluator_name=~"apiKeyValidation|subscription-info"}[5m])) > 0.001
35+
for: 5m
36+
labels:
37+
severity: warning

deployment/base/observability/istio-gateway-servicemonitor.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metadata:
77
labels:
88
app.kubernetes.io/part-of: maas-observability
99
app.kubernetes.io/managed-by: maas-observability
10+
monitoring.opendatahub.io/scrape: 'true'
11+
monitoring.openshift.io/collection-profile: minimal
12+
openshift.io/user-monitoring: 'false'
1013
spec:
1114
selector:
1215
matchLabels:

deployment/base/observability/kustomization.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ resources:
1414
# NOTE: istio-gateway-service.yaml and istio-gateway-servicemonitor.yaml are NOT
1515
# included here. They are applied conditionally by install-observability.sh only
1616
# when the gateway deployment exists.
17+
#
18+
# NOTE: authorino-maas-metadata-evaluator-prometheusrule.yaml is NOT included here.
19+
# It has a hardcoded namespace (kuadrant-system) which causes problems in RHOAI
20+
# (rh-connectivity-link). The install-observability.sh script deploys it with
21+
# dynamic namespace substitution.
1722
- gateway-telemetry-policy.yaml
1823
- istio-gateway-telemetry.yaml
1924

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- ../instance

deployment/base/payload-processing/manager/deployment.yaml renamed to deployment/base/payload-processing/instance/deployment.yaml

File renamed without changes.

deployment/base/payload-processing/manager/destination-rule.yaml renamed to deployment/base/payload-processing/instance/destination-rule.yaml

File renamed without changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- deployment.yaml
6+
- service.yaml
7+
- destination-rule.yaml

deployment/base/payload-processing/manager/service.yaml renamed to deployment/base/payload-processing/instance/service.yaml

File renamed without changes.

0 commit comments

Comments
 (0)