fix: update kserve models web application for PR #163 restructure

.github/workflows/kserve_models_web_application_test.yaml

@@ -66,8 +66,8 @@ jobs:
       run: |
         kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s --field-selector=status.phase!=Succeeded
         sleep 10
-        kubectl get deployment kserve-models-web-app -n kubeflow
-        kubectl wait --for=condition=Available deployment/kserve-models-web-app -n kubeflow --timeout=60s
+        kubectl get deployment kserve-models-web-application -n kubeflow
+        kubectl wait --for=condition=Available deployment/kserve-models-web-application -n kubeflow --timeout=60s
 
     - name: Port-forward the istio-ingress gateway
       run: ./tests/port_forward_gateway.sh

README.md

@@ -75,7 +75,7 @@ This repository periodically synchronizes all official Kubeflow components from
 | 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 |
 | Katib | applications/katib/upstream | [v0.19.0](https://github.com/kubeflow/katib/tree/v0.19.0/manifests/v1beta1) | 13m | 476Mi | 10GB |
 | KServe | applications/kserve/kserve | [v0.16.0](https://github.com/kserve/kserve/releases/tag/v0.16.0/install/v0.16.0) | 600m | 1200Mi | 0GB |
-| 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 |
+| KServe Models Web Application | applications/kserve/models-web-app | [c71ee4309f0335159d9fdfd4559a538b5c782c92](https://github.com/kserve/models-web-app/tree/c71ee4309f0335159d9fdfd4559a538b5c782c92/manifests/kustomize) | 6m | 259Mi  | 0GB |
 | Kubeflow Pipelines | applications/pipeline/upstream | [2.16.0](https://github.com/kubeflow/pipelines/tree/2.16.0/manifests/kustomize) | 970m | 3552Mi | 35GB |
 | 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 |
 | Spark Operator	|	applications/spark/spark-operator	|	[2.5.0](https://github.com/kubeflow/spark-operator/tree/v2.5.0) | 9m | 41Mi | 0GB |

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

@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: kserve-models-web-app
+  name: kserve-models-web-application
   namespace: kserve
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/component: kserve-models-web-app
+      app.kubernetes.io/component: kserve-models-web-application
   template:
     metadata:
       labels:
-        app.kubernetes.io/component: kserve-models-web-app
+        app.kubernetes.io/component: kserve-models-web-application
     spec:
       securityContext:
         runAsNonRoot: true
@@ -20,13 +20,13 @@ spec:
       containers:
       - image: kserve/models-web-app:latest
         imagePullPolicy: Always
-        name: kserve-models-web-app
+        name: kserve-models-web-application
         env:
           - name: GUNICORN_CMD_ARGS
             value: --limit-request-field_size 32000
         envFrom:
           - configMapRef:
-              name: kserve-models-web-app-config
+              name: kserve-models-web-application-config
         ports:
         - containerPort: 5000
           name: http
@@ -54,4 +54,4 @@ spec:
             drop:
               - ALL
           runAsUser: 1000
-      serviceAccountName: kserve-models-web-app
+      serviceAccountName: kserve-models-web-application

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

@@ -2,11 +2,8 @@ resources:
 - rbac.yaml
 - service.yaml
 - deployment.yaml
-- istio.yaml
-
 namespace: kserve
 
-
 images:
 - name: kserve/models-web-app
   newName: ghcr.io/kserve/models-web-app
@@ -17,11 +14,11 @@ configMapGenerator:
   - GRAFANA_PREFIX="/grafana"
   - GRAFANA_CPU_MEMORY_DB="db/knative-serving-revision-cpu-and-memory-usage"
   - GRAFANA_HTTP_REQUESTS_DB="db/knative-serving-revision-http-requests"
-  name: kserve-models-web-app-config
+  name: kserve-models-web-application-config
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 labels:
 - includeSelectors: true
   pairs:
-    app.kubernetes.io/component: kserve-models-web-app
-    kustomize.component: kserve-models-web-app
+    app.kubernetes.io/component: kserve-models-web-application
+    kustomize.component: kserve-models-web-application

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

@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: kserve-models-web-app
+  name: kserve-models-web-application
   namespace: kserve
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: kserve-models-web-app-cluster-role
+  name: kserve-models-web-application-cluster-role
 rules:
 - apiGroups:
   - authorization.k8s.io
@@ -59,12 +59,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: kserve-models-web-app-binding
+  name: kserve-models-web-application-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: kserve-models-web-app-cluster-role
+  name: kserve-models-web-application-cluster-role
 subjects:
 - kind: ServiceAccount
-  name: kserve-models-web-app
+  name: kserve-models-web-application
   namespace: kserve

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

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: kserve-models-web-app
+  name: kserve-models-web-application
   namespace: kserve
 spec:
   ports:
@@ -10,5 +10,5 @@ spec:
     protocol: TCP
     targetPort: 5000
   selector:
-    app.kubernetes.io/component: kserve-models-web-app
+    app.kubernetes.io/component: kserve-models-web-application
   type: ClusterIP

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

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+labels:
+  - includeSelectors: false
+    pairs:
+      app.kubernetes.io/managed-by: kustomize
+      app.kubernetes.io/name: models-web-application
+      app.kubernetes.io/part-of: models-web-application

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

@@ -0,0 +1,18 @@
+apiVersion: security.istio.io/v1beta1
+kind: AuthorizationPolicy
+metadata:
+  labels:
+    kustomize.component: kserve-models-web-application
+    app.kubernetes.io/component: kserve-models-web-application
+  name: kserve-models-web-application
+spec:
+  action: ALLOW
+  selector:
+    matchLabels:
+      kustomize.component: kserve-models-web-application
+      app.kubernetes.io/component: kserve-models-web-application
+  rules:
+  - from:
+    - source:
+        principals:
+        - cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account

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

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - virtual-service.yaml
+  - authorization-policy.yaml
+
+patches:
+  - path: web-application-sidecar.yaml

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

@@ -1,8 +1,11 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: kserve-models-web-app
+  name: kserve-models-web-application
   namespace: kserve
+  labels:
+    app.kubernetes.io/component: kserve-models-web-application
+    kustomize.component: kserve-models-web-application
 spec:
   gateways:
   - knative-serving/knative-ingress-gateway
@@ -16,6 +19,6 @@ spec:
       uri: /
     route:
     - destination:
-        host: kserve-models-web-app.kserve.svc.cluster.local
+        host: kserve-models-web-application.kserve.svc.cluster.local
         port:
           number: 80

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

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: kserve-models-web-app
+  name: kserve-models-web-application
   namespace: kserve
 spec:
   template:

applications/kserve/models-web-app/overlays/kubeflow/kustomization.yaml

@@ -9,9 +9,9 @@ namespace: kubeflow
 generatorOptions:
   disableNameSuffixHash: true
 
-# To make namespace for standalone installation kustomizable,
-# variabalize ingress gateway, webhook service name and
-# kserve namespace in webhook configurations
+# Kubeflow overlay configuration for the kserve-models-web-application:
+# defines the ConfigMap generator, shared configuration, components,
+# and the VirtualService patch used in this environment.
 configMapGenerator:
 - behavior: replace
   literals:
@@ -21,24 +21,26 @@ configMapGenerator:
   - GRAFANA_PREFIX=/grafana
   - GRAFANA_CPU_MEMORY_DB=db/knative-serving-revision-cpu-and-memory-usage
   - GRAFANA_HTTP_REQUESTS_DB=db/knative-serving-revision-http-requests
-  name: kserve-models-web-app-config
+  name: kserve-models-web-application-config
 
 configurations:
 - params.yaml
 resources:
 - ../../base
-- web-app-authorization-policy.yaml
+
 labels:
 - includeSelectors: true
   pairs:
     app: kserve
     app.kubernetes.io/name: kserve
+
+components:
+- ../../components/istio
 patches:
-- path: patches/web-app-vsvc.yaml
+- path: patches/web-application-vsvc.yaml
   target:
     group: networking.istio.io
     kind: VirtualService
-    name: kserve-models-web-app
+    name: kserve-models-web-application
     namespace: kserve
     version: v1beta1
-- path: patches/web-app-sidecar.yaml

applications/kserve/models-web-app/overlays/kubeflow/patches/web-app-vsvc.yaml → applications/kserve/models-web-app/overlays/kubeflow/patches/web-application-vsvc.yaml

@@ -5,7 +5,7 @@
 - op: replace
   path: /spec/http/0/route/0/destination
   value:
-    host: kserve-models-web-app.kubeflow.svc.cluster.local
+    host: kserve-models-web-application.kubeflow.svc.cluster.local
     port:
       number: 80
 - op: replace

common/kubeflow-namespace/base/kubeflow/kserve-models-web-app.yaml → common/kubeflow-namespace/base/kubeflow/kserve-models-web-application.yaml

@@ -1,15 +1,15 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: kserve-models-web-app
+  name: kserve-models-web-application
   namespace: kubeflow
 spec:
   podSelector:
     matchExpressions:
       - key: app.kubernetes.io/component
         operator: In
         values:
-          - kserve-models-web-app
+          - kserve-models-web-application
   ingress:
     - from:
         - namespaceSelector:

common/kubeflow-namespace/base/kubeflow/kustomization.yaml

@@ -11,7 +11,7 @@ resources:
 - katib-controller.yaml
 - katib-db-manager.yaml
 - katib-ui.yaml
-- kserve-models-web-app.yaml
+- kserve-models-web-application.yaml
 - kserve.yaml
 - metadata-envoy.yaml
 - metadata-grpc-server.yaml

scripts/synchronize-kserve-web-application-manifests.sh

@@ -6,12 +6,12 @@ setup_error_handling
 COMPONENT_NAME="models-web-app"
 REPOSITORY_NAME="kserve/models-web-app"
 REPOSITORY_URL="https://github.com/kserve/models-web-app.git"
-COMMIT="v0.16.1"
+COMMIT="c71ee4309f0335159d9fdfd4559a538b5c782c92"
 REPOSITORY_DIRECTORY="models-web-app"
 SOURCE_DIRECTORY=${SOURCE_DIRECTORY:=/tmp/kserve-${COMPONENT_NAME}}
 BRANCH_NAME=${BRANCH_NAME:=synchronize-kserve-${COMPONENT_NAME}-manifests-${COMMIT?}}
 MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
-SOURCE_MANIFESTS_PATH="config"
+SOURCE_MANIFESTS_PATH="manifests/kustomize"
 DESTINATION_MANIFESTS_PATH="applications/kserve/${COMPONENT_NAME}"
 SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/tree/.*)"
 DESTINATION_TEXT="\[${COMMIT}\](https://github.com/${REPOSITORY_NAME}/tree/${COMMIT}/${SOURCE_MANIFESTS_PATH})"