Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release #98

Merged
merged 14 commits into from
Jan 30, 2025
Merged

release #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9ba7a1e
feat: inital order-go project
ansgarschulte Jan 29, 2025
6476c00
feat: list to activemq
ansgarschulte Jan 29, 2025
a53e326
feat: log activemq orders
ansgarschulte Jan 29, 2025
aff83f4
Merge pull request #96 from steadybit/main
ansgarschulte Jan 29, 2025
6ab5143
Merge branch 'develop' into feat/order-go
ansgarschulte Jan 29, 2025
9eff233
Merge pull request #97 from steadybit/feat/order-go
ansgarschulte Jan 29, 2025
3bcec5a
fix: missing docker file
ansgarschulte Jan 29, 2025
fd781c3
fix: missing license
ansgarschulte Jan 29, 2025
6d34a9d
fix: build
ansgarschulte Jan 29, 2025
39153f4
fix: build order-go
ansgarschulte Jan 30, 2025
9adb8dc
chore: update active mq ports to be able to use stomp protocol
ansgarschulte Jan 30, 2025
33d7d57
chore: update active mq ports to be able to use stomp protocol
ansgarschulte Jan 30, 2025
71034ba
chore: helm reduce initialDelaySeconds for go apps
ansgarschulte Jan 30, 2025
b27739d
chore: us go 1.22
ansgarschulte Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
- {folder: inventory-service-mock, name: inventory}
- {folder: inventory-service-mock-go, name: inventory-go}
- {folder: order, name: orders}
- {folder: order-go, name: orders-go}
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion bestseller-toys-go/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use official Golang image as builder
FROM golang:1.23 AS builder
FROM golang:1.22 AS builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion bestseller-toys-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module bestseller-toys

go 1.23.4
go 1.22

require (
github.com/google/uuid v1.6.0
Expand Down
Binary file removed bestseller-toys-go/products.db
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/steadybit-shopping-demo/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: steadybit-shopping-demo
description: Steadybit shopping-demo application Helm chart for Kubernetes.
version: 1.1.9
version: 1.1.13
appVersion: latest
type: application
home: https://www.steadybit.com/
Expand Down
4 changes: 2 additions & 2 deletions charts/steadybit-shopping-demo/templates/4-bestseller-toys-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ spec:
httpGet:
path: /actuator/health/liveness
port: 8081
initialDelaySeconds: 60
initialDelaySeconds: 10
timeoutSeconds: 3
periodSeconds: 10
readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8081
initialDelaySeconds: 60
initialDelaySeconds: 10
timeoutSeconds: 5
periodSeconds: 10
{{- with .Values.bestsellerToys.nodeSelector }}
Expand Down
4 changes: 2 additions & 2 deletions charts/steadybit-shopping-demo/templates/6-inventory-service-mock-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ spec:
httpGet:
path: /actuator/health/liveness
port: 8084
initialDelaySeconds: 30
initialDelaySeconds: 10
timeoutSeconds: 3
periodSeconds: 10
readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8084
initialDelaySeconds: 30
initialDelaySeconds: 10
timeoutSeconds: 5
periodSeconds: 10
affinity:
Expand Down
7 changes: 7 additions & 0 deletions charts/steadybit-shopping-demo/templates/7-activemq-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ spec:
ports:
- containerPort: 61616
protocol: TCP
- containerPort: 61613
protocol: TCP
env:
- name: DD_SERVICE
valueFrom:
Expand Down Expand Up @@ -164,8 +166,13 @@ metadata:
spec:
ports:
- port: 61616
name: openwire
protocol: TCP
targetPort: 61616
- port: 61613
name: stomp
protocol: TCP
targetPort: 61613
selector:
run: activemq
type: ClusterIP
Expand Down
6 changes: 4 additions & 2 deletions charts/steadybit-shopping-demo/templates/9-orders-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ spec:
httpGet:
path: /actuator/health/liveness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
timeoutSeconds: 3
periodSeconds: 10
readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
timeoutSeconds: 5
periodSeconds: 10
imagePullPolicy: Always
Expand All @@ -70,6 +70,8 @@ spec:
- containerPort: 8086
protocol: TCP
env:
- name: ACTIVEMQ_BROKER_HOST
value: {{.Values.orders.activeMQ.host}}
- name: SPRING_PROFILES_ACTIVE
value: "kubernetes"
- name: DD_SERVICE
Expand Down
8 changes: 4 additions & 4 deletions ...ts/steadybit-shopping-demo/tests/__snapshot__/4-bestseller-toys-deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ manifest should match snapshot:
httpGet:
path: /actuator/health/liveness
port: 8081
initialDelaySeconds: 60
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: toys-bestseller
Expand All @@ -71,7 +71,7 @@ manifest should match snapshot:
httpGet:
path: /actuator/health/readiness
port: 8081
initialDelaySeconds: 60
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
Expand Down Expand Up @@ -175,7 +175,7 @@ manifest should match snapshot replica count:
httpGet:
path: /actuator/health/liveness
port: 8081
initialDelaySeconds: 60
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: toys-bestseller
Expand All @@ -186,7 +186,7 @@ manifest should match snapshot replica count:
httpGet:
path: /actuator/health/readiness
port: 8081
initialDelaySeconds: 60
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
Expand Down
8 changes: 4 additions & 4 deletions ...dybit-shopping-demo/tests/__snapshot__/6-inventory-service-mock-deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ manifest should match snapshot:
httpGet:
path: /actuator/health/liveness
port: 8084
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: inventory
Expand All @@ -69,7 +69,7 @@ manifest should match snapshot:
httpGet:
path: /actuator/health/readiness
port: 8084
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
Expand Down Expand Up @@ -171,7 +171,7 @@ manifest should match snapshot replica count:
httpGet:
path: /actuator/health/liveness
port: 8084
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: inventory
Expand All @@ -182,7 +182,7 @@ manifest should match snapshot replica count:
httpGet:
path: /actuator/health/readiness
port: 8084
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
Expand Down
18 changes: 16 additions & 2 deletions charts/steadybit-shopping-demo/tests/__snapshot__/7-activemq-deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ manifest should match snapshot:
ports:
- containerPort: 61616
protocol: TCP
- containerPort: 61613
protocol: TCP
readinessProbe:
initialDelaySeconds: 15
periodSeconds: 10
Expand Down Expand Up @@ -163,9 +165,14 @@ manifest should match snapshot:
namespace: NAMESPACE
spec:
ports:
- port: 61616
- name: openwire
port: 61616
protocol: TCP
targetPort: 61616
- name: stomp
port: 61613
protocol: TCP
targetPort: 61613
selector:
run: activemq
type: ClusterIP
Expand Down Expand Up @@ -247,6 +254,8 @@ manifest should match snapshot replica count:
ports:
- containerPort: 61616
protocol: TCP
- containerPort: 61613
protocol: TCP
readinessProbe:
initialDelaySeconds: 15
periodSeconds: 10
Expand Down Expand Up @@ -345,9 +354,14 @@ manifest should match snapshot replica count:
namespace: NAMESPACE
spec:
ports:
- port: 61616
- name: openwire
port: 61616
protocol: TCP
targetPort: 61616
- name: stomp
port: 61613
protocol: TCP
targetPort: 61613
selector:
run: activemq
type: ClusterIP
Expand Down
18 changes: 12 additions & 6 deletions charts/steadybit-shopping-demo/tests/__snapshot__/9-orders-deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ manifest should match snapshot:
spec:
containers:
- env:
- name: ACTIVEMQ_BROKER_HOST
value: localhost:61613
- name: SPRING_PROFILES_ACTIVE
value: kubernetes
- name: DD_SERVICE
Expand All @@ -48,7 +50,7 @@ manifest should match snapshot:
httpGet:
path: /actuator/health/liveness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: orders
Expand All @@ -59,7 +61,7 @@ manifest should match snapshot:
httpGet:
path: /actuator/health/readiness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
Expand Down Expand Up @@ -124,6 +126,8 @@ manifest should match snapshot replica count:
spec:
containers:
- env:
- name: ACTIVEMQ_BROKER_HOST
value: localhost:61613
- name: SPRING_PROFILES_ACTIVE
value: kubernetes
- name: DD_SERVICE
Expand All @@ -140,7 +144,7 @@ manifest should match snapshot replica count:
httpGet:
path: /actuator/health/liveness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: orders
Expand All @@ -151,7 +155,7 @@ manifest should match snapshot replica count:
httpGet:
path: /actuator/health/readiness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
Expand Down Expand Up @@ -226,6 +230,8 @@ manifest should match snapshot with horizontalPodAutoscaler and podDisruptionBud
topologyKey: topology.kubernetes.io/zone
containers:
- env:
- name: ACTIVEMQ_BROKER_HOST
value: localhost:61613
- name: SPRING_PROFILES_ACTIVE
value: kubernetes
- name: DD_SERVICE
Expand All @@ -242,7 +248,7 @@ manifest should match snapshot with horizontalPodAutoscaler and podDisruptionBud
httpGet:
path: /actuator/health/liveness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 3
name: orders
Expand All @@ -253,7 +259,7 @@ manifest should match snapshot with horizontalPodAutoscaler and podDisruptionBud
httpGet:
path: /actuator/health/readiness
port: 8086
initialDelaySeconds: 30
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
Expand Down
3 changes: 3 additions & 0 deletions charts/steadybit-shopping-demo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,6 @@ orders:
podDisruptionBudget: false
# nodeSelector -- Node labels for pod assignment
nodeSelector: {}
activeMQ:
# ActiveMQ Host
host: "localhost:61613"
15 changes: 8 additions & 7 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@ version: '3.3'

services:
gateway:
image: steadybit/gateway:1.0.0-SNAPSHOT
image: steadybit/gateway:develop
ports:
- "8080:8080"
environment:
SPRING_PROFILES_ACTIVE: docker

fashion:
image: steadybit/bestseller-fashion:1.0.0-SNAPSHOT
image: steadybit/bestseller-fashion:develop
ports:
- "8082:8082"
environment:
"rest.endpoint.inventory": "http://inventory:8084/inventory"

toys:
image: steadybit/bestseller-toys:1.0.0-SNAPSHOT
image: steadybit/bestseller-toys-go:develop
ports:
- "8081:8081"
environment:
"rest.endpoint.inventory": "http://inventory:8084/inventory"

hot-deals:
image: steadybit/hot-deals:1.0.0-SNAPSHOT
image: steadybit/hot-deals:develop
ports:
- "8083:8083"
environment:
"rest.endpoint.inventory": "http://inventory:8084/inventory"

inventory:
image: steadybit/inventory:1.0.0-SNAPSHOT
image: steadybit/inventory-go:develop
ports:
- "8084:8084"

checkout:
image: steadybit/checkout:1.0.0-SNAPSHOT
image: steadybit/checkout:develop
ports:
- "8085:8085"
environment:
Expand All @@ -44,7 +44,7 @@ services:
- activemq

orders:
image: steadybit/orders:1.0.0-SNAPSHOT
image: steadybit/orders-go:develop
environment:
"spring.activemq.broker-url": "tcp://activemq:61616"
depends_on:
Expand All @@ -55,6 +55,7 @@ services:
container_name: 'activemq'
ports:
- "61616:61616"
- "61613:61613"
- "8161:8161"
volumes:
- ${PWD}/activemq.xml:/opt/activemq/conf/activemq.xml
2 changes: 1 addition & 1 deletion inventory-service-mock-go/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use official Golang image as builder
FROM golang:1.23 AS builder
FROM golang:1.22 AS builder

WORKDIR /app

Expand Down
Loading
Loading