fix

Azure · Mar 23, 2024 · daf85eb · daf85eb
1 parent af2b528
commit daf85eb
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 39 deletions.
diff --git a/build/ci/k8s/teleport.yml b/build/ci/k8s/teleport.yml
@@ -30,10 +30,13 @@ data:
     # Enable overlaybd peer-to-peer
     jq '.p2pConfig.enable = true' /etc/overlaybd/overlaybd.json > tmp.json
     sudo mv tmp.json /etc/overlaybd/overlaybd.json
-    
-    jq '.p2pConfig.address = "http://peerd:5000/blobs"' /etc/overlaybd/overlaybd.json > tmp.json
+
+    jq '.p2pConfig.address = "localhost:30000/blobs"' /etc/overlaybd/overlaybd.json > tmp.json
+    sudo mv tmp.json /etc/overlaybd/overlaybd.json
+
+    jq '.logConfig.logLevel = 0' /etc/overlaybd/overlaybd.json > tmp.json
     sudo mv tmp.json /etc/overlaybd/overlaybd.json
-    
+
     cat /etc/overlaybd/overlaybd.json
 
     # Enabling mirror for teleportmetricstest
@@ -67,29 +70,29 @@ spec:
       hostNetwork: true
       hostPID: true
       containers:
-      - image: docker.io/alexeldeib/nsenter:latest # https://github.com/alexeldeib/azbench/blob/main/images/nsenter/entrypoint.sh
-        imagePullPolicy: Always
-        name: *name
-        args: ["wasm"]
-        resources:
-          requests:
-            cpu: 0.5
-            memory: 2000Mi
-          limits:
-            cpu: 0.5
-            memory: 2000Mi
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: actions
-          mountPath: "/opt/actions"
-        - name: hostmount
-          mountPath: "/mnt/actions"
+        - image: docker.io/alexeldeib/nsenter:latest # https://github.com/alexeldeib/azbench/blob/main/images/nsenter/entrypoint.sh
+          imagePullPolicy: Always
+          name: *name
+          args: ["wasm"]
+          resources:
+            requests:
+              cpu: 0.5
+              memory: 2000Mi
+            limits:
+              cpu: 0.5
+              memory: 2000Mi
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: actions
+              mountPath: "/opt/actions"
+            - name: hostmount
+              mountPath: "/mnt/actions"
       volumes:
-      - name: hostmount
-        hostPath:
-          path: /opt/actions
-          type: DirectoryOrCreate
-      - name: actions
-        configMap:
-          name: teleport-actions
+        - name: hostmount
+          hostPath:
+            path: /opt/actions
+            type: DirectoryOrCreate
+        - name: actions
+          configMap:
+            name: teleport-actions
diff --git a/build/ci/scripts/azure.sh b/build/ci/scripts/azure.sh
@@ -245,17 +245,18 @@ cmd__test__streaming() {
         echo "waiting 5 minutes" 
         sleep 300
 
-        echo "deploying scanner app"
+        echo "deploying scanner app and waiting 2 minutes"
         envsubst < $SCANNER_APP_DEPLOY_TEMPLATE | kubectl apply -f -
+        sleep 120
+
+        echo "scanner logs"
+        kubectl -n peerd-ns logs -l app=tests-scanner
 
         wait_for_peerd_pods $context $AKS_NAME $RESOURCE_GROUP $nodepool "P2PActive" 1
 
         echo "fetching metrics from pods"
         print_peerd_metrics
 
-        echo "scanner logs"
-        kubectl -n peerd-ns logs -l app=tests-scanner
-
         echo "cleaning up apps"
         helm uninstall peerd --ignore-not-found=true
         kubectl delete -f $SCANNER_APP_DEPLOY_TEMPLATE

diff --git a/build/package/peerd-helm/templates/app.yml b/build/package/peerd-helm/templates/app.yml
@@ -35,6 +35,7 @@ spec:
           args:
             - "--log-level=debug"
             - "run"
+            - "--http-addr=0.0.0.0:5000"
             - "--add-mirror-configuration={{ .Values.peerd.configureMirrors }}"
             {{- with .Values.peerd.hosts }}
             - --hosts
@@ -85,6 +86,7 @@ spec:
     - name: http
       protocol: TCP
       port: 5000
+      nodePort: 30000
       targetPort: http
     - name: https
       protocol: TCP

diff --git a/build/package/peerd-helm/values.yaml b/build/package/peerd-helm/values.yaml
@@ -12,10 +12,3 @@ peerd:
       memory: "128Mi"
     requests:
       cpu: "10m"
-  ports:
-    pod:
-      http: 5000
-      https: 5001
-    service:
-      http: 5000
-      https: 5001