Merge branch 'main' of github.com:appnet-org/appnet into main

appnet-org · Sep 15, 2024 · c803a0a · c803a0a
2 parents 988c74b + f292308
commit c803a0a
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 10 deletions.
diff --git a/config/samples/hotel/README.md b/config/samples/hotel/README.md
@@ -1,7 +1,6 @@
 ### Preparation
 
 ```bash
-sed -i 's|<docker-username>|<your-docker-user-name>|g' config/samples/hotel/hotel_reservation.yaml
 sed -i 's|<APPNET_DIR_PATH>|'"$(pwd)"'|g' config/samples/hotel/sample_hotel.yaml
 ```
 

diff --git a/config/samples/hotel/hotel_reservation.yaml b/config/samples/hotel/hotel_reservation.yaml
@@ -1,4 +1,11 @@
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: user
+  name: hotel-user
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -43,10 +50,11 @@ spec:
       labels:
         app: user
     spec:
+      serviceAccountName: hotel-user
       containers:
       - command:
         - ./user
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-user
         ports:
@@ -60,6 +68,13 @@ spec:
       restartPolicy: Always
 ---
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: search
+  name: hotel-search
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -104,10 +119,11 @@ spec:
       labels:
         app: search
     spec:
+      serviceAccountName: hotel-search
       containers:
       - command:
         - ./search
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-search
         ports:
@@ -122,6 +138,13 @@ spec:
 status: {}
 ---
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: reservation
+  name: hotel-reservation
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -166,10 +189,11 @@ spec:
       labels:
         app: reservation
     spec:
+      serviceAccountName: hotel-reservation
       containers:
       - command:
         - ./reservation
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-reservation
         ports:
@@ -184,6 +208,13 @@ spec:
 status: {}
 ---
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: recommendation
+  name: hotel-recommendation
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -228,10 +259,11 @@ spec:
       labels:
         app: recommendation
     spec:
+      serviceAccountName: hotel-recommendation
       containers:
       - command:
         - ./recommendation
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-recommendation
         ports:
@@ -246,6 +278,13 @@ spec:
 status: {}
 ---
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: rate
+  name: hotel-rate
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -290,10 +329,11 @@ spec:
       labels:
         app: rate
     spec:
+      serviceAccountName: hotel-rate
       containers:
       - command:
         - ./rate
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-rate
         ports:
@@ -308,6 +348,13 @@ spec:
 status: {}
 ---
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: profile
+  name: hotel-profile
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -352,10 +399,11 @@ spec:
       labels:
         app: profile
     spec:
+      serviceAccountName: hotel-profile
       containers:
       - command:
         - ./profile
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-profile
         ports:
@@ -370,6 +418,13 @@ spec:
 status: {}
 ---
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: geo
+  name: hotel-geo
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -414,10 +469,11 @@ spec:
       labels:
         app: geo
     spec:
+      serviceAccountName: hotel-geo
       containers:
       - command:
         - ./geo
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-geo
         ports:
@@ -432,6 +488,13 @@ spec:
 status: {}
 ---
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    account: frontend
+  name: hotel-frontend
+---
+apiVersion: v1
 kind: Service
 metadata:
   annotations:
@@ -477,10 +540,11 @@ spec:
       labels:
         app: frontend
     spec:
+      serviceAccountName: hotel-frontend
       containers:
       - command:
         - ./frontend
-        image: xzhu0027/hotelreservation:latest
+        image: appnetorg/hotelreservation:latest
         imagePullPolicy: Always
         name: hotel-reserv-frontend
         ports:

diff --git a/go-lib b/go-lib
+1 −1		interceptor/go.mod
+56 −43		interceptor/plugininterceptor.go
+1 −1		sample/echo-pb/echo.proto
+0 −1		sample/echo-pb/go.mod
+5 −2		sample/echo/frontend.go
+24 −9		sample/echo/server.go
+5 −0		sample/lb_random/README.md
+11 −0		sample/lb_random/go.mod
+15 −0		sample/lb_random/go.sum
+78 −0		sample/lb_random/lb_random.go
+10 −0		sample/servicerouter/go.sum
+76 −11		sample/servicerouter/servicerouter.go