Skip to content

Commit 64db702

Browse files
authored
Merge pull request #573 from andresllh/fix-e2e-graph-tests-script
Fix e2e graph tests script
2 parents 3356fac + 4968ec0 commit 64db702

File tree

7 files changed

+424
-55
lines changed

7 files changed

+424
-55
lines changed
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: inferenceservice-config
5+
namespace: kserve
6+
data:
7+
explainers: "{}"
8+
oauthProxy: |-
9+
{
10+
"image" : "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08",
11+
"memoryRequest": "64Mi",
12+
"memoryLimit": "128Mi",
13+
"cpuRequest": "100m",
14+
"cpuLimit": "200m"
15+
}
16+
storageInitializer: |-
17+
{
18+
"image" : "quay.io/opendatahub/kserve-storage-initializer",
19+
"memoryRequest": "100Mi",
20+
"memoryLimit": "1Gi",
21+
"cpuRequest": "100m",
22+
"cpuLimit": "1",
23+
"enableDirectPvcVolumeMount": true,
24+
"enableModelcar": true
25+
}
26+
ingress: |-
27+
{
28+
"ingressGateway" : "knative-serving/knative-ingress-gateway",
29+
"knativeLocalGatewayService" : "knative-local-gateway.istio-system.svc.cluster.local",
30+
"ingressService" : "istio-ingressgateway.istio-system.svc.cluster.local",
31+
"localGateway" : "istio-system/kserve-local-gateway",
32+
"localGatewayService" : "kserve-local-gateway.istio-system.svc.cluster.local",
33+
"ingressDomain" : "example.com",
34+
"ingressClassName" : "istio",
35+
"domainTemplate": "example.com",
36+
"urlScheme": "https",
37+
"disableIstioVirtualHost": false,
38+
"disableIngressCreation": true
39+
}
40+
logger: |-
41+
{
42+
"image" : "quay.io/opendatahub/kserve-agent",
43+
"memoryRequest": "100Mi",
44+
"memoryLimit": "1Gi",
45+
"cpuRequest": "100m",
46+
"cpuLimit": "1",
47+
"defaultUrl": "http://default-broker"
48+
}
49+
batcher: |-
50+
{
51+
"image" : "quay.io/opendatahub/kserve-agent",
52+
"memoryRequest": "1Gi",
53+
"memoryLimit": "1Gi",
54+
"cpuRequest": "1",
55+
"cpuLimit": "1"
56+
}
57+
agent: |-
58+
{
59+
"image" : "quay.io/opendatahub/kserve-agent",
60+
"memoryRequest": "100Mi",
61+
"memoryLimit": "1Gi",
62+
"cpuRequest": "100m",
63+
"cpuLimit": "1"
64+
}
65+
router: |-
66+
{
67+
"image" : "quay.io/opendatahub/kserve-router",
68+
"memoryRequest": "100Mi",
69+
"memoryLimit": "1Gi",
70+
"cpuRequest": "100m",
71+
"cpuLimit": "1",
72+
"headers": {
73+
"propagate": [
74+
"Authorization"
75+
]
76+
}
77+
}
78+
deploy: |-
79+
{
80+
"defaultDeploymentMode": "Serverless"
81+
}
82+
metricsAggregator: |-
83+
{
84+
"enableMetricAggregation": "false",
85+
"enablePrometheusScraping" : "false"
86+
}
87+
88+
inferenceService: |-
89+
{
90+
"serviceAnnotationDisallowedList": [
91+
"autoscaling.knative.dev/initial-scale",
92+
"autoscaling.knative.dev/min-scale",
93+
"autoscaling.knative.dev/max-scale",
94+
"internal.serving.kserve.io/storage-initializer-sourceuri",
95+
"kubectl.kubernetes.io/last-applied-configuration",
96+
"security.opendatahub.io/enable-auth",
97+
"networking.knative.dev/visibility"
98+
]
99+
}
100+
101+
security: |-
102+
{
103+
"autoMountServiceAccountToken": false
104+
}

docs/odh/fvt-tests.md

Lines changed: 128 additions & 0 deletions
Large diffs are not rendered by default.

test/scripts/openshift-ci/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [FVT Test Setup and Running Tests](../../../docs/odh/fvt-tests.md)

test/scripts/openshift-ci/deploy.ossm.sh

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ cat <<EOF | oc apply -f -
3838
apiVersion: operators.coreos.com/v1alpha1
3939
kind: Subscription
4040
metadata:
41+
labels:
42+
operators.coreos.com/servicemeshoperator.openshift-operators: ""
4143
name: servicemeshoperator
4244
namespace: openshift-operators
4345
spec:
@@ -50,37 +52,52 @@ EOF
5052

5153
waitpodready "openshift-operators" "name=istio-operator"
5254

55+
# Create new namespace
56+
oc new-project istio-system
5357
# Install OSSM
5458
cat <<EOF | oc apply -f -
55-
apiVersion: v1
56-
kind: Namespace
57-
metadata:
58-
name: istio-system
59-
---
6059
apiVersion: maistra.io/v2
6160
kind: ServiceMeshControlPlane
6261
metadata:
6362
name: basic
6463
namespace: istio-system
6564
spec:
65+
tracing:
66+
type: None
6667
addons:
6768
grafana:
6869
enabled: false
6970
kiali:
70-
enabled: false
7171
name: kiali
72+
enabled: false
7273
prometheus:
7374
enabled: false
7475
jaeger:
7576
name: jaeger
76-
gateways:
77-
openshiftRoute:
78-
enabled: false
7977
security:
78+
dataPlane:
79+
mtls: true # otherwise inference-graph will not work. We use PeerAuthentication resources to force mTLS
8080
identity:
8181
type: ThirdParty
82-
tracing:
83-
type: None
82+
techPreview:
83+
meshConfig:
84+
defaultConfig:
85+
terminationDrainDuration: 35s
86+
gateways:
87+
openshiftRoute:
88+
enabled: false
89+
ingress:
90+
service:
91+
metadata:
92+
labels:
93+
knative: ingressgateway
94+
proxy:
95+
networking:
96+
trafficControl:
97+
inbound:
98+
excludedPorts:
99+
- 8444 # metrics
100+
- 8022 # serving: wait-for-drain k8s pre-stop hook
84101
EOF
85102

86103
# Waiting for OSSM minimum start

0 commit comments

Comments
 (0)