From 4547e84de97adaf53f69c23a817b6d58c86fb8cc Mon Sep 17 00:00:00 2001
From: naison <895703375@qq.com>
Date: Mon, 10 Mar 2025 22:00:30 +0800
Subject: [PATCH] Merge pull request #460 from
 kubenetworks/chore/update-bookinfo-resource

chore: update bookinfo resource
---
 .github/workflows/test.yml |  9 +++++++-
 samples/bookinfo.yaml      | 44 +++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de2e21f4..9d2131dd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,6 +76,7 @@ jobs:
         run: |
           kubectl wait pods -l app=reviews --for=condition=Ready --timeout=3600s
           kubectl wait pods -l app=productpage --for=condition=Ready --timeout=3600s
+          kubectl wait pods -l app=authors --for=condition=Ready --timeout=3600s
           kubectl get svc -A -o wide
           kubectl get pod -A -o wide
           kubectl get all -o wide
@@ -149,6 +150,7 @@ jobs:
         run: |
           kubectl wait pods -l app=reviews --for=condition=Ready --timeout=3600s
           kubectl wait pods -l app=productpage --for=condition=Ready --timeout=3600s
+          kubectl wait pods -l app=authors --for=condition=Ready --timeout=3600s
           kubectl get svc -A -o wide || true
           kubectl get pod -A -o wide || true
           kubectl get all -o wide || true
@@ -161,6 +163,8 @@ jobs:
 
   windows:
     runs-on: windows-latest
+    env:
+      VERSION: ${{ github.event.pull_request.head.sha || github.sha }}
     needs: [ "image" ]
     steps:
       - uses: actions/checkout@v4
@@ -193,4 +197,7 @@ jobs:
           choco install make
 
       - name: Build
-        run: make kubevpn-windows-amd64
\ No newline at end of file
+        run: |
+          make kubevpn-windows-amd64
+          ./bin/kubevpn.exe version
+          ./bin/kubevpn.exe status
\ No newline at end of file
diff --git a/samples/bookinfo.yaml b/samples/bookinfo.yaml
index 97252382..4e323eed 100644
--- a/samples/bookinfo.yaml
+++ b/samples/bookinfo.yaml
@@ -47,11 +47,11 @@ spec:
             runAsUser: 1000
           resources:
             requests:
-              memory: "64Mi"
-              cpu: "250m"
+              cpu: "25m"
+              memory: "32Mi"
             limits:
+              cpu: "50m"
               memory: "128Mi"
-              cpu: "500m"
 
 ---
 # Ratings service
@@ -103,11 +103,11 @@ spec:
             runAsUser: 1000
           resources:
             requests:
-              memory: "64Mi"
-              cpu: "250m"
+              cpu: "25m"
+              memory: "32Mi"
             limits:
+              cpu: "50m"
               memory: "128Mi"
-              cpu: "500m"
 ---
 # Reviews service
 apiVersion: v1
@@ -166,11 +166,11 @@ spec:
             runAsUser: 1000
           resources:
             requests:
-              memory: "64Mi"
-              cpu: "250m"
+              cpu: "25m"
+              memory: "32Mi"
             limits:
+              cpu: "50m"
               memory: "128Mi"
-              cpu: "500m"
       volumes:
         - name: wlp-output
           emptyDir: { }
@@ -229,11 +229,11 @@ spec:
             runAsUser: 1000
           resources:
             requests:
-              memory: "64Mi"
-              cpu: "250m"
+              cpu: "25m"
+              memory: "32Mi"
             limits:
+              cpu: "50m"
               memory: "128Mi"
-              cpu: "500m"
       volumes:
         - name: tmp
           emptyDir: { }
@@ -281,21 +281,21 @@ spec:
             initialDelaySeconds: 5
             periodSeconds: 10
           resources:
-            limits:
-              cpu: 50m
-              memory: 128Mi
             requests:
-              cpu: 10m
-              memory: 32Mi
+              cpu: "25m"
+              memory: "32Mi"
+            limits:
+              cpu: "50m"
+              memory: "128Mi"
         - name: nginx
           image: ghcr.io/kubenetworks/nginx:latest
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
           resources:
-            limits:
-              cpu: 50m
-              memory: 128Mi
             requests:
-              cpu: 10m
-              memory: 32Mi
\ No newline at end of file
+              cpu: "25m"
+              memory: "32Mi"
+            limits:
+              cpu: "50m"
+              memory: "128Mi"
\ No newline at end of file