Compare commits
27 commits
renovate/c
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| bc96d8d7aa | |||
| e65abf162e | |||
| a9dcf29f7a | |||
| b72e2049e3 | |||
| 4cea4ffde7 | |||
| 0b13b89640 | |||
| 4aa8973c91 | |||
| c682c48be0 | |||
| 61721097d6 | |||
| 487e1ac15c | |||
| 2af607e949 | |||
| f2c885cd84 | |||
| 08740eb1da | |||
| 47f99082db | |||
| a3bae88ce9 | |||
| 9374d90d1f | |||
| e0f74e9ec4 | |||
| 58c694c9d1 | |||
| d1ab2f6c85 | |||
| 246be79659 | |||
| 6f9a6372f1 | |||
| d116313afe | |||
| ee8b2f0e9c | |||
| dedebf1747 | |||
| 46a1c1aa33 | |||
|
|
2f15b6b373 | ||
|
|
4b11db5668 |
11 changed files with 81 additions and 27 deletions
|
|
@ -34,6 +34,11 @@ envVars:
|
|||
secretKeyRef:
|
||||
name: dex-argo-client
|
||||
key: clientSecret
|
||||
- name: FORGEJO_RUNNER_SIZER_CLIENT_SECRET
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: dex-runner-sizer-client
|
||||
key: clientSecret
|
||||
- name: LOG_LEVEL
|
||||
value: debug
|
||||
|
||||
|
|
@ -74,3 +79,8 @@ config:
|
|||
- "https://grafana.dev.t09.de/login/generic_oauth"
|
||||
name: "Grafana"
|
||||
secretEnv: "OIDC_DEX_GRAFANA_CLIENT_SECRET"
|
||||
- id: ci-sizer
|
||||
name: "CI Sizer"
|
||||
redirectURIs:
|
||||
- "https://sizer.dev.t09.de/ui/callback"
|
||||
secretEnv: "FORGEJO_RUNNER_SIZER_CLIENT_SECRET"
|
||||
|
|
|
|||
|
|
@ -137,6 +137,9 @@ gitea:
|
|||
ENABLED: true
|
||||
ADAPTER: redis
|
||||
|
||||
security:
|
||||
GLOBAL_TWO_FACTOR_REQUIREMENT: admin
|
||||
|
||||
service:
|
||||
DISABLE_REGISTRATION: true
|
||||
ENABLE_NOTIFY_MAIL: true
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ spec:
|
|||
sources:
|
||||
- repoURL: https://edp.buildth.ing/DevFW-CICD/garm-helm
|
||||
path: charts/garm
|
||||
targetRevision: v0.0.12
|
||||
targetRevision: v0.0.15
|
||||
helm:
|
||||
valueFiles:
|
||||
- $values/otc/dev.t09.de/stacks/garm/garm/values.yaml
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ credentials:
|
|||
|
||||
image:
|
||||
repository: edp.buildth.ing/devfw-cicd/garm-forgejo
|
||||
tag: v0.1.7-forgejo-3
|
||||
tag: v0.1.7-forgejo-21
|
||||
|
||||
providerConfig:
|
||||
edgeConnect:
|
||||
|
|
@ -37,8 +37,9 @@ providerConfig:
|
|||
name: Hamburg
|
||||
organization: TelekomOP
|
||||
edgeConnectK8s:
|
||||
pendingTimeout: "5m"
|
||||
sizer:
|
||||
sidecarImage: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-collector:latest
|
||||
sidecarImage: edp.buildth.ing/devfw-cicd/ci-sizer-collector:latest
|
||||
sidecarPushEndpoint: https://sizer.dev.t09.de/api/v1/metrics
|
||||
baseUrl: "https://sizer.dev.t09.de"
|
||||
readToken:
|
||||
|
|
|
|||
|
|
@ -16,9 +16,11 @@ spec:
|
|||
labels:
|
||||
app: sizer-receiver
|
||||
spec:
|
||||
securityContext:
|
||||
fsGroup: 65534
|
||||
containers:
|
||||
- name: receiver
|
||||
image: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-receiver:latest
|
||||
image: edp.buildth.ing/devfw-cicd/ci-sizer-receiver:latest
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
- --db=/data/metrics.db
|
||||
|
|
@ -37,6 +39,34 @@ spec:
|
|||
secretKeyRef:
|
||||
name: sizer-tokens
|
||||
key: hmac-key
|
||||
- name: GARM_URL
|
||||
value: "http://garm.garm.svc.cluster.local:80"
|
||||
- name: GARM_USER
|
||||
value: "admin"
|
||||
- name: GARM_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: garm-fixed-credentials
|
||||
key: admin_password
|
||||
- name: RECEIVER_OIDC_ISSUER
|
||||
value: "https://dex.dev.t09.de"
|
||||
- name: RECEIVER_OIDC_CLIENT_ID
|
||||
value: "ci-sizer"
|
||||
- name: RECEIVER_OIDC_CLIENT_SECRET
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: sizer-oidc-client
|
||||
key: client-secret
|
||||
- name: RECEIVER_OIDC_REDIRECT_URI
|
||||
value: "https://sizer.dev.t09.de/ui/callback"
|
||||
- name: RECEIVER_SESSION_TTL
|
||||
value: "12h"
|
||||
- name: RECEIVER_ALLOWED_ORG
|
||||
value: "DevFW"
|
||||
- name: RECEIVER_CPU_SIZING_MODE
|
||||
value: "observe"
|
||||
- name: RECEIVER_MEMORY_QOS
|
||||
value: "guaranteed"
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
|
|
|
|||
|
|
@ -137,6 +137,9 @@ gitea:
|
|||
ENABLED: true
|
||||
ADAPTER: redis
|
||||
|
||||
security:
|
||||
GLOBAL_TWO_FACTOR_REQUIREMENT: admin
|
||||
|
||||
service:
|
||||
DISABLE_REGISTRATION: true
|
||||
ENABLE_NOTIFY_MAIL: true
|
||||
|
|
@ -177,4 +180,4 @@ image:
|
|||
# rootless: true
|
||||
fullOverride: observability.buildth.ing/devfw-cicd/edp-forgejo:14.0.2-edp1-rootless
|
||||
|
||||
forgejo: {}
|
||||
forgejo: {}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ spec:
|
|||
sources:
|
||||
- repoURL: https://edp.buildth.ing/DevFW-CICD/garm-helm
|
||||
path: charts/garm
|
||||
targetRevision: v0.0.7
|
||||
targetRevision: v0.0.11
|
||||
helm:
|
||||
valueFiles:
|
||||
- $values/otc/edp.buildth.ing/stacks/garm/garm/values.yaml
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ credentials:
|
|||
|
||||
image:
|
||||
repository: observability.buildth.ing/devfw-cicd/garm-forgejo
|
||||
tag: v0.1.7-forgejo-1
|
||||
tag: v0.1.7-forgejo-21
|
||||
|
||||
providerConfig:
|
||||
edgeConnect:
|
||||
|
|
@ -36,6 +36,9 @@ providerConfig:
|
|||
cloudlet:
|
||||
name: Hamburg
|
||||
organization: TelekomOP
|
||||
edgeConnectK8s:
|
||||
sizer:
|
||||
sidecarImage: edp.buildth.ing/devfw-cicd/ci-sizer-collector:0.0.4
|
||||
|
||||
garm:
|
||||
logging:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: optimiser-receiver
|
||||
name: sizer-receiver
|
||||
namespace: argocd
|
||||
labels:
|
||||
env: dev
|
||||
|
|
@ -22,4 +22,4 @@ spec:
|
|||
source:
|
||||
repoURL: https://observability.buildth.ing/DevFW-CICD/stacks-instances
|
||||
targetRevision: HEAD
|
||||
path: "otc/edp.buildth.ing/stacks/garm/optimiser-receiver"
|
||||
path: "otc/edp.buildth.ing/stacks/garm/sizer-receiver"
|
||||
|
|
@ -1,22 +1,22 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: optimiser-receiver
|
||||
name: sizer-receiver
|
||||
labels:
|
||||
app: optimiser-receiver
|
||||
app: sizer-receiver
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: optimiser-receiver
|
||||
app: sizer-receiver
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: optimiser-receiver
|
||||
app: sizer-receiver
|
||||
spec:
|
||||
containers:
|
||||
- name: receiver
|
||||
image: edp.buildth.ing/devfw-cicd/forgejo-runner-optimiser-receiver:0.0.3
|
||||
image: edp.buildth.ing/devfw-cicd/ci-sizer-receiver:0.0.4
|
||||
args:
|
||||
- --db=/data/metrics.db
|
||||
ports:
|
||||
|
|
@ -27,13 +27,17 @@ spec:
|
|||
- name: RECEIVER_READ_TOKEN
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: optimiser-tokens
|
||||
name: sizer-tokens
|
||||
key: read-token
|
||||
- name: RECEIVER_HMAC_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: optimiser-tokens
|
||||
name: sizer-tokens
|
||||
key: hmac-key
|
||||
- name: RECEIVER_CPU_SIZING_MODE
|
||||
value: "observe"
|
||||
- name: RECEIVER_MEMORY_QOS
|
||||
value: "guaranteed"
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
|
|
@ -59,17 +63,17 @@ spec:
|
|||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: optimiser-receiver-data
|
||||
claimName: sizer-receiver-data
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: optimiser-receiver
|
||||
name: sizer-receiver
|
||||
labels:
|
||||
app: optimiser-receiver
|
||||
app: sizer-receiver
|
||||
spec:
|
||||
selector:
|
||||
app: optimiser-receiver
|
||||
app: sizer-receiver
|
||||
ports:
|
||||
- name: http
|
||||
port: 8080
|
||||
|
|
@ -79,9 +83,9 @@ spec:
|
|||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: optimiser-receiver-data
|
||||
name: sizer-receiver-data
|
||||
labels:
|
||||
app: optimiser-receiver
|
||||
app: sizer-receiver
|
||||
annotations:
|
||||
everest.io/disk-volume-type: GPSSD
|
||||
spec:
|
||||
|
|
@ -5,22 +5,22 @@ metadata:
|
|||
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
|
||||
cert-manager.io/cluster-issuer: main
|
||||
|
||||
name: optimiser-receiver
|
||||
name: sizer-receiver
|
||||
namespace: garm
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
rules:
|
||||
- host: optimiser.edp.buildth.ing
|
||||
- host: sizer.edp.buildth.ing
|
||||
http:
|
||||
paths:
|
||||
- backend:
|
||||
service:
|
||||
name: optimiser-receiver
|
||||
name: sizer-receiver
|
||||
port:
|
||||
number: 8080
|
||||
path: /
|
||||
pathType: Prefix
|
||||
tls:
|
||||
- hosts:
|
||||
- optimiser.edp.buildth.ing
|
||||
secretName: optimiser-receiver-tls
|
||||
- sizer.edp.buildth.ing
|
||||
secretName: sizer-receiver-tls
|
||||
Loading…
Add table
Add a link
Reference in a new issue