Merge remote-tracking branch 'origin/main' into dev

.github/workflows/release.yaml

@@ -4,36 +4,36 @@
         tags:
           - v0.**
     jobs:
-      # test:
-      #   name: cargo test
-      #   runs-on: ubuntu-latest
-      #   services:
-      #     mongodb:
-      #       image: mongo:latest
-      #       ports:
-      #         - 27017:27017
-      #       options: >-
-      #         --health-cmd="mongosh --eval 'db.adminCommand({ ping: 1 })'"
-      #         --health-interval=30s
-      #         --health-timeout=10s
-      #         --health-retries=10
-      #     redis:
-      #       image: redis:latest
-      #       ports:
-      #         - 6379:6379
-      #   steps:
-      #     - uses: actions/checkout@v4
-      #     - uses: dtolnay/rust-toolchain@stable
-      #     - uses: Swatinem/rust-cache@v2
-      #     - run: cargo test --all-features
-      #   env:
-      #     BUNGEE_API_KEY: ${{ secrets.BUNGEE_API_KEY }}
-      #     COINGECKO_API_KEY: ${{ secrets.COINGECKO_API_KEY }}
-      #     COVALENT_API_KEY: ${{ secrets.COVALENT_API_KEY }}
-      #   environment: Testing
+      test:
+        name: cargo test
+        runs-on: ubuntu-latest
+        services:
+          mongodb:
+            image: mongo:latest
+            ports:
+              - 27017:27017
+            options: >-
+              --health-cmd="mongosh --eval 'db.adminCommand({ ping: 1 })'"
+              --health-interval=30s
+              --health-timeout=10s
+              --health-retries=10
+          redis:
+            image: redis:latest
+            ports:
+              - 6379:6379
+        steps:
+          - uses: actions/checkout@v4
+          - uses: dtolnay/rust-toolchain@stable
+          - uses: Swatinem/rust-cache@v2
+          - run: cargo test --all-features
+        env:
+          BUNGEE_API_KEY: ${{ secrets.BUNGEE_API_KEY }}
+          COINGECKO_API_KEY: ${{ secrets.COINGECKO_API_KEY }}
+          COVALENT_API_KEY: ${{ secrets.COVALENT_API_KEY }}
+        environment: Testing
 
       container_img_build_push_gar:
-        # needs: [test]
+        needs: [test]
         # Allow the job to fetch a GitHub ID token
         permissions:
           id-token: write

Dockerfile

@@ -27,6 +27,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     tini libssl-dev ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
+EXPOSE 8080
+
 # Non-root user for security purposes.
 #
 # UIDs below 10,000 are a security risk, as a container breakout could result

docker-compose.yml

@@ -22,7 +22,7 @@ services:
     container_name: reflux-solver
     entrypoint: [ "/app/reflux", "--solver", "--config", "/app/ctx/config.docker.yaml" ]
     ports:
-      - "8000:8080"
+      - "8080:8080"
     depends_on:
       - redis
       - mongodb

k8s/templates/ingress.yaml

@@ -20,7 +20,7 @@ spec:
           service:
             name: {{ .Values.name }}
             port:
-              number: 8
+              number: 8080
         path: /
         pathType: ImplementationSpecific
   tls:

k8s/templates/svc.yaml

@@ -9,5 +9,5 @@ spec:
   selector:
     app: {{ .Values.name }}
   ports:
-    - port: 8090
+    - port: 8080
       targetPort: {{ .Values.port }}