Skip to content

Commit ba3a427

Browse files
danish9039danish9039
committed
fix: update kserve models web application for PR kubeflow#163 restructure
Prepares kubeflow/manifests for kserve/models-web-app PR kubeflow#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 kubeflow#163 HEAD SHA. Update to real release tag once kserve/models-web-app PR kubeflow#163 merges. Related: kserve/models-web-app#163 Signed-off-by: danish9039 <danishsiddiqui040@gmail.com>
1 parent 8b00e94 commit ba3a427

23 files changed

Lines changed: 226 additions & 154 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

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
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
1818
seccompProfile:
1919
type: RuntimeDefault
2020
containers:
21-
- image: kserve/models-web-app:latest
22-
imagePullPolicy: Always
23-
name: kserve-models-web-app
24-
env:
25-
- name: GUNICORN_CMD_ARGS
26-
value: --limit-request-field_size 32000
27-
envFrom:
28-
- configMapRef:
29-
name: kserve-models-web-app-config
30-
ports:
31-
- containerPort: 5000
32-
name: http
33-
livenessProbe:
34-
httpGet:
35-
path: /healthz/liveness
36-
port: http
37-
initialDelaySeconds: 0
38-
periodSeconds: 10
39-
timeoutSeconds: 1
40-
failureThreshold: 3
41-
successThreshold: 1
42-
readinessProbe:
43-
httpGet:
44-
path: /healthz/readiness
45-
port: http
46-
initialDelaySeconds: 0
47-
periodSeconds: 10
48-
timeoutSeconds: 1
49-
failureThreshold: 3
50-
successThreshold: 1
51-
securityContext:
52-
allowPrivilegeEscalation: false
53-
capabilities:
54-
drop:
55-
- ALL
56-
runAsUser: 1000
57-
serviceAccountName: kserve-models-web-app
21+
- image: kserve/models-web-app:latest
22+
imagePullPolicy: Always
23+
name: kserve-models-web-application
24+
env:
25+
- name: GUNICORN_CMD_ARGS
26+
value: --limit-request-field_size 32000
27+
envFrom:
28+
- configMapRef:
29+
name: kserve-models-web-application-config
30+
ports:
31+
- containerPort: 5000
32+
name: http
33+
livenessProbe:
34+
httpGet:
35+
path: /healthz/liveness
36+
port: http
37+
initialDelaySeconds: 0
38+
periodSeconds: 10
39+
timeoutSeconds: 1
40+
failureThreshold: 3
41+
successThreshold: 1
42+
readinessProbe:
43+
httpGet:
44+
path: /healthz/readiness
45+
port: http
46+
initialDelaySeconds: 0
47+
periodSeconds: 10
48+
timeoutSeconds: 1
49+
failureThreshold: 3
50+
successThreshold: 1
51+
securityContext:
52+
allowPrivilegeEscalation: false
53+
capabilities:
54+
drop:
55+
- ALL
56+
runAsUser: 1000
57+
serviceAccountName: kserve-models-web-application

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

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
resources:
2-
- rbac.yaml
3-
- service.yaml
4-
- deployment.yaml
5-
- istio.yaml
6-
2+
- rbac.yaml
3+
- service.yaml
4+
- deployment.yaml
75
namespace: kserve
86

9-
107
images:
11-
- name: kserve/models-web-app
12-
newName: ghcr.io/kserve/models-web-app
13-
newTag: 0.16.1
8+
- name: kserve/models-web-app
9+
newName: ghcr.io/kserve/models-web-app
10+
newTag: 0.16.1
1411
configMapGenerator:
15-
- literals:
16-
- APP_DISABLE_AUTH="True"
17-
- GRAFANA_PREFIX="/grafana"
18-
- GRAFANA_CPU_MEMORY_DB="db/knative-serving-revision-cpu-and-memory-usage"
19-
- GRAFANA_HTTP_REQUESTS_DB="db/knative-serving-revision-http-requests"
20-
name: kserve-models-web-app-config
12+
- literals:
13+
- APP_DISABLE_AUTH="True"
14+
- GRAFANA_PREFIX="/grafana"
15+
- GRAFANA_CPU_MEMORY_DB="db/knative-serving-revision-cpu-and-memory-usage"
16+
- GRAFANA_HTTP_REQUESTS_DB="db/knative-serving-revision-http-requests"
17+
name: kserve-models-web-application-config
2118
apiVersion: kustomize.config.k8s.io/v1beta1
2219
kind: Kustomization
2320
labels:
24-
- includeSelectors: true
25-
pairs:
26-
app.kubernetes.io/component: kserve-models-web-app
27-
kustomize.component: kserve-models-web-app
21+
- includeSelectors: true
22+
pairs:
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

‎applications/kserve/models-web-app/base/service.yaml‎

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

‎applications/kserve/models-web-app/components/common/kustomization.yaml‎

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

‎applications/kserve/models-web-app/components/istio/authorization-policy.yaml‎

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

‎applications/kserve/models-web-app/components/istio/kustomization.yaml‎

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

applications/kserve/models-web-app/base/istio.yaml renamed to applications/kserve/models-web-app/components/istio/virtual-service.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
apiVersion: networking.istio.io/v1beta1
22
kind: VirtualService
33
metadata:
4-
name: kserve-models-web-app
4+
name: kserve-models-web-application
55
namespace: kserve
6+
labels:
7+
app.kubernetes.io/component: kserve-models-web-application
8+
kustomize.component: kserve-models-web-application
69
spec:
710
gateways:
811
- knative-serving/knative-ingress-gateway
@@ -16,6 +19,6 @@ spec:
1619
uri: /
1720
route:
1821
- destination:
19-
host: kserve-models-web-app.kserve.svc.cluster.local
22+
host: kserve-models-web-application.kserve.svc.cluster.local
2023
port:
2124
number: 80

applications/kserve/models-web-app/overlays/kubeflow/patches/web-app-sidecar.yaml renamed to applications/kserve/models-web-app/components/istio/web-application-sidecar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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
template:

0 commit comments

Comments
 (0)