Skip to content

Commit c736d93

Browse files
fix: update kserve models web application for PR #163 restructure (#3393)
* fix: update kserve models web application for PR #163 restructure Prepares kubeflow/manifests for kserve/models-web-app PR #163 which: - Moves manifests from config/ to manifests/kustomize/ - Adds components/ layer for Istio and common labels - Renames deployment: kserve-models-web-app -> kserve-models-web-application Changes: - Sync new manifests/kustomize/ structure into applications/kserve/models-web-app/ - Rename all resources, labels, selectors to kserve-models-web-application - Update tests/kserve_install.sh deployment wait - Update tests/kserve_test.sh Test 3: port-forward to new service, kubeflow-userid auth headers, retry bootstrap loop - Update .github/workflows/kserve_models_web_application_test.yaml - Update Helm chart parity for the renamed manifests and Kubeflow overlay - Update Chart.yaml appVersion and values.yaml imageTag to 0.16.0 - Update tests/helm_kustomize_compare.py expectations - Update sync script SOURCE_MANIFESTS_PATH and COMMIT placeholder NOTE: COMMIT=195cabdf is a placeholder for PR #163 HEAD SHA. Update to real release tag once kserve/models-web-app PR #163 merges. Related: kserve/models-web-app#163 Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * fix: narrow kserve test changes and restore Helm naming tests/kserve_test.sh: revert the port-forward, auth headers, retry loop, and extra XSRF validation so the file returns to upstream behavior with only the deployment rename. This matches the green fork validation where Test 3 passed through the standard gateway path. experimental/helm/charts/kserve-models-web-app: - Chart.yaml: rename chart name to kserve-models-web-application - templates/_helpers.tpl: restore standard name/fullname/chart helpers that derive from .Chart.Name To keep the repo's parity gate consistent with the new chart name, tests/helm_kustomize_compare.sh now renders the KServe chart with Helm release name kserve-models-web-application for both scenarios. Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * chore(kserve-web-app): defer helm parity follow-up Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * docs(kserve-web-app): update sync source reference Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * style(kserve-web-app): reduce yaml diff churn Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * test kserve models web app auth flow Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * revert kserve test changes Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * fix models web app test headers Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * allow ingress to kserve models web application Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * revert models web app test headers Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * align kserve downstream helpers Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> * Delete applications/kserve/Makefile Signed-off-by: Julius von Kohout <45896133+juliusvonkohout@users.noreply.github.com> --------- Signed-off-by: danish9039 <danishsiddiqui040@gmail.com> Signed-off-by: Julius von Kohout <45896133+juliusvonkohout@users.noreply.github.com> Co-authored-by: Julius von Kohout <45896133+juliusvonkohout@users.noreply.github.com>
1 parent af5ad45 commit c736d93

20 files changed

Lines changed: 83 additions & 125 deletions

.github/workflows/kserve_models_web_application_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ jobs:
6666
run: |
6767
kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s --field-selector=status.phase!=Succeeded
6868
sleep 10
69-
kubectl get deployment kserve-models-web-app -n kubeflow
70-
kubectl wait --for=condition=Available deployment/kserve-models-web-app -n kubeflow --timeout=60s
69+
kubectl get deployment kserve-models-web-application -n kubeflow
70+
kubectl wait --for=condition=Available deployment/kserve-models-web-application -n kubeflow --timeout=60s
7171
7272
- name: Port-forward the istio-ingress gateway
7373
run: ./tests/port_forward_gateway.sh

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This repository periodically synchronizes all official Kubeflow components from
7575
| Volumes Web Application | applications/volumes-web-app/upstream | [v1.10.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0/components/crud-web-apps/volumes/manifests) | 4m | 226Mi | 0GB |
7676
| Katib | applications/katib/upstream | [v0.19.0](https://github.com/kubeflow/katib/tree/v0.19.0/manifests/v1beta1) | 13m | 476Mi | 10GB |
7777
| KServe | applications/kserve/kserve | [v0.16.0](https://github.com/kserve/kserve/releases/tag/v0.16.0/install/v0.16.0) | 600m | 1200Mi | 0GB |
78-
| KServe Models Web Application | applications/kserve/models-web-app | [v0.16.1](https://github.com/kserve/models-web-app/tree/v0.16.1/config) | 6m | 259Mi | 0GB |
78+
| KServe Models Web Application | applications/kserve/models-web-app | [c71ee4309f0335159d9fdfd4559a538b5c782c92](https://github.com/kserve/models-web-app/tree/c71ee4309f0335159d9fdfd4559a538b5c782c92/manifests/kustomize) | 6m | 259Mi | 0GB |
7979
| Kubeflow Pipelines | applications/pipeline/upstream | [2.16.0](https://github.com/kubeflow/pipelines/tree/2.16.0/manifests/kustomize) | 970m | 3552Mi | 35GB |
8080
| Kubeflow Model Registry | applications/model-registry/upstream | [v0.3.7](https://github.com/kubeflow/model-registry/tree/v0.3.7/manifests/kustomize) | 510m | 2112Mi | 20GB |
8181
| Spark Operator | applications/spark/spark-operator | [2.5.0](https://github.com/kubeflow/spark-operator/tree/v2.5.0) | 9m | 41Mi | 0GB |

applications/kserve/Makefile

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

applications/kserve/models-web-app/base/deployment.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: kserve-models-web-app
4+
name: kserve-models-web-application
55
namespace: kserve
66
spec:
77
replicas: 1
88
selector:
99
matchLabels:
10-
app.kubernetes.io/component: kserve-models-web-app
10+
app.kubernetes.io/component: kserve-models-web-application
1111
template:
1212
metadata:
1313
labels:
14-
app.kubernetes.io/component: kserve-models-web-app
14+
app.kubernetes.io/component: kserve-models-web-application
1515
spec:
1616
securityContext:
1717
runAsNonRoot: true
@@ -20,13 +20,13 @@ spec:
2020
containers:
2121
- image: kserve/models-web-app:latest
2222
imagePullPolicy: Always
23-
name: kserve-models-web-app
23+
name: kserve-models-web-application
2424
env:
2525
- name: GUNICORN_CMD_ARGS
2626
value: --limit-request-field_size 32000
2727
envFrom:
2828
- configMapRef:
29-
name: kserve-models-web-app-config
29+
name: kserve-models-web-application-config
3030
ports:
3131
- containerPort: 5000
3232
name: http
@@ -54,4 +54,4 @@ spec:
5454
drop:
5555
- ALL
5656
runAsUser: 1000
57-
serviceAccountName: kserve-models-web-app
57+
serviceAccountName: kserve-models-web-application

applications/kserve/models-web-app/base/kustomization.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ resources:
22
- rbac.yaml
33
- service.yaml
44
- deployment.yaml
5-
- istio.yaml
6-
75
namespace: kserve
86

9-
107
images:
118
- name: kserve/models-web-app
129
newName: ghcr.io/kserve/models-web-app
@@ -17,11 +14,11 @@ configMapGenerator:
1714
- GRAFANA_PREFIX="/grafana"
1815
- GRAFANA_CPU_MEMORY_DB="db/knative-serving-revision-cpu-and-memory-usage"
1916
- GRAFANA_HTTP_REQUESTS_DB="db/knative-serving-revision-http-requests"
20-
name: kserve-models-web-app-config
17+
name: kserve-models-web-application-config
2118
apiVersion: kustomize.config.k8s.io/v1beta1
2219
kind: Kustomization
2320
labels:
2421
- includeSelectors: true
2522
pairs:
26-
app.kubernetes.io/component: kserve-models-web-app
27-
kustomize.component: kserve-models-web-app
23+
app.kubernetes.io/component: kserve-models-web-application
24+
kustomize.component: kserve-models-web-application

applications/kserve/models-web-app/base/rbac.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4-
name: kserve-models-web-app
4+
name: kserve-models-web-application
55
namespace: kserve
66
---
77
apiVersion: rbac.authorization.k8s.io/v1
88
kind: ClusterRole
99
metadata:
10-
name: kserve-models-web-app-cluster-role
10+
name: kserve-models-web-application-cluster-role
1111
rules:
1212
- apiGroups:
1313
- authorization.k8s.io
@@ -59,12 +59,12 @@ rules:
5959
apiVersion: rbac.authorization.k8s.io/v1
6060
kind: ClusterRoleBinding
6161
metadata:
62-
name: kserve-models-web-app-binding
62+
name: kserve-models-web-application-binding
6363
roleRef:
6464
apiGroup: rbac.authorization.k8s.io
6565
kind: ClusterRole
66-
name: kserve-models-web-app-cluster-role
66+
name: kserve-models-web-application-cluster-role
6767
subjects:
6868
- kind: ServiceAccount
69-
name: kserve-models-web-app
69+
name: kserve-models-web-application
7070
namespace: kserve
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: kserve-models-web-app
4+
name: kserve-models-web-application
55
namespace: kserve
66
spec:
77
ports:
@@ -10,5 +10,5 @@ spec:
1010
protocol: TCP
1111
targetPort: 5000
1212
selector:
13-
app.kubernetes.io/component: kserve-models-web-app
13+
app.kubernetes.io/component: kserve-models-web-application
1414
type: ClusterIP
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: kustomize.config.k8s.io/v1alpha1
2+
kind: Component
3+
4+
labels:
5+
- includeSelectors: false
6+
pairs:
7+
app.kubernetes.io/managed-by: kustomize
8+
app.kubernetes.io/name: models-web-application
9+
app.kubernetes.io/part-of: models-web-application
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: security.istio.io/v1beta1
2+
kind: AuthorizationPolicy
3+
metadata:
4+
labels:
5+
kustomize.component: kserve-models-web-application
6+
app.kubernetes.io/component: kserve-models-web-application
7+
name: kserve-models-web-application
8+
spec:
9+
action: ALLOW
10+
selector:
11+
matchLabels:
12+
kustomize.component: kserve-models-web-application
13+
app.kubernetes.io/component: kserve-models-web-application
14+
rules:
15+
- from:
16+
- source:
17+
principals:
18+
- cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: kustomize.config.k8s.io/v1alpha1
2+
kind: Component
3+
4+
resources:
5+
- virtual-service.yaml
6+
- authorization-policy.yaml
7+
8+
patches:
9+
- path: web-application-sidecar.yaml

0 commit comments

Comments
 (0)