mats/go-cart-actor
1
0
Fork 0
Code Issues Pull Requests 1 Actions 3 Packages Projects Releases Wiki Activity

missing updates #5

Merged
mats merged 77 commits from refactor/http-proxy into main 2025-10-14 23:12:06 +02:00
Conversation 0 Commits 77 Files Changed 1 +297 -297
2 changed files with 297 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33ef868295 - Show all commits

140
.gitea/workflows/build.yaml
View File

@@ -3,75 +3,75 @@ run-name: ${{ gitea.actor }} build 🚀
on: [push] on: [push]
jobs: jobs:
Metadata: Metadata:
runs-on: arm64 runs-on: arm64
outputs: outputs:
version: ${{ steps.meta.outputs.version }} version: ${{ steps.meta.outputs.version }}
git_commit: ${{ steps.meta.outputs.git_commit }} git_commit: ${{ steps.meta.outputs.git_commit }}
build_date: ${{ steps.meta.outputs.build_date }} build_date: ${{ steps.meta.outputs.build_date }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- id: meta - id: meta
name: Derive build metadata name: Derive build metadata
run: | run: |
GIT_COMMIT=$(git rev-parse HEAD) GIT_COMMIT=$(git rev-parse HEAD)
if git describe --tags --exact-match >/dev/null 2>&1; then if git describe --tags --exact-match >/dev/null 2>&1; then
VERSION=$(git describe --tags --exact-match) VERSION=$(git describe --tags --exact-match)
else else
VERSION=$(git rev-parse --short=12 HEAD) VERSION=$(git rev-parse --short=12 HEAD)
fi fi
BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
echo "git_commit=$GIT_COMMIT" >> $GITHUB_OUTPUT echo "git_commit=$GIT_COMMIT" >> $GITHUB_OUTPUT
echo "version=$VERSION" >> $GITHUB_OUTPUT echo "version=$VERSION" >> $GITHUB_OUTPUT
echo "build_date=$BUILD_DATE" >> $GITHUB_OUTPUT echo "build_date=$BUILD_DATE" >> $GITHUB_OUTPUT
BuildAndDeployAmd64: BuildAndDeployAmd64:
needs: Metadata needs: Metadata
runs-on: amd64 runs-on: amd64
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Build amd64 image - name: Build amd64 image
run: | run: |
docker build \ docker build \
--build-arg VERSION=${{ needs.Metadata.outputs.version }} \ --build-arg VERSION=${{ needs.Metadata.outputs.version }} \
--build-arg GIT_COMMIT=${{ needs.Metadata.outputs.git_commit }} \ --build-arg GIT_COMMIT=${{ needs.Metadata.outputs.git_commit }} \
--build-arg BUILD_DATE=${{ needs.Metadata.outputs.build_date }} \ --build-arg BUILD_DATE=${{ needs.Metadata.outputs.build_date }} \
--progress=plain \ --progress=plain \
-t registry.knatofs.se/go-cart-actor-amd64:latest \ -t registry.knatofs.se/go-cart-actor-amd64:latest \
-t registry.knatofs.se/go-cart-actor-amd64:${{ needs.Metadata.outputs.version }} \ -t registry.knatofs.se/go-cart-actor-amd64:${{ needs.Metadata.outputs.version }} \
. .
- name: Push amd64 images - name: Push amd64 images
run: | run: |
docker push registry.knatofs.se/go-cart-actor-amd64:latest docker push registry.knatofs.se/go-cart-actor-amd64:latest
docker push registry.knatofs.se/go-cart-actor-amd64:${{ needs.Metadata.outputs.version }} docker push registry.knatofs.se/go-cart-actor-amd64:${{ needs.Metadata.outputs.version }}
- name: Apply deployment manifests - name: Apply deployment manifests
run: kubectl apply -f deployment/deployment.yaml -n cart run: kubectl apply -f deployment/deployment.yaml -n cart
- name: Rollout amd64 deployment (pin to version) - name: Rollout amd64 deployment (pin to version)
run: | run: |
kubectl set image deployment/cart-actor-x86 -n cart cart-actor-amd64=registry.knatofs.se/go-cart-actor-amd64:${{ needs.Metadata.outputs.version }} kubectl set image deployment/cart-actor-x86 -n cart cart-actor-amd64=registry.knatofs.se/go-cart-actor-amd64:${{ needs.Metadata.outputs.version }}
kubectl rollout status deployment/cart-actor-x86 -n cart kubectl rollout status deployment/cart-actor-x86 -n cart
BuildAndDeployArm64: BuildAndDeployArm64:
needs: Metadata needs: Metadata
runs-on: arm64 runs-on: arm64
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Build arm64 image - name: Build arm64 image
run: | run: |
docker build \ docker build \
--build-arg VERSION=${{ needs.Metadata.outputs.version }} \ --build-arg VERSION=${{ needs.Metadata.outputs.version }} \
--build-arg GIT_COMMIT=${{ needs.Metadata.outputs.git_commit }} \ --build-arg GIT_COMMIT=${{ needs.Metadata.outputs.git_commit }} \
--build-arg BUILD_DATE=${{ needs.Metadata.outputs.build_date }} \ --build-arg BUILD_DATE=${{ needs.Metadata.outputs.build_date }} \
--progress=plain \ --progress=plain \
-t registry.knatofs.se/go-cart-actor:latest \ -t registry.knatofs.se/go-cart-actor:latest \
-t registry.knatofs.se/go-cart-actor:${{ needs.Metadata.outputs.version }} \ -t registry.knatofs.se/go-cart-actor:${{ needs.Metadata.outputs.version }} \
. .
- name: Push arm64 images - name: Push arm64 images
run: | run: |
docker push registry.knatofs.se/go-cart-actor:latest docker push registry.knatofs.se/go-cart-actor:latest
docker push registry.knatofs.se/go-cart-actor:${{ needs.Metadata.outputs.version }} docker push registry.knatofs.se/go-cart-actor:${{ needs.Metadata.outputs.version }}
- name: Rollout arm64 deployment (pin to version) - name: Rollout arm64 deployment (pin to version)
run: | run: |
kubectl set image deployment/cart-actor-arm64 -n cart cart-actor-arm64=registry.knatofs.se/go-cart-actor:${{ needs.Metadata.outputs.version }} kubectl set image deployment/cart-actor-arm64 -n cart cart-actor-arm64=registry.knatofs.se/go-cart-actor:${{ needs.Metadata.outputs.version }}
kubectl rollout status deployment/cart-actor-arm64 -n cart kubectl rollout status deployment/cart-actor-arm64 -n cart

454
deployment/deployment.yaml
View File

@@ -1,252 +1,252 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: klarna-api-credentials name: klarna-api-credentials
data: data:
username: ZjQzZDY3YjEtNzA2Yy00NTk2LTliNTgtYjg1YjU2NDEwZTUw username: ZjQzZDY3YjEtNzA2Yy00NTk2LTliNTgtYjg1YjU2NDEwZTUw
password: a2xhcm5hX3Rlc3RfYXBpX0trUWhWVE5yYVZsV2FsTnhTRVp3Y1ZSSFF5UkVNRmxyY25Kd1AxSndQMGdzWmpRelpEWTNZakV0TnpBMll5MDBOVGsyTFRsaU5UZ3RZamcxWWpVMk5ERXdaVFV3TERFc2JUUkNjRFpWU1RsTllsSk1aMlEyVEc4MmRVODNZMkozUlRaaFdEZDViV3AwYkhGV1JqTjVNQzlaYXow password: a2xhcm5hX3Rlc3RfYXBpX0trUWhWVE5yYVZsV2FsTnhTRVp3Y1ZSSFF5UkVNRmxyY25Kd1AxSndQMGdzWmpRelpEWTNZakV0TnpBMll5MDBOVGsyTFRsaU5UZ3RZamcxWWpVMk5ERXdaVFV3TERFc2JUUkNjRFpWU1RsTllsSk1aMlEyVEc4MmRVODNZMkozUlRaaFdEZDViV3AwYkhGV1JqTjVNQzlaYXow
type: Opaque type: Opaque
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
app: cart-actor app: cart-actor
arch: amd64 arch: amd64
name: cart-actor-x86 name: cart-actor-x86
spec: spec:
replicas: 0 replicas: 3
selector: selector:
matchLabels: matchLabels:
app: cart-actor app: cart-actor
arch: amd64 arch: amd64
template: template:
metadata: metadata:
labels: labels:
app: cart-actor app: cart-actor
actor-pool: cart actor-pool: cart
arch: amd64 arch: amd64
spec: spec:
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: kubernetes.io/arch - key: kubernetes.io/arch
operator: NotIn operator: NotIn
values: values:
- arm64 - arm64
volumes: volumes:
- name: data - name: data
nfs: nfs:
path: /i-data/7a8af061/nfs/cart-actor path: /i-data/7a8af061/nfs/cart-actor
server: 10.10.1.10 server: 10.10.1.10
imagePullSecrets: imagePullSecrets:
- name: regcred - name: regcred
serviceAccountName: default serviceAccountName: default
containers: containers:
- image: registry.knatofs.se/go-cart-actor-amd64:latest - image: registry.knatofs.se/go-cart-actor-amd64:latest
name: cart-actor-amd64 name: cart-actor-amd64
imagePullPolicy: Always imagePullPolicy: Always
lifecycle: lifecycle:
preStop: preStop:
exec: exec:
command: ["sleep", "15"] command: ["sleep", "15"]
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: web name: web
- containerPort: 1337 - containerPort: 1337
name: rpc name: rpc
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /livez path: /livez
port: web port: web
failureThreshold: 1 failureThreshold: 1
periodSeconds: 10 periodSeconds: 10
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /readyz path: /readyz
port: web port: web
failureThreshold: 2 failureThreshold: 2
initialDelaySeconds: 2 initialDelaySeconds: 2
periodSeconds: 10 periodSeconds: 10
volumeMounts: volumeMounts:
- mountPath: "/data" - mountPath: "/data"
name: data name: data
resources: resources:
limits: limits:
memory: "768Mi" memory: "768Mi"
requests: requests:
memory: "70Mi" memory: "70Mi"
cpu: "1200m" cpu: "1200m"
env: env:
- name: TZ - name: TZ
value: "Europe/Stockholm" value: "Europe/Stockholm"
- name: KLARNA_API_USERNAME - name: KLARNA_API_USERNAME
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: klarna-api-credentials name: klarna-api-credentials
key: username key: username
- name: KLARNA_API_PASSWORD - name: KLARNA_API_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: klarna-api-credentials name: klarna-api-credentials
key: password key: password
- name: POD_IP - name: POD_IP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP
- name: AMQP_URL - name: AMQP_URL
value: "amqp://admin:12bananer@rabbitmq.dev:5672/" value: "amqp://admin:12bananer@rabbitmq.dev:5672/"
# - name: BASE_URL # - name: BASE_URL
# value: "https://s10n-no.tornberg.me" # value: "https://s10n-no.tornberg.me"
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
app: cart-actor app: cart-actor
arch: arm64 arch: arm64
name: cart-actor-arm64 name: cart-actor-arm64
spec: spec:
replicas: 3 replicas: 0
selector: selector:
matchLabels: matchLabels:
app: cart-actor app: cart-actor
arch: arm64 arch: arm64
template: template:
metadata: metadata:
labels: labels:
app: cart-actor app: cart-actor
actor-pool: cart actor-pool: cart
arch: arm64 arch: arm64
spec: spec:
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: kubernetes.io/hostname - key: kubernetes.io/hostname
operator: NotIn operator: NotIn
values: values:
- masterpi - masterpi
- key: kubernetes.io/arch - key: kubernetes.io/arch
operator: In operator: In
values: values:
- arm64 - arm64
volumes: volumes:
- name: data - name: data
nfs: nfs:
path: /i-data/7a8af061/nfs/cart-actor path: /i-data/7a8af061/nfs/cart-actor
server: 10.10.1.10 server: 10.10.1.10
imagePullSecrets: imagePullSecrets:
- name: regcred - name: regcred
serviceAccountName: default serviceAccountName: default
containers: containers:
- image: registry.knatofs.se/go-cart-actor:latest - image: registry.knatofs.se/go-cart-actor:latest
name: cart-actor-arm64 name: cart-actor-arm64
imagePullPolicy: Always imagePullPolicy: Always
lifecycle: lifecycle:
preStop: preStop:
exec: exec:
command: ["sleep", "15"] command: ["sleep", "15"]
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: web name: web
- containerPort: 1337 - containerPort: 1337
name: rpc name: rpc
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /livez path: /livez
port: web port: web
failureThreshold: 1 failureThreshold: 1
periodSeconds: 10 periodSeconds: 10
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /readyz path: /readyz
port: web port: web
failureThreshold: 2 failureThreshold: 2
initialDelaySeconds: 2 initialDelaySeconds: 2
periodSeconds: 10 periodSeconds: 10
volumeMounts: volumeMounts:
- mountPath: "/data" - mountPath: "/data"
name: data name: data
resources: resources:
limits: limits:
memory: "768Mi" memory: "768Mi"
requests: requests:
memory: "70Mi" memory: "70Mi"
cpu: "1200m" cpu: "1200m"
env: env:
- name: TZ - name: TZ
value: "Europe/Stockholm" value: "Europe/Stockholm"
- name: KLARNA_API_USERNAME - name: KLARNA_API_USERNAME
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: klarna-api-credentials name: klarna-api-credentials
key: username key: username
- name: KLARNA_API_PASSWORD - name: KLARNA_API_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: klarna-api-credentials name: klarna-api-credentials
key: password key: password
- name: POD_IP - name: POD_IP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP
- name: AMQP_URL - name: AMQP_URL
value: "amqp://admin:12bananer@rabbitmq.dev:5672/" value: "amqp://admin:12bananer@rabbitmq.dev:5672/"
# - name: BASE_URL # - name: BASE_URL
# value: "https://s10n-no.tornberg.me" # value: "https://s10n-no.tornberg.me"
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
--- ---
kind: Service kind: Service
apiVersion: v1 apiVersion: v1
metadata: metadata:
name: cart-actor name: cart-actor
annotations: annotations:
prometheus.io/port: "8080" prometheus.io/port: "8080"
prometheus.io/scrape: "true" prometheus.io/scrape: "true"
prometheus.io/path: "/metrics" prometheus.io/path: "/metrics"
spec: spec:
selector: selector:
app: cart-actor app: cart-actor
ports: ports:
- name: web - name: web
port: 8080 port: 8080
--- ---
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: cart-ingress name: cart-ingress
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod cert-manager.io/cluster-issuer: letsencrypt-prod
nginx.ingress.kubernetes.io/affinity: "cookie" nginx.ingress.kubernetes.io/affinity: "cookie"
nginx.ingress.kubernetes.io/session-cookie-name: "cart-affinity" nginx.ingress.kubernetes.io/session-cookie-name: "cart-affinity"
nginx.ingress.kubernetes.io/session-cookie-expires: "172800" nginx.ingress.kubernetes.io/session-cookie-expires: "172800"
nginx.ingress.kubernetes.io/session-cookie-max-age: "172800" nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
nginx.ingress.kubernetes.io/proxy-body-size: 4m nginx.ingress.kubernetes.io/proxy-body-size: 4m
spec: spec:
ingressClassName: nginx ingressClassName: nginx
tls: tls:
- hosts: - hosts:
- cart.tornberg.me - cart.tornberg.me
secretName: cart-actor-tls-secret secretName: cart-actor-tls-secret
rules: rules:
- host: cart.tornberg.me - host: cart.tornberg.me
http: http:
paths: paths:
- path: / - path: /
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: cart-actor name: cart-actor
port: port:
number: 8080 number: 8080