sync - l7 cilium

msfidelis · Aug 9, 2023 · e81506a · e81506a
1 parent eeedc88
commit e81506a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 19 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/samples/.DS_Store b/samples/.DS_Store
diff --git a/samples/README.md b/samples/README.md
@@ -5,7 +5,6 @@
 ### Nats Deploy 
 
 ```bash
-```
 helm repo add nats https://nats-io.github.io/k8s/helm/charts/
 
 helm install nats nats/nats \
@@ -17,5 +16,4 @@ helm install nats nats/nats \
 --set nats.jetstream.fileStorage.enabled=true \
 --set nats.jetstream.fileStorage.size=1Gi \
 --set nats.jetstream.fileStorage.storageDirectory=/data/
-```
 ```
diff --git a/samples/cilium/bmr.yml b/samples/cilium/bmr.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "30000"           
+        prometheus.io/port: "30000"
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: bmr-grpc
         name: bmr-grpc

diff --git a/samples/cilium/calories.yml b/samples/cilium/calories.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "30000"           
+        prometheus.io/port: "30000"
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: calories-grpc
         name: calories-grpc

diff --git a/samples/cilium/database-store-service.yml b/samples/cilium/database-store-service.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "8080"           
+        prometheus.io/port: "8080"
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: database-store-service
         name: database-store-service

diff --git a/samples/cilium/health-api.yml b/samples/cilium/health-api.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "8080"           
+        prometheus.io/port: "8080"
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: health-api
         name: health-api
@@ -41,15 +42,6 @@ spec:
           value: "recommendations-grpc.recommendations.svc.cluster.local:30000"
         - name: NATS_URI
           value: "nats://nats.nats.svc.cluster.local:4222"                              
-        # livenessProbe:
-        #   failureThreshold: 10
-        #   httpGet:
-        #     httpHeaders:
-        #     - name: Custom-Header
-        #       value: Awesome
-        #     path: /healthcheck
-        #     port: 8080
-        #   periodSeconds: 10
         ports:
         - containerPort: 8080
           name: http   
@@ -59,6 +51,11 @@ spec:
             path: /healthcheck
             port: 8080
           periodSeconds: 10
+        livenessProbe:
+          failureThreshold: 10
+          httpGet:
+            path: /healthcheck
+            port: 8080          
       terminationGracePeriodSeconds: 60
 ---
 apiVersion: v1

diff --git a/samples/cilium/imc.yml b/samples/cilium/imc.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "30000"           
+        prometheus.io/port: "bmr-grpc.bmr.svc.cluster.local:30000"
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: imc-grpc
         name: imc-grpc

diff --git a/samples/cilium/proteins.yml b/samples/cilium/proteins.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "30000"           
+        prometheus.io/port: "30000"
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: proteins-grpc
         name: proteins-grpc

diff --git a/samples/cilium/recommendations.yml b/samples/cilium/recommendations.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "30000"           
+        prometheus.io/port: "30000"
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: recommendations-grpc
         name: recommendations-grpc

diff --git a/samples/cilium/water.yml b/samples/cilium/water.yml
@@ -19,7 +19,8 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: "true"
-        prometheus.io/port: "30000"           
+        prometheus.io/port: "30000" 
+        policy.cilium.io/proxy-visibility: "<Egress/53/UDP/DNS>,<Egress/30000/TCP/HTTP>"
       labels:
         app: water-grpc
         name: water-grpc