Compare commits

..

1 Commits

Author SHA1 Message Date
renovate-bot 1952f546b5 Update jobset Docker tag to v0.12.0
renovate/stability-days Updates have not met minimum release age requirement
2026-05-17 00:06:04 +00:00
67 changed files with 428 additions and 483 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ applications:
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
project: sys project: sys
sources: sources:
- repoURL: https://git.oceanbox.io/platform/manifests.git - repoURL: https://gitlab.com/oceanbox//manifests.git
targetRevision: HEAD targetRevision: HEAD
path: helmfile.d path: helmfile.d
plugin: plugin:
+2 -2
View File
@@ -4,10 +4,10 @@ description: Atlantis map and simulation service
type: application type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
version: v2.13.3 version: v2.6.6
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: v2.13.3 appVersion: v2.6.6
dependencies: dependencies:
- name: diagrid-dashboard - name: diagrid-dashboard
version: "0.1.0" version: "0.1.0"
+1 -1
View File
@@ -4,7 +4,7 @@
replicaCount: 1 replicaCount: 1
image: image:
repository: git.oceanbox.io/oceanbox/poseidon/atlantis repository: git.oceanbox.io/oceanbox/poseidon/atlantis
tag: v2.13.3 tag: v2.6.6
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
init: init:
enabled: false enabled: false
+2 -2
View File
@@ -13,9 +13,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: v2.13.3 version: v2.6.6
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "v2.13.3" appVersion: "v2.6.6"
+1 -1
View File
@@ -10,7 +10,7 @@ image:
# This sets the pull policy for images. # This sets the pull policy for images.
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: v2.13.3 tag: v2.6.6
# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ # This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
imagePullSecrets: imagePullSecrets:
- name: gitlab-pull-secret - name: gitlab-pull-secret
+2 -2
View File
@@ -12,7 +12,7 @@ description: Oceanbox Documentation
type: application type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
version: v0.0.2 version: v0.1.0
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: v0.0.2 appVersion: v0.1.0
+3 -4
View File
@@ -4,7 +4,7 @@
replicaCount: 1 replicaCount: 1
image: image:
repository: git.oceanbox.io/oceanbox/documentation/docs repository: git.oceanbox.io/oceanbox/documentation/docs
tag: v0.0.2 tag: v0.1.0
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
init: init:
enabled: false enabled: false
@@ -21,9 +21,8 @@ env:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
# imagePullSecrets: # imagePullSecrets:
# - name: gitea-pull-secret # - name: gitea-pull-secret
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""
serviceAccount: serviceAccount:
+2 -2
View File
@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
type: application type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
version: v2.13.3 version: v2.6.6
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: v2.13.3 appVersion: v2.6.6
dependencies: dependencies:
- name: diagrid-dashboard - name: diagrid-dashboard
version: "0.1.0" version: "0.1.0"
+1 -1
View File
@@ -5,7 +5,7 @@
replicaCount: 1 replicaCount: 1
image: image:
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
tag: v2.13.3 tag: v2.6.6
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
init: init:
enabled: false enabled: false
+4 -4
View File
@@ -15,7 +15,7 @@ releases:
- name: argocd - name: argocd
namespace: argocd namespace: argocd
chart: argo/argo-cd chart: argo/argo-cd
version: 9.5.19 version: 9.5.12
condition: argo.enabled condition: argo.enabled
values: values:
- ../values/argo/values/argocd.yaml.gotmpl - ../values/argo/values/argocd.yaml.gotmpl
@@ -27,7 +27,7 @@ releases:
- name: argocd-apps - name: argocd-apps
namespace: argocd namespace: argocd
chart: argo/argocd-apps chart: argo/argocd-apps
version: 2.0.5 version: 2.0.4
condition: argo.apps.enabled condition: argo.apps.enabled
values: values:
- ../values/argo/values/apps.yaml.gotmpl - ../values/argo/values/apps.yaml.gotmpl
@@ -35,7 +35,7 @@ releases:
- name: argo-rollouts - name: argo-rollouts
namespace: argocd namespace: argocd
chart: argo/argo-rollouts chart: argo/argo-rollouts
version: 2.41.0 version: 2.40.9
condition: argo.rollouts.enabled condition: argo.rollouts.enabled
values: values:
- ../values/argo/values/rollouts.yaml.gotmpl - ../values/argo/values/rollouts.yaml.gotmpl
@@ -43,7 +43,7 @@ releases:
- name: argo-workflows - name: argo-workflows
namespace: argocd namespace: argocd
chart: argo/argo-workflows chart: argo/argo-workflows
version: 1.0.14 version: 1.0.13
condition: argo.workflows.enabled condition: argo.workflows.enabled
missingFileHandler: Info missingFileHandler: Info
- name: manifests - name: manifests
+1 -1
View File
@@ -13,7 +13,7 @@ releases:
- name: ingress-haproxy - name: ingress-haproxy
namespace: ingress-haproxy namespace: ingress-haproxy
chart: haproxytech/kubernetes-ingress chart: haproxytech/kubernetes-ingress
version: 1.49.0 version: 1.42.0
condition: haproxy.enabled condition: haproxy.enabled
values: values:
- ../values/ingress-haproxy/values/ingress-haproxy.yaml.gotmpl - ../values/ingress-haproxy/values/ingress-haproxy.yaml.gotmpl
+1 -1
View File
@@ -10,7 +10,7 @@ releases:
- name: jobset - name: jobset
namespace: jobset-system namespace: jobset-system
chart: jobset/jobset chart: jobset/jobset
version: 0.11.1 version: 0.12.0
condition: jobset.enabled condition: jobset.enabled
values: values:
- ../values/jobset/values/jobset.yaml.gotmpl - ../values/jobset/values/jobset.yaml.gotmpl
+1 -1
View File
@@ -8,7 +8,7 @@ releases:
- name: kueue - name: kueue
namespace: kueue-system namespace: kueue-system
chart: oci://registry.k8s.io/kueue/charts/kueue chart: oci://registry.k8s.io/kueue/charts/kueue
version: 0.17.3 version: 0.17.1
condition: kueue.enabled condition: kueue.enabled
values: values:
- ../values/kueue/values/values.yaml - ../values/kueue/values/values.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ releases:
- name: kyverno - name: kyverno
namespace: kyverno namespace: kyverno
chart: kyverno/kyverno chart: kyverno/kyverno
version: 3.8.1 version: 3.8.0
condition: kyverno.enabled condition: kyverno.enabled
values: values:
- ../values/kyverno/values/kyverno.yaml.gotmpl - ../values/kyverno/values/kyverno.yaml.gotmpl
-27
View File
@@ -1,27 +0,0 @@
bases:
- ../envs/environments.yaml.gotmpl
commonLabels:
tier: system
releases:
- name: manifests
namespace: niks3
chart: manifests
condition: niks3.enabled
missingFileHandler: Info
values:
- ../values/env.yaml
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
- ../values/niks3/env.yaml.gotmpl
- ../values/niks3/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
hooks:
- events: [ prepare, cleanup ]
showlogs: true
command: ../bin/helmify
args:
- '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
- '{{`{{ .Release.Chart }}`}}'
- '{{`{{ .Environment.Name }}`}}'
- ../values/niks3/manifests
- manifests
+1 -1
View File
@@ -16,7 +16,7 @@ releases:
namespace: {{ .Environment.Name }}-openfga namespace: {{ .Environment.Name }}-openfga
{{- end }} {{- end }}
chart: openfga/openfga chart: openfga/openfga
version: 0.3.7 version: 0.3.3
condition: openfga.enabled condition: openfga.enabled
values: values:
- ../values/openfga/values/values.yaml - ../values/openfga/values/values.yaml
@@ -12,7 +12,7 @@ releases:
- name: opentelemetry-collector - name: opentelemetry-collector
namespace: otel namespace: otel
chart: open-telemetry/opentelemetry-collector chart: open-telemetry/opentelemetry-collector
version: 0.158.1 version: 0.153.0
condition: otel.enabled condition: otel.enabled
values: values:
- ../values/opentelemetry-collector/values/values.yaml - ../values/opentelemetry-collector/values/values.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ releases:
- name: postgres-operator - name: postgres-operator
namespace: cnpg namespace: cnpg
chart: cloudnative-pg/cloudnative-pg chart: cloudnative-pg/cloudnative-pg
version: 0.28.2 version: 0.28.0
condition: postgres_operator.enabled condition: postgres_operator.enabled
values: values:
- ../values/postgres-operator/values/postgres-operator.yaml.gotmpl - ../values/postgres-operator/values/postgres-operator.yaml.gotmpl
+1 -1
View File
@@ -15,7 +15,7 @@ releases:
- name: prometheus - name: prometheus
namespace: prometheus namespace: prometheus
chart: prometheus/kube-prometheus-stack chart: prometheus/kube-prometheus-stack
version: 86.2.0 version: 82.15.1
condition: prometheus.enabled condition: prometheus.enabled
values: values:
- ../values/prometheus/values/prometheus.yaml.gotmpl - ../values/prometheus/values/prometheus.yaml.gotmpl
+1 -1
View File
@@ -14,7 +14,7 @@ releases:
- name: umami - name: umami
namespace: analytics namespace: analytics
chart: umami/umami chart: umami/umami
version: 7.9.4 version: 7.9.1
condition: umami.enabled condition: umami.enabled
values: values:
- ../values/umami/values/values.yaml - ../values/umami/values/values.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ releases:
- name: velero - name: velero
namespace: velero namespace: velero
chart: velero/velero chart: velero/velero
version: 12.0.2 version: 12.0.1
condition: velero.enabled condition: velero.enabled
values: values:
- ../values/velero/values/velero.yaml.gotmpl - ../values/velero/values/velero.yaml.gotmpl
+2 -3
View File
@@ -3,8 +3,7 @@ bases:
repositories: repositories:
- name: x509-exporter - name: x509-exporter
oci: true url: 'https://charts.enix.io'
url: 'quay.io/enix/charts'
commonLabels: commonLabels:
tier: sys tier: sys
@@ -13,7 +12,7 @@ releases:
- name: x509-exporter - name: x509-exporter
namespace: x509-exporter namespace: x509-exporter
chart: x509-exporter/x509-certificate-exporter chart: x509-exporter/x509-certificate-exporter
version: 4.1.0 version: 3.21.0
condition: x509_exporter.enabled condition: x509_exporter.enabled
values: values:
- ../values/x509-exporter/values/x509-exporter.yaml.gotmpl - ../values/x509-exporter/values/x509-exporter.yaml.gotmpl
+1 -4
View File
@@ -102,14 +102,12 @@ spec:
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
- namespace: catalyst - namespace: catalyst
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
- namespace: niks3
server: https://kubernetes.default.svc
sourceRepos: sourceRepos:
- https://argoproj.github.io/argo-helm - https://argoproj.github.io/argo-helm
- https://kubernetes-sigs.github.io/metrics-server/ - https://kubernetes-sigs.github.io/metrics-server/
- https://git.oceanbox.io/platform/manifests.git - https://git.oceanbox.io/platform/manifests.git
- https://git.oceanbox.io/platform/manifests - https://git.oceanbox.io/platform/manifests
- https://git.oceanbox.io/oceanbox/manifests.git - https://gitlab.com/oceanbox/manifests.git
- https://kubernetes.github.io/ingress-nginx - https://kubernetes.github.io/ingress-nginx
- https://cloudnative-pg.github.io/charts - https://cloudnative-pg.github.io/charts
- https://charts.jetstack.io - https://charts.jetstack.io
@@ -143,7 +141,6 @@ spec:
- ghcr.io/spegel-org/helm-charts - ghcr.io/spegel-org/helm-charts
- quay.io/cilium/charts - quay.io/cilium/charts
- quay.io/jetstack/charts - quay.io/jetstack/charts
- quay.io/enix/charts
- registry.k8s.io/jobset/charts/jobset - registry.k8s.io/jobset/charts/jobset
- ghcr.io/dragonflydb/dragonfly-operator/helm/dragonfly-operator - ghcr.io/dragonflydb/dragonfly-operator/helm/dragonfly-operator
- docker.gitea.com - docker.gitea.com
@@ -3,8 +3,7 @@ kind: ConfigMap
metadata: metadata:
name: beta-atlantis-actor-config name: beta-atlantis-actor-config
data: data:
KUEUE_NAMESPACE: "prod-queue" XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.14"
XTRACT_QUEUE: "prod-queue" XTRACT_QUEUE: "prod-queue"
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.14" PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
PLUME_QUEUE: "prod-queue" PLUME_QUEUE: "prod-queue"
@@ -3,7 +3,6 @@ kind: ConfigMap
metadata: metadata:
name: prod-atlantis-actor-config name: prod-atlantis-actor-config
data: data:
KUEUE_NAMESPACE: "prod-queue"
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8" XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
XTRACT_QUEUE: "prod-queue" XTRACT_QUEUE: "prod-queue"
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8" PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
@@ -3,7 +3,7 @@ kind: ConfigMap
metadata: metadata:
name: staging-atlantis-actor-config name: staging-atlantis-actor-config
data: data:
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.4.0" XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.12"
XTRACT_QUEUE: "dev-queue" XTRACT_QUEUE: "dev-queue"
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.4.0" PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.12"
PLUME_QUEUE: "dev-queue" PLUME_QUEUE: "dev-queue"
@@ -2,7 +2,7 @@ replicaCount: 1
image: image:
repository: git.oceanbox.io/oceanbox/poseidon/atlantis repository: git.oceanbox.io/oceanbox/poseidon/atlantis
tag: v2.13.1 tag: v2.6.6
podAnnotations: podAnnotations:
dapr.io/app-id: "beta-atlantis" dapr.io/app-id: "beta-atlantis"
@@ -11,7 +11,7 @@ env:
- name: APP_NAMESPACE - name: APP_NAMESPACE
value: beta-atlantis value: beta-atlantis
- name: APP_VERSION - name: APP_VERSION
value: "2.13.1-beta" value: "2.6.6-beta"
- name: LOG_LEVEL - name: LOG_LEVEL
value: "1" value: "1"
- name: ANALYTICS_WEB_ID - name: ANALYTICS_WEB_ID
@@ -1,7 +1,7 @@
replicaCount: 1 replicaCount: 1
image: image:
repository: git.oceanbox.io/oceanbox/poseidon/atlantis repository: git.oceanbox.io/oceanbox/poseidon/atlantis
tag: ebead312-debug tag: 0042495a-debug
podAnnotations: podAnnotations:
dapr.io/app-id: "staging-atlantis" dapr.io/app-id: "staging-atlantis"
env: env:
+2
View File
@@ -0,0 +1,2 @@
attic:
enabled: false
@@ -1,3 +1,3 @@
niks3: attic:
enabled: false enabled: false
autosync: false autosync: false
+27
View File
@@ -0,0 +1,27 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: attic
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
destination:
namespace: attic
server: "https://kubernetes.default.svc"
sources:
- repoURL: https://git.oceanbox.io/oceanbox/manifests.git
targetRevision: HEAD
path: values/attic/manifests
project: aux
syncPolicy:
managedNamespaceMetadata:
labels:
component: aux
syncOptions:
- CreateNamespace=true
- ApplyOutOfSyncOnly=true
# - ServerSideApply=true
automated:
prune: true
# selfHeal: false
@@ -1,10 +1,10 @@
apiVersion: postgresql.cnpg.io/v1 apiVersion: postgresql.cnpg.io/v1
kind: Cluster kind: Cluster
metadata: metadata:
name: niks3-db name: attic-db
namespace: niks3 namespace: attic
labels: labels:
app: niks3-db app: attic-db
spec: spec:
instances: 1 instances: 1
primaryUpdateStrategy: unsupervised primaryUpdateStrategy: unsupervised
+167
View File
@@ -0,0 +1,167 @@
apiVersion: v1
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/name: attic
name: attic-config
namespace: attic
data:
config.toml: |
# src: https://github.com/zhaofengli/attic/blob/main/server/src/config-template.toml
# Socket address to listen on
listen = "[::]:8080"
# Allowed `Host` headers
#
# This _must_ be configured for production use. If unconfigured or the
# list is empty, all `Host` headers are allowed.
allowed-hosts = []
# The canonical API endpoint of this server
#
# This is the endpoint exposed to clients in `cache-config` responses.
#
# This _must_ be configured for production use. If not configured, the
# API endpoint is synthesized from the client's `Host` header which may
# be insecure.
#
# The API endpoint _must_ end with a slash (e.g., `https://domain.tld/attic/`
# not `https://domain.tld/attic`).
api-endpoint = "https://attic.srv.oceanbox.io/"
# Whether to soft-delete caches
#
# If this is enabled, caches are soft-deleted instead of actually
# removed from the database. Note that soft-deleted caches cannot
# have their names reused as long as the original database records
# are there.
#soft-delete-caches = false
# Whether to require fully uploading a NAR if it exists in the global cache.
#
# If set to false, simply knowing the NAR hash is enough for
# an uploader to gain access to an existing NAR in the global
# cache.
#require-proof-of-possession = true
# Database connection
[database]
# Connection URL
#
# For production use it's recommended to use PostgreSQL.
url = "postgresql://app:mZP1BnmnpDU33B7UZvomYKOSS1laRJ4bvUR7jNDZ1AJqPdNxH2rLXykghczg7Bgy@attic-db-rw:5432/app"
# Whether to enable sending on periodic heartbeat queries
#
# If enabled, a heartbeat query will be sent every minute
#heartbeat = false
# File storage configuration
[storage]
# Storage type
#
# Can be "local" or "s3".
type = "local"
# ## Local storage
# The directory to store all files under
path = "/attic"
# ## S3 Storage (set type to "s3" and uncomment below)
# The AWS region
#region = "us-east-1"
# The name of the bucket
#bucket = "some-bucket"
# Custom S3 endpoint
#
# Set this if you are using an S3-compatible object storage (e.g., Minio).
#endpoint = "https://xxx.r2.cloudflarestorage.com"
# Credentials
#
# If unset, the credentials are read from the `AWS_ACCESS_KEY_ID` and
# `AWS_SECRET_ACCESS_KEY` environment variables.
#[storage.credentials]
# access_key_id = ""
# secret_access_key = ""
# Data chunking
#
# Warning: If you change any of the values here, it will be
# difficult to reuse existing chunks for newly-uploaded NARs
# since the cutpoints will be different. As a result, the
# deduplication ratio will suffer for a while after the change.
[chunking]
# The minimum NAR size to trigger chunking
#
# If 0, chunking is disabled entirely for newly-uploaded NARs.
# If 1, all NARs are chunked.
nar-size-threshold = 65536 # chunk files that are 64 KiB or larger
# The preferred minimum size of a chunk, in bytes
min-size = 16384 # 16 KiB
# The preferred average size of a chunk, in bytes
avg-size = 65536 # 64 KiB
# The preferred maximum size of a chunk, in bytes
max-size = 262144 # 256 KiB
# Compression
[compression]
# Compression type
#
# Can be "none", "brotli", "zstd", or "xz"
type = "zstd"
# Compression level
#level = 8
# Garbage collection
[garbage-collection]
# The frequency to run garbage collection at
#
# By default it's 12 hours. You can use natural language
# to specify the interval, like "1 day".
#
# If zero, automatic garbage collection is disabled, but
# it can still be run manually with `atticd --mode garbage-collector-once`.
interval = "1 week"
# Default retention period
#
# Zero (default) means time-based garbage-collection is
# disabled by default. You can enable it on a per-cache basis.
default-retention-period = "6 months"
[jwt]
# WARNING: Changing _anything_ in this section will break any existing
# tokens. If you need to regenerate them, ensure that you use the the
# correct secret and include the `iss` and `aud` claims.
# JWT `iss` claim
#
# Set this to the JWT issuer that you want to validate.
# If this is set, all received JWTs will validate that the `iss` claim
# matches this value.
#token-bound-issuer = "some-issuer"
# JWT `aud` claim
#
# Set this to the JWT audience(s) that you want to validate.
# If this is set, all received JWTs will validate that the `aud` claim
# contains at least one of these values.
#token-bound-audiences = ["some-audience1", "some-audience2"]
[jwt.signing]
# JWT RS256 secret key
#
# Set this to the base64-encoded private half of an RSA PEM PKCS1 key.
# You can also set it via the `ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64`
# environment variable.
token-rs256-secret-base64 = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS2dJQkFBS0NBZ0VBdlZrMHQyZUtvdjhpV3prVFFtQzJtRklvd0gxc2liNlVpUFhUaGVwcURiWHMyaERFCnFYa1pKUXRjTnY0T2RtcldmZ2tsbjVyblJNQk5yL1B5dE05OFFMVVJnbzFSU2VTeUVjcmxSU1N4MElVRlhkM3YKV0U0aTJJTktsSzgxblJoY0o4czRUM09iYUpvSUQweEpqS2IzMkhxZmpOSU1vcVdBRk1ES2YyMUM5OWxQeTRXSgpVUUVnYTRzbHo5RzZHVi8wZW5qbFNMa2RRNjEvdEwyRE1ISHgvV2VRUEtpWkF4c2Fwczd3ZVJiNVBrS3J0MVlGClRxa1lJSjY3eDFiNDR1N0NmdWdVbHhMM2JCQ1lqVXVXNnoxdGU3T2ZQUUhoM1FPU2lFZTczQ3I4dU1lSkplV0wKN2VKc1hWSG9uVzBMZWl0aDk5WmJTUTF3YlhieDVPZzNTQ3ZWYnkyZE90Y3Rud2Y2aDN5YlJ3SUNoc24xbk4zMwowRkMyOXlFY0ExQ2VFVzRsMVVHNmxoMGw5cEpiWEhRNlFJS1paempaTlgxZTRGRW5TdytGNGhXd3R1Z2JtKzZnCnVPdEE5QVJxYndJOTFLeEtoT204Q0RJQlRwWThSZG1SaElicWUrc3czT3p3dGk0eTVkU3FMREsrT3Y5b05ucngKQW9TN21TaXNQeDVJS3JwaFhMT3JvVmI2L1puSmNOK3ljaExuenptMDY2Zk5RaTBLNHhzaitvWkphaXVjZnBacAphSElHZGpaY1U3aE5FUzdJNVliVEFqUDdkaDRzdXJnMk1xTUtxbUxsa2ZPcGFoRTlMQTZVVFZRZHZLVFVGNWZwCkdYSnhaT1RKWlpiOGNQTFYxZFdXbnBMaEZNV2h2OUZQTCtDVGZQVUFvQmtmOTE3TzFLdkE3bGsvcTJzQ0F3RUEKQVFLQ0FnQU9WZ3k1dmlzdkFDWTN4ZkNCWEJVM0h6RmFzYVJnSVgvWmh0TkhGbUtGT3pyOW43dGtJWGtYNXU1SwpjNTNndFdJY0ZORTJibUlJUUk4aFBWVW8vM1NtNlk2ejFjTkwxdmJzaGZJcDlBZEtoR2ZOblpvYmszN3I2YlRoCjRRb3NKTVlGZFV1RUtIcWh4dGZKWUx0STNQTnkvb1hLQWJWWE16U3BYWmQzWW14cG01aUJEbEZCUXRhVGpldUUKK3BvZWhiZGE5b0JWcXo1ZCsycnA0bGRtZVpvYTE1YUNJVG5FbEc3R0puRHFtaVN3NUJkZ1FERVNyWmJZRVd5aQpRU0dDL1JUWXl2V1VJcWw5RXh5WnhobGRJaitCMkMyOFRzSXRHN0lpZzF2ajVaVlE0RHF3RmRzc1hiSmF0bkxvClNITlFBcXplT09xY2Mxb0p6N0dzNVRBYVZNZEtEQXZCZm1JMFBMcDNqNmVFOFFIYlduMHk2NzVYbnlqWllLUUcKaWx5R0pUNVRzMWZHWHlPSXBrNG4yQjM1V3dHcjIyTkxnYUd5cnZjRkgxN3JoZGVnaGlrZFJRd1FOcXRsZjBIZApMWDVRQWVwcUt3SE9uR1BGVy9XU2xGU0lEdkt1VFZSVGtvQmFSMTA3OFpiS2JXckZBbEdqYTFvbnNXQUh1YW5UClh5dFE4dWoxUEFFeWFMZUJEaUJxRVJ2am1VVFQ1ZktCOTdaVnRJenVBZ0lyWWZ6YjIyVEk2VFJ6OVZiQ2VyWG8KdTc0cnoxMjM2TXMrbmg5Y2xYd3VtQlBOU1d1eE9OdldOWEZ6VWdIOURzdlFRMWRsMFRJWEFQMGhFYkRHRkNBQwowUlg2M0lpcXFzUG1ZZUZNTGR5K2tVWjViNzI1TlhXWFRHbDRnQ1Y3NFVRU01ya0xrUUtDQVFFQStobXIwYjdnClVYcWRKaGtLRXVsa29IVzVuYzZ4QmhobCtuTkFucVFSTm5tQWpiaDlCeDVpLzQ2WUwxcHFYQUY5cTNIRlowSDIKZEJRZXN2Q0pxbmtSTHVwTi95VE1KSlo0ZE5kMHZqRzZ0UGhMUjZuRmRabHU0TFBRMXRKcU5XZkhZeCtwQ3N2SQo4Wkx3VG8rRGFxSjArZDk3WWF0b0dWNUZHOWtUSjhBYWFXb0Q1R1AyOGtOd0djKzI0b2VNYnJtU0ppQ2I2UlJoCjA5WWJaMGpXdkFHaXJyMzFOTW5nR0dtVmRPMThoOXVMUStLNzFUQWt1eFEzZEhpUzh6UVd6YythRnM1THgyUnIKeXppcEJhR3VySmFJQ05XNklFQm5ndFcvZEZaYXpMbjhQcDVrQlJzQ1NyN1JpQkNFSFZmeHBYVFNoS3cwVWp4NQo2a0gwc01YZnFoOFpMUUtDQVFFQXdkQ3BPUXBRa1RhK0t6Z0VrWGdMVnk2QmZJKzRWdC9BYjRtK2pFSm85aUIzCnN4dEtKNU5tNXltNldXcmFWS25zekxNZy85Mi9vSVZreUlNSklrOWNYdEpuaEU5ak1aVzc2ZjhYbW5CUnJIMnAKVHVmNWtYWWdVUHZLQ2g1U1g5Q2w0UHJENHNSb3cwNHJjbHVxSE1MT2g1MncxUmJPalRrb05tNXBHWlFoVkhxeApaUzh3aVk3bzhLNFZJQXZOVlZOdGlIZFNOY2Y0cDMxL0F6SU5aQjJWdlczeWJHTWNIdDByekQ5TkpZLzhTekc3CktEME5mRTgzeng2OWxHTlhUcURGSnBTV2ZNVlFwSGVCM0FTRTV1YVhVM1c5S3EwN2NDOEJWSHRaK3B5a1B0RTYKOHgrZE9NYWh6UElaMjRqbkIzZkVsaWc0Rk5zd01LZm9aeDdKYUJLRjl3S0NBUUVBdWJUTUgwOWpVenovYVdXWQpWRmlYVG9wN3pGRElvNlVFUEFiT1NiMjd4ajVNRlcrUzd2RkNRMDZIZEVubnhlK1pkKzlmeS85djE5dUV2QXZkCnZRWnVtdTZDQWQwNTlFVUNwb2ZCZU9TR0paQmtuWTdUUHpJeDRZbkRuVy9hUzFPRyt2UnNXY2JkcTNzWEVzNS8KbjNPSDltNWFPRGpGY0dqT1doSkNwZlovNWh4QlRacG9xSlVvclJIT1U4Q2dweXNGK1dlblBWZlVHQzdZWkVYeQpwT0YyQWRpdE5ZaGM3T09oaFpRK0xzYjNUdTRSMlFnSmpoeEIzU3NXdXAzSC9RU1UvekFwbHFIYlpLZnE0WEtmCnVDbUNVMFVZRXBDZ0M4ZFpoVElGOUJSNTE2bFd6Vyt6c1BxbHJTbk9YOWVJWi9vcHd6ZjNGY1V3SmFEWjUxVFcKY29UcTlRS0NBUUVBckhtVTdpYkl0Y0Zpa0RGa2wxT2R1L0t0MW54TFRqd0dFdndnYnM3MmV2ay9yRXEvdmVKRgpzN2NGbDJjb2JpbGRpbmhxQ0doOGpFdkkrVXJxeVBhWXUrVS9xNVcrTHpVUnFkV1JXcVZUZVUzR2FtcXpSQWc4CkQvVlJ3WmxrTXRJSm0rRnNpcFBBcXZVWVlzZEI1aUJTREl0Ky90SXg4NmtHcVJHdVE4MzNyeWNVVUhnakdIYnQKd3FrWU1aRnZJOXgvWCs3WFlQYll4Nnc5YUVtVmN4K0V6ck5XQmJCWktQb25iTFowWDlYM2JhOE8zMnNkWWg5WgpDZDlRVkFubmV4aEUrZVZHMmpmNVlMTGRCRCtkU2FHd3p0dTdBSXh5bFkydkFGQlpMVlZTTUhpZm5oWG5Jc3hZCjFub29HcDZGQWJkS1lWbmZObWdzUlZCVzE5V2s1QkYvMXdLQ0FRRUFqVnR1RXdYZzU5NERIaVN4UjlWbGRBaHYKcXF5dlpieVhPT2pnNHNKZjFLUlpxZkkzV28yL05IQWN0MlZlREE1bnlEM001YndHWEwrdVZGaUlMVk1ZMUp0WQp6MmlHWHgwZVdlbFJya2tRZHFncTI1TE9BQ2dxYTFMNW9tQS9tMGcwQWljWVdYa1FYSXpXRkhwb0ZqcU9KZHpTCnZ0MHhLV2lpWHUxVk5YeDJibFR1dXBCa1JUZUlQNTVxdWdyOUh0ZmY1MHc5MHhwTllaMFR3d0lDMG1neVVMMWEKRkdVdHlPUTlqVFBUUUdGM3h6REJCQ2U2MW5uZUV0TThRMEJ1MXh3Rm90aWFYSE9NaGhiMFBndVkzNHhiekNHYgpHcTlsWjVaN2lRVXByUWNNYjhrUzZ1WFk3VHBDTmUzaDBiTTM5dVlKeHNYNXUzcmVNRWsyZlBNT3dnTlFjdz09Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg=="
+63
View File
@@ -0,0 +1,63 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: attic
spec:
selector:
matchLabels:
app: attic
strategy:
type: Recreate
template:
metadata:
labels:
app: attic
spec:
containers:
- name: attic
image: ghcr.io/zhaofengli/attic:latest
args:
- -f
- /config.toml
ports:
- name: http
containerPort: 8080
protocol: TCP
livenessProbe:
httpGet:
path: /
port: http
readinessProbe:
httpGet:
path: /
port: http
env:
- name: ATTIC_SERVER_TOKEN_HS256_SECRET_BASE64
value: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS2dJQkFBS0NBZ0VBdlZrMHQyZUtvdjhpV3prVFFtQzJtRklvd0gxc2liNlVpUFhUaGVwcURiWHMyaERFCnFYa1pKUXRjTnY0T2RtcldmZ2tsbjVyblJNQk5yL1B5dE05OFFMVVJnbzFSU2VTeUVjcmxSU1N4MElVRlhkM3YKV0U0aTJJTktsSzgxblJoY0o4czRUM09iYUpvSUQweEpqS2IzMkhxZmpOSU1vcVdBRk1ES2YyMUM5OWxQeTRXSgpVUUVnYTRzbHo5RzZHVi8wZW5qbFNMa2RRNjEvdEwyRE1ISHgvV2VRUEtpWkF4c2Fwczd3ZVJiNVBrS3J0MVlGClRxa1lJSjY3eDFiNDR1N0NmdWdVbHhMM2JCQ1lqVXVXNnoxdGU3T2ZQUUhoM1FPU2lFZTczQ3I4dU1lSkplV0wKN2VKc1hWSG9uVzBMZWl0aDk5WmJTUTF3YlhieDVPZzNTQ3ZWYnkyZE90Y3Rud2Y2aDN5YlJ3SUNoc24xbk4zMwowRkMyOXlFY0ExQ2VFVzRsMVVHNmxoMGw5cEpiWEhRNlFJS1paempaTlgxZTRGRW5TdytGNGhXd3R1Z2JtKzZnCnVPdEE5QVJxYndJOTFLeEtoT204Q0RJQlRwWThSZG1SaElicWUrc3czT3p3dGk0eTVkU3FMREsrT3Y5b05ucngKQW9TN21TaXNQeDVJS3JwaFhMT3JvVmI2L1puSmNOK3ljaExuenptMDY2Zk5RaTBLNHhzaitvWkphaXVjZnBacAphSElHZGpaY1U3aE5FUzdJNVliVEFqUDdkaDRzdXJnMk1xTUtxbUxsa2ZPcGFoRTlMQTZVVFZRZHZLVFVGNWZwCkdYSnhaT1RKWlpiOGNQTFYxZFdXbnBMaEZNV2h2OUZQTCtDVGZQVUFvQmtmOTE3TzFLdkE3bGsvcTJzQ0F3RUEKQVFLQ0FnQU9WZ3k1dmlzdkFDWTN4ZkNCWEJVM0h6RmFzYVJnSVgvWmh0TkhGbUtGT3pyOW43dGtJWGtYNXU1SwpjNTNndFdJY0ZORTJibUlJUUk4aFBWVW8vM1NtNlk2ejFjTkwxdmJzaGZJcDlBZEtoR2ZOblpvYmszN3I2YlRoCjRRb3NKTVlGZFV1RUtIcWh4dGZKWUx0STNQTnkvb1hLQWJWWE16U3BYWmQzWW14cG01aUJEbEZCUXRhVGpldUUKK3BvZWhiZGE5b0JWcXo1ZCsycnA0bGRtZVpvYTE1YUNJVG5FbEc3R0puRHFtaVN3NUJkZ1FERVNyWmJZRVd5aQpRU0dDL1JUWXl2V1VJcWw5RXh5WnhobGRJaitCMkMyOFRzSXRHN0lpZzF2ajVaVlE0RHF3RmRzc1hiSmF0bkxvClNITlFBcXplT09xY2Mxb0p6N0dzNVRBYVZNZEtEQXZCZm1JMFBMcDNqNmVFOFFIYlduMHk2NzVYbnlqWllLUUcKaWx5R0pUNVRzMWZHWHlPSXBrNG4yQjM1V3dHcjIyTkxnYUd5cnZjRkgxN3JoZGVnaGlrZFJRd1FOcXRsZjBIZApMWDVRQWVwcUt3SE9uR1BGVy9XU2xGU0lEdkt1VFZSVGtvQmFSMTA3OFpiS2JXckZBbEdqYTFvbnNXQUh1YW5UClh5dFE4dWoxUEFFeWFMZUJEaUJxRVJ2am1VVFQ1ZktCOTdaVnRJenVBZ0lyWWZ6YjIyVEk2VFJ6OVZiQ2VyWG8KdTc0cnoxMjM2TXMrbmg5Y2xYd3VtQlBOU1d1eE9OdldOWEZ6VWdIOURzdlFRMWRsMFRJWEFQMGhFYkRHRkNBQwowUlg2M0lpcXFzUG1ZZUZNTGR5K2tVWjViNzI1TlhXWFRHbDRnQ1Y3NFVRU01ya0xrUUtDQVFFQStobXIwYjdnClVYcWRKaGtLRXVsa29IVzVuYzZ4QmhobCtuTkFucVFSTm5tQWpiaDlCeDVpLzQ2WUwxcHFYQUY5cTNIRlowSDIKZEJRZXN2Q0pxbmtSTHVwTi95VE1KSlo0ZE5kMHZqRzZ0UGhMUjZuRmRabHU0TFBRMXRKcU5XZkhZeCtwQ3N2SQo4Wkx3VG8rRGFxSjArZDk3WWF0b0dWNUZHOWtUSjhBYWFXb0Q1R1AyOGtOd0djKzI0b2VNYnJtU0ppQ2I2UlJoCjA5WWJaMGpXdkFHaXJyMzFOTW5nR0dtVmRPMThoOXVMUStLNzFUQWt1eFEzZEhpUzh6UVd6YythRnM1THgyUnIKeXppcEJhR3VySmFJQ05XNklFQm5ndFcvZEZaYXpMbjhQcDVrQlJzQ1NyN1JpQkNFSFZmeHBYVFNoS3cwVWp4NQo2a0gwc01YZnFoOFpMUUtDQVFFQXdkQ3BPUXBRa1RhK0t6Z0VrWGdMVnk2QmZJKzRWdC9BYjRtK2pFSm85aUIzCnN4dEtKNU5tNXltNldXcmFWS25zekxNZy85Mi9vSVZreUlNSklrOWNYdEpuaEU5ak1aVzc2ZjhYbW5CUnJIMnAKVHVmNWtYWWdVUHZLQ2g1U1g5Q2w0UHJENHNSb3cwNHJjbHVxSE1MT2g1MncxUmJPalRrb05tNXBHWlFoVkhxeApaUzh3aVk3bzhLNFZJQXZOVlZOdGlIZFNOY2Y0cDMxL0F6SU5aQjJWdlczeWJHTWNIdDByekQ5TkpZLzhTekc3CktEME5mRTgzeng2OWxHTlhUcURGSnBTV2ZNVlFwSGVCM0FTRTV1YVhVM1c5S3EwN2NDOEJWSHRaK3B5a1B0RTYKOHgrZE9NYWh6UElaMjRqbkIzZkVsaWc0Rk5zd01LZm9aeDdKYUJLRjl3S0NBUUVBdWJUTUgwOWpVenovYVdXWQpWRmlYVG9wN3pGRElvNlVFUEFiT1NiMjd4ajVNRlcrUzd2RkNRMDZIZEVubnhlK1pkKzlmeS85djE5dUV2QXZkCnZRWnVtdTZDQWQwNTlFVUNwb2ZCZU9TR0paQmtuWTdUUHpJeDRZbkRuVy9hUzFPRyt2UnNXY2JkcTNzWEVzNS8KbjNPSDltNWFPRGpGY0dqT1doSkNwZlovNWh4QlRacG9xSlVvclJIT1U4Q2dweXNGK1dlblBWZlVHQzdZWkVYeQpwT0YyQWRpdE5ZaGM3T09oaFpRK0xzYjNUdTRSMlFnSmpoeEIzU3NXdXAzSC9RU1UvekFwbHFIYlpLZnE0WEtmCnVDbUNVMFVZRXBDZ0M4ZFpoVElGOUJSNTE2bFd6Vyt6c1BxbHJTbk9YOWVJWi9vcHd6ZjNGY1V3SmFEWjUxVFcKY29UcTlRS0NBUUVBckhtVTdpYkl0Y0Zpa0RGa2wxT2R1L0t0MW54TFRqd0dFdndnYnM3MmV2ay9yRXEvdmVKRgpzN2NGbDJjb2JpbGRpbmhxQ0doOGpFdkkrVXJxeVBhWXUrVS9xNVcrTHpVUnFkV1JXcVZUZVUzR2FtcXpSQWc4CkQvVlJ3WmxrTXRJSm0rRnNpcFBBcXZVWVlzZEI1aUJTREl0Ky90SXg4NmtHcVJHdVE4MzNyeWNVVUhnakdIYnQKd3FrWU1aRnZJOXgvWCs3WFlQYll4Nnc5YUVtVmN4K0V6ck5XQmJCWktQb25iTFowWDlYM2JhOE8zMnNkWWg5WgpDZDlRVkFubmV4aEUrZVZHMmpmNVlMTGRCRCtkU2FHd3p0dTdBSXh5bFkydkFGQlpMVlZTTUhpZm5oWG5Jc3hZCjFub29HcDZGQWJkS1lWbmZObWdzUlZCVzE5V2s1QkYvMXdLQ0FRRUFqVnR1RXdYZzU5NERIaVN4UjlWbGRBaHYKcXF5dlpieVhPT2pnNHNKZjFLUlpxZkkzV28yL05IQWN0MlZlREE1bnlEM001YndHWEwrdVZGaUlMVk1ZMUp0WQp6MmlHWHgwZVdlbFJya2tRZHFncTI1TE9BQ2dxYTFMNW9tQS9tMGcwQWljWVdYa1FYSXpXRkhwb0ZqcU9KZHpTCnZ0MHhLV2lpWHUxVk5YeDJibFR1dXBCa1JUZUlQNTVxdWdyOUh0ZmY1MHc5MHhwTllaMFR3d0lDMG1neVVMMWEKRkdVdHlPUTlqVFBUUUdGM3h6REJCQ2U2MW5uZUV0TThRMEJ1MXh3Rm90aWFYSE9NaGhiMFBndVkzNHhiekNHYgpHcTlsWjVaN2lRVXByUWNNYjhrUzZ1WFk3VHBDTmUzaDBiTTM5dVlKeHNYNXUzcmVNRWsyZlBNT3dnTlFjdz09Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg=="
# valueFrom:
# secretKeyRef:
# name: server
# key: token
- name: ATTIC_SERVER_DATABASE_URL
value: "postgresql://app:mZP1BnmnpDU33B7UZvomYKOSS1laRJ4bvUR7jNDZ1AJqPdNxH2rLXykghczg7Bgy@attic-db-rw:5432/app"
# valueFrom:
# secretKeyRef:
# name: database
# key: url
volumeMounts:
- name: data
mountPath: /attic
- name: attic-config
mountPath: /config.toml
subPath: config.toml
volumes:
- name: server
secret:
secretName: server
- name: attic-config
configMap:
defaultMode: 420
name: attic-config
- name: data
persistentVolumeClaim:
claimName: attic
+28
View File
@@ -0,0 +1,28 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-production
haproxy.org/backend-protocol: h1
haproxy.org/timeout-server: 600s
labels:
app.kubernetes.io/component: attic
name: attic
namespace: attic
spec:
ingressClassName: haproxy
rules:
- host: attic.srv.oceanbox.io
http:
paths:
- backend:
service:
name: attic
port:
name: http
path: /
pathType: Prefix
tls:
- hosts:
- attic.srv.oceanbox.io
secretName: attic.srv.oceanbox.io-tls
@@ -0,0 +1,13 @@
apiVersion: cilium.io/v2
kind: CiliumNetworkPolicy
metadata:
name: allow-cache-nixos
namespace: ncps
spec:
egress:
- toFQDNs:
- matchPattern: 'cache.nixos.org'
- matchPattern: 'nix-community.cachix.org'
endpointSelector:
matchLabels:
app: nix-cache
+12
View File
@@ -0,0 +1,12 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: attic
labels:
app: attic
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 20Gi
+6
View File
@@ -0,0 +1,6 @@
apiVersion: v1
kind: Secret
metadata:
name: server
stringData:
token: "ref+sops://secrets.yml#attic/jwtToken"
@@ -1,14 +1,14 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: niks3 name: attic
labels: labels:
app: niks3 app: attic
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:
app: niks3 app: attic
ports: ports:
- name: http - name: http
port: 5751 port: 8080
targetPort: http targetPort: http
+1 -1
View File
@@ -1,3 +1,3 @@
catalyst: catalyst:
enabled: false enabled: true
autosync: false autosync: false
+1 -1
View File
@@ -38,4 +38,4 @@ volumeMounts:
readOnly: true readOnly: true
subPath: appsettings.json subPath: appsettings.json
image: image:
tag: a07f3de9-debug tag: 0042495a-debug
+3 -7
View File
@@ -1,8 +1,8 @@
{{- if .Values.clusterConfig.argo.enabled }} {{ if .Values.clusterConfig.argo.enabled }}
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: Application kind: Application
metadata: metadata:
name: {{ .Values.docs.env }}-docs name: docs
namespace: argocd namespace: argocd
annotations: annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
@@ -11,11 +11,7 @@ metadata:
- resources-finalizer.argocd.argoproj.io - resources-finalizer.argocd.argoproj.io
spec: spec:
destination: destination:
{{- if eq .Values.docs.env "prod" }}
namespace: docs namespace: docs
{{- else }}
namespace: {{ .Values.docs.env }}-docs
{{- end }}
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
project: default project: default
sources: sources:
@@ -28,7 +24,7 @@ spec:
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: {{ .Values.clusterConfig.cluster }} value: {{ .Values.clusterConfig.cluster }}
- name: HELMFILE_ENVIRONMENT - name: HELMFILE_ENVIRONMENT
value: {{ .Values.docs.env }} value: default
- name: HELMFILE_FILE_PATH - name: HELMFILE_FILE_PATH
value: docs.yaml.gotmpl value: docs.yaml.gotmpl
syncPolicy: syncPolicy:
-20
View File
@@ -1,20 +0,0 @@
fullnameOverride: staging-docs
image:
tag: "e19982e6-debug"
ingress:
enabled: true
className: "haproxy"
annotations:
cert-manager.io/cluster-issuer: letsencrypt-production
haproxy.org/backend-protocol: h1
haproxy.org/cors-enable: "true"
oceanbox.io/expose: internal
hosts:
- host: docs.oceanbox.io
paths:
- path: /
pathType: ImplementationSpecific
tls:
- hosts:
- docs.oceanbox.io
secretName: default-docs-tls
+19
View File
@@ -1,6 +1,25 @@
replicaCount: 1 replicaCount: 1
image:
tag: "5e339995-debug"
env: env:
- name: APP_VERSION - name: APP_VERSION
value: "0.0.0" value: "0.0.0"
- name: LOG_LEVEL - name: LOG_LEVEL
value: "1" value: "1"
ingress:
enabled: true
className: "haproxy"
annotations:
cert-manager.io/cluster-issuer: letsencrypt-production
haproxy.org/backend-protocol: h1
haproxy.org/cors-enable: "true"
oceanbox.io/expose: internal
hosts:
- host: docs.oceanbox.io
paths:
- path: /
pathType: ImplementationSpecific
tls:
- hosts:
- docs.oceanbox.io
secretName: docs-tls
+1 -1
View File
@@ -1,5 +1,5 @@
clusterConfig: clusterConfig:
manifests: https://git.oceanbox.io/platform/manifests.git manifests: https://gitlab.com/oceanbox/manifests.git
env: "" #[dev, test, staging, prod] env: "" #[dev, test, staging, prod]
initca: "" initca: ""
domain: ".local" domain: ".local"
+1 -1
View File
@@ -1,6 +1,6 @@
image: image:
repository: twinproduction/gatus repository: twinproduction/gatus
tag: v5.36.0 tag: v5.35.0
# Does envFrom secret named gatus # Does envFrom secret named gatus
secrets: true secrets: true
+9 -4
View File
@@ -8,13 +8,18 @@ spec:
resources: resources:
requests: requests:
cpu: 150m cpu: 150m
memory: 1Gi memory: 256Mi
limits: limits:
memory: 1Gi memory: 256Mi
args: args:
- --dbfilename=dump # Static filename prevents disk exhaustion - --dbfilename=dump # Static filename prevents disk exhaustion
- --maxmemory=920Mi # ~90% of the 1Gi limit, leaving headroom - --maxmemory=$(MAX_MEMORY)Mi # Graceful memory management (90% of limit)
- --cache_mode=true # evict near maxmemory instead of rejecting writes (graceful degradation)
- --proactor_threads=1 # Auto-detect CPU cores (optimal threading) - --proactor_threads=1 # Auto-detect CPU cores (optimal threading)
- --cluster_mode=emulated - --cluster_mode=emulated
- --logtostderr - --logtostderr
env:
- name: MAX_MEMORY
valueFrom:
resourceFieldRef:
resource: limits.memory
divisor: 1Mi
+2 -4
View File
@@ -3,11 +3,11 @@ replicaCount: 1
image: image:
registry: "docker.gitea.com" registry: "docker.gitea.com"
repository: gitea repository: gitea
tag: "1.26.2" tag: "1.26.1"
resources: resources:
requests: requests:
cpu: 500m cpu: 200m
memory: 512Mi memory: 512Mi
strategy: strategy:
@@ -82,8 +82,6 @@ gitea:
database: database:
DB_TYPE: postgres DB_TYPE: postgres
MAX_OPEN_CONNS: 90 MAX_OPEN_CONNS: 90
MAX_IDLE_CONNS: 20
CONN_MAX_LIFETIME: 3h
openid: openid:
ENABLE_OPENID_SIGNIN: false ENABLE_OPENID_SIGNIN: false
ENABLE_OPENID_SIGNUP: false ENABLE_OPENID_SIGNUP: false
+9 -15
View File
@@ -129,7 +129,6 @@ configMaps:
"group:dev": [], "group:dev": [],
"group:intern": [ "group:intern": [
"haavahak@stud.ntnu.no", "haavahak@stud.ntnu.no",
"haavahak@ntnu.no",
], ],
"group:ceph": [ "group:ceph": [
"jonas.juselius@oceanbox.io", "jonas.juselius@oceanbox.io",
@@ -272,14 +271,6 @@ configMaps:
{ "action": "accept", "src": [ "hanskristian.djuve@oceanbox.io" ], "dst": [ "hanskristian.djuve@oceanbox.io:*" ] }, { "action": "accept", "src": [ "hanskristian.djuve@oceanbox.io" ], "dst": [ "hanskristian.djuve@oceanbox.io:*" ] },
{ "action": "accept", "src": [ "erlend.mundal@oceanbox.io" ], "dst": [ "erlend.mundal@oceanbox.io:*" ] }, { "action": "accept", "src": [ "erlend.mundal@oceanbox.io" ], "dst": [ "erlend.mundal@oceanbox.io:*" ] },
// s/"\([^"]*\)"/{ "action": "accept", "src": [ "\1" ], "dst": [ "\1:*" ] }, // s/"\([^"]*\)"/{ "action": "accept", "src": [ "\1" ], "dst": [ "\1:*" ] },
],
"ssh": [
{
"action": "accept",
"src": [ "group:admin" ],
"dst": [ "autogroup:self", "tag:hpc", "tag:mumindalen", "tag:hel1" ],
"users": [ "autogroup:nonroot", "root" ]
}
] ]
} }
dns: dns:
@@ -311,13 +302,13 @@ configMaps:
{ "name": "cache.srv.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "cache.srv.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "makai.srv.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "makai.srv.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "makai.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "makai.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "docs.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "slurm.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "slurm.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "slurm-gateway.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "slurm-gateway.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "yolo-registry.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "yolo-registry.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "argocd.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "argocd.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "cache.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "prometheus.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "prometheus.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "alertmanager.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "alertmanager.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "grafana.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "grafana.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
@@ -330,7 +321,6 @@ configMaps:
{ "name": "git.oceanbox.io", "type": "A", "value": "10.0.1.3" }, { "name": "git.oceanbox.io", "type": "A", "value": "10.0.1.3" },
{ "name": "makai.oceanbox.io", "type": "A", "value": "10.0.1.3" }, { "name": "makai.oceanbox.io", "type": "A", "value": "10.0.1.3" },
{ "name": "docs.oceanbox.io", "type": "A", "value": "10.0.1.3" }, { "name": "docs.oceanbox.io", "type": "A", "value": "10.0.1.3" },
{ "name": "docs.dev.oceanbox.io", "type": "A", "value": "10.0.1.3" },
{ "name": "kueue.dev.tos.obx", "type": "A", "value": "10.255.241.99" }, { "name": "kueue.dev.tos.obx", "type": "A", "value": "10.255.241.99" },
{ "name": "slurm-agent.rossby.oceanbox.io", "type": "A", "value": "172.16.239.222" }, { "name": "slurm-agent.rossby.oceanbox.io", "type": "A", "value": "172.16.239.222" },
@@ -367,21 +357,25 @@ configMaps:
{ "name": "jonas-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "jonas-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "jonas-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "jonas-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "jonas-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "stig-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "stig-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "stig-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "stig-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "stig-sorcerer.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
{ "name": "stig-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "radovan-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "radovan-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "radovan-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "radovan-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "mrtz-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "mrtz-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "mrtz-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "mrtz-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "mrtz-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "mrtz-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "mrtz-sorcerer.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
{ "name": "mrtz-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "mrtz-diadash.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "mrtz-diadash.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "simkir-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "simkir-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "simkir-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "simkir-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "simkir-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "simkir-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "simkir-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "simkir-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "simkir-sorcerer.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
{ "name": "simkir-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "ole-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "ole-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "ole-maps.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" },
{ "name": "ole-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }, { "name": "ole-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
{ "name": "ole-codex.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" } { "name": "ole-plume.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" }
] ]
@@ -19,10 +19,6 @@ controller:
ssl-redirect: "true" ssl-redirect: "true"
forwarded-for: "true" forwarded-for: "true"
# NOTE: Emit HAProxy access logs (real client IP + request line)
# to the controller's stdout so `kubectl logs` can see them.
syslog-server: "address:stdout, format: raw, facility: daemon"
# Disable QUIC ar Hetzner LB doesn't support UDP # Disable QUIC ar Hetzner LB doesn't support UDP
quic-enabled: "false" quic-enabled: "false"
@@ -1,42 +1,3 @@
---
apiVersion: v1
kind: PersistentVolume
metadata:
name: pv-prod-queue-ceph-archives
spec:
accessModes:
- ReadWriteMany
capacity:
storage: 1Gi
csi:
driver: rook-ceph.cephfs.csi.ceph.com
nodeStageSecretRef:
name: rook-csi-cephfs-node
namespace: rook-ceph
volumeAttributes:
clusterID: rook-ceph
fsName: data
rootPath: /
staticVolume: "true"
volumeHandle: pv-prod-queue-ceph-archives
persistentVolumeReclaimPolicy: Retain
volumeMode: Filesystem
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: prod-queue-ceph-archives
namespace: prod-queue
spec:
accessModes:
- ReadWriteMany
resources:
requests:
storage: 1Gi
storageClassName: ""
volumeMode: Filesystem
volumeName: pv-prod-queue-ceph-archives
---
# Cross-namespace RBAC: allow sorcerer ServiceAccounts to manage JobSets in dev-queue # Cross-namespace RBAC: allow sorcerer ServiceAccounts to manage JobSets in dev-queue
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
+1 -1
View File
@@ -1,6 +1,6 @@
replicaCount: 1 replicaCount: 1
image: image:
tag: "5c518c62-debug" tag: "fd47bfc5-debug"
env: env:
- name: APP_VERSION - name: APP_VERSION
value: "0.0.0" value: "0.0.0"
-2
View File
@@ -1,2 +0,0 @@
niks3:
enabled: true
-73
View File
@@ -1,73 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: niks3
spec:
selector:
matchLabels:
app: niks3
strategy:
type: Recreate
template:
metadata:
labels:
app: niks3
spec:
containers:
- name: niks3
image: ghcr.io/mic92/niks3:v1.6.1
ports:
- name: http
containerPort: 5751
protocol: TCP
livenessProbe:
httpGet:
path: /
port: http
readinessProbe:
httpGet:
path: /
port: http
env:
- name: NIKS3_DB
valueFrom:
secretKeyRef:
name: niks3-db-app
key: uri
- name: NIKS3_API_TOKEN
valueFrom:
secretKeyRef:
name: server
key: api-token
- name: NIKS3_S3_ENDPOINT
value: "10.255.241.30:30080"
- name: NIKS3_S3_BUCKET
value: "niks3"
- name: NIKS3_S3_REGION
value: "default"
- name: NIKS3_S3_USE_SSL
value: "false"
- name: NIKS3_S3_ACCESS_KEY
valueFrom:
secretKeyRef:
name: server
key: s3-access-key
- name: NIKS3_S3_SECRET_KEY
valueFrom:
secretKeyRef:
name: server
key: s3-secret-key
- name: NIKS3_ENABLE_READ_PROXY
value: "true"
- name: NIKS3_CACHE_URL
value: "https://cache.ekman.oceanbox.io"
- name: NIKS3_SIGN_KEY_PATHS
value: "/secrets/sign-key"
volumeMounts:
- name: server
mountPath: /secrets
readOnly: true
volumes:
- name: server
secret:
secretName: server
-49
View File
@@ -1,49 +0,0 @@
apiVersion: batch/v1
kind: CronJob
metadata:
name: niks3-gc
namespace: niks3
labels:
app: niks3-gc
spec:
# Daily at 03:00. niks3 gc asks the server to drop closures older than
# --older-than and clean up stale failed uploads; the server performs the
# actual S3 deletions, so this job only needs to reach the in-cluster API.
schedule: "0 3 * * *"
concurrencyPolicy: Forbid
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 3
jobTemplate:
spec:
backoffLimit: 2
template:
metadata:
# NOT app: niks3 — that label is the Service selector and would route
# cache traffic to this job. Its egress is governed by allow-gc-egress.
labels:
app: niks3-gc
spec:
restartPolicy: Never
containers:
- name: gc
image: ghcr.io/mic92/niks3:v1.6.1
# Image entrypoint is /bin/niks3-server; override with the client.
command: ["/bin/niks3", "gc"]
args:
- --server-url=http://niks3:5751
- --auth-token-path=/secrets/api-token
- --older-than=720h
volumeMounts:
- name: server
mountPath: /secrets
readOnly: true
resources:
requests:
cpu: 10m
memory: 32Mi
limits:
memory: 128Mi
volumes:
- name: server
secret:
secretName: server
-28
View File
@@ -1,28 +0,0 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-production
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
oceanbox.io/expose: internal
labels:
app.kubernetes.io/component: niks3
name: niks3
namespace: niks3
spec:
ingressClassName: nginx
rules:
- host: cache.ekman.oceanbox.io
http:
paths:
- backend:
service:
name: niks3
port:
name: http
path: /
pathType: Prefix
tls:
- hosts:
- cache.ekman.oceanbox.io
secretName: cache.ekman.oceanbox.io-tls
-39
View File
@@ -1,39 +0,0 @@
{{- if .Values.clusterConfig.argo.enabled }}
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: niks3
namespace: argocd
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
destination:
namespace: niks3
server: https://kubernetes.default.svc
project: sys
sources:
- repoURL: {{ .Values.clusterConfig.manifests }}
targetRevision: HEAD
path: helmfile.d
plugin:
name: helmfile-cmp
env:
- name: CLUSTER_NAME
value: {{ .Values.clusterConfig.cluster }}
- name: HELMFILE_ENVIRONMENT
value: default
- name: HELMFILE_FILE_PATH
value: niks3.yaml.gotmpl
syncPolicy:
syncOptions:
- CreateNamespace=true
- ApplyOutOfSyncOnly=true
# - ServerSideApply=true
{{- if .Values.niks3.autosync }}
automated:
prune: true
# selfHeal: false
{{- end }}
{{- end }}
@@ -1,47 +0,0 @@
{{- if .Values.clusterConfig.cilium.enabled }}
apiVersion: cilium.io/v2
kind: CiliumNetworkPolicy
metadata:
name: allow-egress
namespace: niks3
spec:
# ekman has no cluster-wide allow-namespace-traffic baseline (unlike hel1/oceanbox),
# so once niks3 is selected by an egress rule it is default-deny for egress and every
# destination must be listed explicitly: RGW (S3), in-namespace PostgreSQL, and DNS.
description: niks3 egress to Ceph RGW (S3), in-namespace PostgreSQL, and kube-dns
endpointSelector:
matchLabels:
app: niks3
egress:
# Ceph RadosGW (S3 object storage backend) via NodePort
- toCIDR:
- 10.255.241.30/32
- 10.255.241.31/32
- 10.255.241.32/32
toPorts:
- ports:
- port: "30080"
protocol: TCP
# PostgreSQL (CNPG niks3-db cluster, same namespace)
- toEndpoints:
- matchLabels:
io.kubernetes.pod.namespace: niks3
toPorts:
- ports:
- port: "5432"
protocol: TCP
# DNS resolution
- toEndpoints:
- matchLabels:
io.kubernetes.pod.namespace: kube-system
k8s-app: kube-dns
toPorts:
- ports:
- port: "53"
protocol: UDP
- port: "53"
protocol: TCP
rules:
dns:
- matchPattern: "*"
{{- end }}
@@ -1,35 +0,0 @@
{{- if .Values.clusterConfig.cilium.enabled }}
apiVersion: cilium.io/v2
kind: CiliumNetworkPolicy
metadata:
name: allow-gc-egress
namespace: niks3
spec:
description: niks3-gc job egress to the in-namespace niks3 server and kube-dns
endpointSelector:
matchLabels:
app: niks3-gc
egress:
# niks3 server HTTP API (same namespace)
- toEndpoints:
- matchLabels:
io.kubernetes.pod.namespace: niks3
toPorts:
- ports:
- port: "5751"
protocol: TCP
# DNS resolution
- toEndpoints:
- matchLabels:
io.kubernetes.pod.namespace: kube-system
k8s-app: kube-dns
toPorts:
- ports:
- port: "53"
protocol: UDP
- port: "53"
protocol: TCP
rules:
dns:
- matchPattern: "*"
{{- end }}
@@ -167,7 +167,7 @@ grafana:
{{- if .Values.prometheus.grafana.persistence }} {{- if .Values.prometheus.grafana.persistence }}
persistence: persistence:
enabled: true enabled: true
size: 20Gi size: 10Gi
{{- end }} {{- end }}
ingress: ingress:
enabled: true enabled: true
@@ -233,7 +233,7 @@ grafana:
nodeGraph: nodeGraph:
enabled: true enabled: true
serviceMap: serviceMap:
datasourceUid: 'prometheus' datasourceUid: 'Prometheus'
tracesToLogs: tracesToLogs:
datasourceUid: loki datasourceUid: loki
filterByTraceID: false filterByTraceID: false
@@ -21,7 +21,7 @@
path: /spec/template/spec/containers/0/envFrom/- path: /spec/template/spec/containers/0/envFrom/-
value: value:
secretRef: secretRef:
name: beta-sorcerer-env name: prod-sorcerer-env
- op: add - op: add
path: /spec/template/spec/containers/0/envFrom/- path: /spec/template/spec/containers/0/envFrom/-
value: value:
@@ -2,7 +2,7 @@ replicaCount: 1
image: image:
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
tag: v2.10.0 tag: v2.6.6
podAnnotations: podAnnotations:
dapr.io/enabled: "true" dapr.io/enabled: "true"
@@ -19,7 +19,7 @@ podAnnotations:
env: env:
- name: APP_VERSION - name: APP_VERSION
value: "2.10.0-beta" value: "2.6.6-beta"
- name: LOG_LEVEL - name: LOG_LEVEL
value: "1" value: "1"
- name: REDIS_USER - name: REDIS_USER
+1 -1
View File
@@ -1,7 +1,7 @@
replicaCount: 1 replicaCount: 1
image: image:
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
tag: a07f3de9-debug tag: 0042495a-debug
podAnnotations: podAnnotations:
dapr.io/enabled: "true" dapr.io/enabled: "true"
dapr.io/app-id: "staging-sorcerer" dapr.io/app-id: "staging-sorcerer"
@@ -23,8 +23,8 @@ SELECT
* *
FROM FROM
crosstab( crosstab(
'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1, 2', 'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count_v2 ORDER BY 1, 2',
'SELECT DISTINCT sim_type FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1' 'SELECT DISTINCT sim_type FROM weekly_sim_submit_count_v2 ORDER BY 1'
) AS ct ( ) AS ct (
group_name text, group_name text,
lice bigint, lice bigint,
@@ -33,9 +33,3 @@ FROM
virus bigint, virus bigint,
watercontact bigint watercontact bigint
) )
WHERE
(lice + sedimentation + transport + virus + watercontact) <> 0
AND "group" <> '@oceanbox.io'
ORDER BY
(lice + sedimentation + transport + virus + watercontact) DESC
;
+7 -12
View File
@@ -9,11 +9,9 @@ WITH base AS (
WHERE WHERE
w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153' w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
AND w.event_type = 1 AND w.event_type = 1
-- NOTE: This is only available in grafana AND w.created_at BETWEEN '2025-10-13' AND '2025-10-19'
-- AND $__timeFilter(w.created_at)
AND w.created_at BETWEEN current_timestamp - '7 days'::interval and current_timestamp
AND s.distinct_id IS NOT NULL AND s.distinct_id IS NOT NULL
-- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ($groups) -- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ('@leroyseafood.com')
), ),
unique_totals AS ( unique_totals AS (
SELECT SELECT
@@ -30,12 +28,9 @@ unique_users AS (
GROUP BY "Group" GROUP BY "Group"
) )
SELECT SELECT
t."Group", SUM("Users in range")
t."Users in range" AS "Weekly users" FROM
FROM unique_totals t unique_totals
LEFT JOIN
unique_users u USING ("Group")
WHERE WHERE
t."Group" <> '@oceanbox.io' LOWER("Group") NOT IN ('@oceanbox.io')
ORDER BY ;
"Users in range" DESC;
-4
View File
@@ -14,10 +14,6 @@ WHERE
AND w.event_type = 1 AND w.event_type = 1
AND s.distinct_id IS NOT NULL AND s.distinct_id IS NOT NULL
AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') <> '@oceanbox.io' AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') <> '@oceanbox.io'
AND 2025 < EXTRACT(YEAR FROM w.created_at)
-- NOTE(simkir): We started with umami at this time, so the data that week was not complete
AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 37))
AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 1))
GROUP BY GROUP BY
week week
ORDER BY ORDER BY