diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index db8b1c2..35fc0a0 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/kubernetes-manifests/adservice.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: signadot/adservice:latest + image: adservice ports: - containerPort: 9555 env: diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml index 3c2afc3..186f90b 100644 --- a/kubernetes-manifests/cartservice.yaml +++ b/kubernetes-manifests/cartservice.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: signadot/cartservice:latest + image: cartservice ports: - containerPort: 7070 env: diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 44712a1..e541734 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: default containers: - name: server - image: signadot/checkoutservice:latest + image: checkoutservice ports: - containerPort: 5050 # readinessProbe: diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml index 10cfdf4..6406c34 100644 --- a/kubernetes-manifests/currencyservice.yaml +++ b/kubernetes-manifests/currencyservice.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: signadot/currencyservice:latest + image: currencyservice ports: - name: grpc containerPort: 7000 diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml index b0446a7..ac48151 100644 --- a/kubernetes-manifests/emailservice.yaml +++ b/kubernetes-manifests/emailservice.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: signadot/emailservice:latest + image: emailservice ports: - containerPort: 8080 env: diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index d70fa17..6958e15 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: default containers: - name: server - image: signadot/frontend:latest + image: frontend ports: - containerPort: 8080 # readinessProbe: diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml index 5cf2c6d..6571d4c 100644 --- a/kubernetes-manifests/loadgenerator.yaml +++ b/kubernetes-manifests/loadgenerator.yaml @@ -17,7 +17,7 @@ spec: restartPolicy: Always containers: - name: main - image: signadot/loadgenerator:latest + image: loadgenerator env: - name: FRONTEND_ADDR value: http://frontend @@ -29,4 +29,4 @@ spec: memory: 256Mi limits: cpu: 500m - memory: 512Mi \ No newline at end of file + memory: 512Mi diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml index f12135e..813e3b6 100644 --- a/kubernetes-manifests/paymentservice.yaml +++ b/kubernetes-manifests/paymentservice.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: signadot/paymentservice:latest + image: paymentservice ports: - containerPort: 50051 env: diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index d7c99a3..08ce176 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: signadot/productcatalogservice:latest + image: productcatalogservice ports: - containerPort: 3550 env: diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index 6995433..9feff44 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/kubernetes-manifests/recommendationservice.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: signadot/recommendationservice:latest + image: recommendationservice ports: - containerPort: 8080 # readinessProbe: diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index 5746315..2162e15 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: default containers: - name: server - image: signadot/shippingservice:latest + image: shippingservice ports: - containerPort: 50051 env: diff --git a/skaffold.yaml b/skaffold.yaml index 195f062..f939543 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -31,7 +31,7 @@ build: tagPolicy: gitCommit: {} local: - useBuildkit: false + useBuildkit: true deploy: kubectl: manifests: diff --git a/src/cartservice/Dockerfile b/src/cartservice/Dockerfile index 59bbbcc..e76717c 100644 --- a/src/cartservice/Dockerfile +++ b/src/cartservice/Dockerfile @@ -2,18 +2,17 @@ FROM mcr.microsoft.com/dotnet/sdk:5.0.103 as builder WORKDIR /app COPY cartservice.csproj . -RUN dotnet restore cartservice.csproj -r linux-musl-x64 +RUN dotnet restore cartservice.csproj -r linux-arm64 COPY . . -# Fix the issue on Debian 10: https://github.com/dotnet/dotnet-docker/issues/2470 ENV COMPlus_EnableDiagnostics=0 -RUN dotnet publish cartservice.csproj -p:PublishSingleFile=true -r linux-musl-x64 --self-contained true -p:PublishTrimmed=True -p:TrimMode=Link -c release -o /cartservice --no-restore +RUN dotnet publish cartservice.csproj -p:PublishSingleFile=true -r linux-arm64 --self-contained true -p:PublishTrimmed=True -p:TrimMode=Link -c release -o /cartservice --no-restore # https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list -FROM mcr.microsoft.com/dotnet/runtime-deps:5.0.3-alpine3.12-amd64 -RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \ - wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \ - chmod +x /bin/grpc_health_probe +FROM mcr.microsoft.com/dotnet/runtime-deps:5.0.3-focal-arm64v8 +#RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \ +# wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \ +# chmod +x /bin/grpc_health_probe WORKDIR /app COPY --from=builder /cartservice . -ENV ASPNETCORE_URLS http://*:7070 +ENV ASPNETCORE_URLS=http://*:7070 ENTRYPOINT ["/app/cartservice"] diff --git a/src/cartservice/cartservice.csproj b/src/cartservice/cartservice.csproj index b86d401..d5f941d 100644 --- a/src/cartservice/cartservice.csproj +++ b/src/cartservice/cartservice.csproj @@ -5,15 +5,15 @@ - - - - + + + + - + diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt index 2532c43..35c9e4b 100644 --- a/src/loadgenerator/requirements.txt +++ b/src/loadgenerator/requirements.txt @@ -10,9 +10,9 @@ click==7.0 # via flask configargparse==1.2.3 # via locust flask-basicauth==0.2.0 # via locust flask==1.1.2 # via flask-basicauth, locust -gevent==20.5.2 # via geventhttpclient, locust +gevent==21.12.0 # via geventhttpclient, locust geventhttpclient==1.4.2 # via locust -greenlet==0.4.15 # via gevent +greenlet==1.1.2 # via gevent idna==2.8 # via requests itsdangerous==1.1.0 # via flask jinja2==2.11.2 # via flask