Skip to content

Commit fec83b9

Browse files
committed
refactor(manifests): use full web application resource names
Signed-off-by: alokdangre <alokdangre@gmail.com>
1 parent e671bbe commit fec83b9

File tree

13 files changed

+44
-40
lines changed

13 files changed

+44
-40
lines changed

.github/workflows/test-manifests.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
actions: read
1111

1212
jobs:
13-
test-models-web-app:
13+
test-models-web-application:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Models Web Application
@@ -50,6 +50,10 @@ jobs:
5050
cp -R models-web-app/manifests/kustomize/components manifests/applications/kserve/models-web-app/
5151
cp -R models-web-app/manifests/kustomize/overlays manifests/applications/kserve/models-web-app/
5252
53+
- name: Align kubeflow/manifests KServe install test with renamed deployment
54+
run: |
55+
sed -i 's/kserve-models-web-app/kserve-models-web-application/g' manifests/tests/kserve_install.sh
56+
5357
- name: Install Istio CNI
5458
working-directory: manifests
5559
run: ./tests/istio-cni_install.sh
@@ -90,7 +94,7 @@ jobs:
9094
- name: Wait for KServe Models Web Application deployment
9195
run: |
9296
kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s --field-selector=status.phase!=Succeeded
93-
kubectl wait --for=condition=Available deployment/kserve-models-web-app -n kubeflow --timeout=60s
97+
kubectl wait --for=condition=Available deployment/kserve-models-web-application -n kubeflow --timeout=60s
9498
sleep 10
9599
96100
- name: Setup python 3.12
@@ -108,9 +112,9 @@ jobs:
108112
- name: Debug KServe Models Web Application connectivity
109113
if: failure()
110114
run: |
111-
kubectl get deployment,service,endpoints,pods -n kubeflow -l app.kubernetes.io/component=kserve-models-web-app || true
112-
kubectl describe deployment kserve-models-web-app -n kubeflow || true
113-
kubectl logs deployment/kserve-models-web-app -n kubeflow --all-containers=true --tail=200 || true
115+
kubectl get deployment,service,endpoints,pods -n kubeflow -l app.kubernetes.io/component=kserve-models-web-application || true
116+
kubectl describe deployment kserve-models-web-application -n kubeflow || true
117+
kubectl logs deployment/kserve-models-web-application -n kubeflow --all-containers=true --tail=200 || true
114118
115119
- name: Apply Pod Security Standards restricted levels
116120
working-directory: manifests

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CONFIG=manifests/kustomize/base/kustomization.yaml
3838
vim ${CONFIG}
3939

4040
# Add the following env vars to the configMapGenerator's literals
41-
# for kserve-models-web-app-config
41+
# for kserve-models-web-application-config
4242
- APP_PREFIX=/
4343
- APP_DISABLE_AUTH="True"
4444
- APP_SECURE_COOKIES="False"
@@ -95,12 +95,12 @@ Add the environment variable to your deployment configuration:
9595
apiVersion: apps/v1
9696
kind: Deployment
9797
metadata:
98-
name: kserve-models-web-app
98+
name: kserve-models-web-application
9999
spec:
100100
template:
101101
spec:
102102
containers:
103-
- name: kserve-models-web-app
103+
- name: kserve-models-web-application
104104
env:
105105
- name: ALLOWED_NAMESPACES
106106
value: "kubeflow-user,kubeflow-admin"
@@ -110,7 +110,7 @@ spec:
110110
111111
The application supports runtime configuration of Grafana endpoints and dashboard names, allowing you to use custom Grafana instances and dashboard configurations without rebuilding the application.
112112
113-
If you're deploying on Kubernetes with Kustomize, you can set these values in the application's ConfigMap by editing the `manifests/kustomize/base/kustomization.yaml` (or your overlay) under `configMapGenerator` for `kserve-models-web-app-config`. Update the following literals as needed:
113+
If you're deploying on Kubernetes with Kustomize, you can set these values in the application's ConfigMap by editing the `manifests/kustomize/base/kustomization.yaml` (or your overlay) under `configMapGenerator` for `kserve-models-web-application-config`. Update the following literals as needed:
114114

115115
- `GRAFANA_PREFIX` (e.g., `/grafana` or `/custom-grafana`)
116116
- `GRAFANA_CPU_MEMORY_DB` (e.g., `db/custom-cpu-memory-dashboard`)

manifests/kustomize/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

manifests/kustomize/base/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ configMapGenerator:
1414
- GRAFANA_PREFIX="/grafana"
1515
- GRAFANA_CPU_MEMORY_DB="db/knative-serving-revision-cpu-and-memory-usage"
1616
- GRAFANA_HTTP_REQUESTS_DB="db/knative-serving-revision-http-requests"
17-
name: kserve-models-web-app-config
17+
name: kserve-models-web-application-config
1818
apiVersion: kustomize.config.k8s.io/v1beta1
1919
kind: Kustomization
2020
labels:
2121
- includeSelectors: true
2222
pairs:
23-
app.kubernetes.io/component: kserve-models-web-app
24-
kustomize.component: kserve-models-web-app
23+
app.kubernetes.io/component: kserve-models-web-application
24+
kustomize.component: kserve-models-web-application

manifests/kustomize/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
@@ -57,12 +57,12 @@ rules:
5757
apiVersion: rbac.authorization.k8s.io/v1
5858
kind: ClusterRoleBinding
5959
metadata:
60-
name: kserve-models-web-app-binding
60+
name: kserve-models-web-application-binding
6161
roleRef:
6262
apiGroup: rbac.authorization.k8s.io
6363
kind: ClusterRole
64-
name: kserve-models-web-app-cluster-role
64+
name: kserve-models-web-application-cluster-role
6565
subjects:
6666
- kind: ServiceAccount
67-
name: kserve-models-web-app
67+
name: kserve-models-web-application
6868
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

manifests/kustomize/components/common/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ labels:
55
- includeSelectors: false
66
pairs:
77
app.kubernetes.io/managed-by: kustomize
8-
app.kubernetes.io/name: models-web-app
9-
app.kubernetes.io/part-of: models-web-app
8+
app.kubernetes.io/name: models-web-application
9+
app.kubernetes.io/part-of: models-web-application

manifests/kustomize/components/istio/authorization-policy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apiVersion: security.istio.io/v1beta1
22
kind: AuthorizationPolicy
33
metadata:
44
labels:
5-
kustomize.component: kserve-models-web-app
6-
app.kubernetes.io/component: kserve-models-web-app
7-
name: kserve-models-web-app
5+
kustomize.component: kserve-models-web-application
6+
app.kubernetes.io/component: kserve-models-web-application
7+
name: kserve-models-web-application
88
spec:
99
action: ALLOW
1010
selector:
1111
matchLabels:
12-
kustomize.component: kserve-models-web-app
13-
app.kubernetes.io/component: kserve-models-web-app
12+
kustomize.component: kserve-models-web-application
13+
app.kubernetes.io/component: kserve-models-web-application
1414
rules:
1515
- from:
1616
- source:

manifests/kustomize/components/istio/virtual-service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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
66
spec:
77
gateways:
@@ -16,6 +16,6 @@ spec:
1616
uri: /
1717
route:
1818
- destination:
19-
host: kserve-models-web-app.kserve.svc.cluster.local
19+
host: kserve-models-web-application.kserve.svc.cluster.local
2020
port:
2121
number: 80

manifests/kustomize/components/istio/web-app-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)