Compare commits
213 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 256b7b9539 | |||
|
c7b3201573
|
|||
| 8d00b94329 | |||
| ac1116d2bc | |||
| 95b752eb80 | |||
|
9b04866e53
|
|||
|
1b4a34de92
|
|||
|
a90381545d
|
|||
| 65a31e835d | |||
| 30cc6d70dd | |||
|
85c81ec4c0
|
|||
|
ac99938a79
|
|||
|
d0aa57fa13
|
|||
|
2aed9ead11
|
|||
| 5df05acd46 | |||
| 4625fc0550 | |||
| 796d7e033a | |||
| 13800aa8a8 | |||
| 6228922b62 | |||
| 7a4d2f9f74 | |||
| ea0adc2295 | |||
| 0560d3a7f9 | |||
| 5a3a023d1e | |||
| 538549d949 | |||
| a7a29aadd7 | |||
| 7e5a98cc3e | |||
| d786f1bab8 | |||
| 3c35fbd0d4 | |||
| e55afeb707 | |||
| 14733e1742 | |||
| 9bd1ea9464 | |||
| fa5d18f97f | |||
| 026c8a7221 | |||
| 3a34bc0234 | |||
| 730e7181d5 | |||
| 2b72960e86 | |||
| e509b85cd9 | |||
|
9aa6b67b3f
|
|||
| f6a592a266 | |||
| acc87c79ff | |||
| a9374c5934 | |||
|
50f9f2d638
|
|||
| ce440ae3ea | |||
|
b103d37178
|
|||
|
dc0b889f3a
|
|||
| dd0cad06ca | |||
| 33236d642b | |||
| 53253af69f | |||
| 2eaa21e13c | |||
| 1febbd87c8 | |||
| faddbffd47 | |||
| 3468b8e58d | |||
| a80d43aa54 | |||
| 4a74a20c79 | |||
| 9c7e09c84a | |||
| dcde964e25 | |||
| 7182148418 | |||
| 7564c69aa7 | |||
| 72783901b7 | |||
| a34519f639 | |||
| b2444da71f | |||
| ea18a86299 | |||
| cea3993a00 | |||
| 2a5a5d0141 | |||
| aec98546a0 | |||
| ca5ab55995 | |||
| f3886de47d | |||
| 774bcd2d23 | |||
| a0e0c74c9c | |||
| ff851dfdb4 | |||
| af8e3d935c | |||
| 919b75ef9f | |||
| f2ed4b8921 | |||
| 701fed343a | |||
| 0365fb84bc | |||
| 069f257895 | |||
| 0e828a452f | |||
| 7971b2eaa0 | |||
| 7b7c606473 | |||
| c3a16d72cc | |||
| 7da86d0bb8 | |||
| 8cd2318259 | |||
| 6bb3bbfdff | |||
| 5e0cc2c25d | |||
| 1649745cad | |||
| e8a318d65f | |||
| 9c2497e3ec | |||
| 5df1cbfabc | |||
| 39f9b408d5 | |||
| b128ccc1ee | |||
| 5a963f7320 | |||
| 8392219980 | |||
| 1395e92744 | |||
| af87bc73cb | |||
|
89ad3fe9b8
|
|||
| 713f476f01 | |||
| 19a11f93c3 | |||
| ab24193a2c | |||
| 720836da5c | |||
| 754714f497 | |||
| 4a6b1d106b | |||
| 0e2ace7d40 | |||
| b2efdb889c | |||
| 8251e3da80 | |||
| 411ce7171e | |||
| 1cebd72992 | |||
|
d5c6013376
|
|||
|
ac3f6a58f2
|
|||
| 5810099689 | |||
|
1681c9843c
|
|||
| d511388401 | |||
|
695f43f5bf
|
|||
| 3980f61f44 | |||
| 102c6263a3 | |||
| 3e05a29191 | |||
| e76d33715f | |||
| 2959b0a03d | |||
| 9cc35893c9 | |||
| f2505960d7 | |||
| 65ea4cfe6c | |||
| f3f76d6f34 | |||
| e441293f47 | |||
| 886d5f266d | |||
| 5d86515bbd | |||
| 0350a29e61 | |||
| 23041a7cb1 | |||
| 574daf43be | |||
| adc5e75b07 | |||
| 79d9fded3b | |||
| 72652cde2e | |||
| c3e7968a45 | |||
| 2b7e2ce9a3 | |||
| 307e165af9 | |||
| b8366e0009 | |||
| b174b1d27d | |||
|
d146365fff
|
|||
| 64bfeee043 | |||
| 9ff1530bdf | |||
| 968e96c3a5 | |||
| d4699dbf9b | |||
| e52edaca66 | |||
| 7238bbd720 | |||
| 5620e05e94 | |||
| 75e76f6e37 | |||
| 8e20ff37da | |||
| cda142b3d1 | |||
| f0eb28a627 | |||
| 30f0b45618 | |||
| e480c57b74 | |||
| c09f883ca7 | |||
| fb06a92d75 | |||
| d94b0ec137 | |||
| 5646300ad7 | |||
| cd8d699c4c | |||
| 1529885797 | |||
| aecd8fd868 | |||
| 3562eb6ba2 | |||
| 6ea4a80bfe | |||
| d6096121e5 | |||
| fd934482e0 | |||
| 85deb2014b | |||
| ba51eda94f | |||
| 28def55aa6 | |||
| 3acdcbeed3 | |||
| 37eccee222 | |||
| 67772a7ce2 | |||
| 1861e7d3e6 | |||
| 366745a475 | |||
| 329ff86ff0 | |||
| cb3c75bfdb | |||
| c7bf676b76 | |||
| 4891080aa6 | |||
| 9c8c07809f | |||
| 06506b0ba9 | |||
| d51ab8d65e | |||
| af66872de7 | |||
| b6b71fc37d | |||
| 89a81a4ba0 | |||
| 8d1fc597bd | |||
| a44ebbcb19 | |||
| 0bb0173009 | |||
| a4e52b258e | |||
| cb671b92ce | |||
| 470ac2420f | |||
| 16273bb3c9 | |||
| e91ce2974f | |||
| 0528eb2009 | |||
| 54d2aec413 | |||
|
38fb1d778f
|
|||
| b99af34324 | |||
| 3b9d698660 | |||
| dc14e0b75b | |||
|
5aad5318e8
|
|||
| ce79c19ebd | |||
| 4aac07170a | |||
| b09e90304c | |||
| fe3dd36245 | |||
|
c77eae155f
|
|||
|
f975b70e59
|
|||
|
ba51468d97
|
|||
|
95bc09d93e
|
|||
|
c84da247c3
|
|||
|
3146b30696
|
|||
|
f5f877f6e0
|
|||
| 88ca10e3d4 | |||
| 2580a8915d | |||
| 78339c3f30 | |||
| 00970855f9 | |||
| 8796206315 | |||
| 1dd9ff51cf | |||
| 4b4dce1175 | |||
| d8fb77a2b6 | |||
| 8d6c8b62aa |
@@ -4,10 +4,10 @@ description: Atlantis map and simulation service
|
||||
type: application
|
||||
# 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.
|
||||
version: v2.6.6
|
||||
version: v2.11.0
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v2.6.6
|
||||
appVersion: v2.11.0
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
version: "0.1.0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: v2.6.6
|
||||
tag: v2.11.0
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
|
||||
@@ -13,9 +13,9 @@ type: application
|
||||
# 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.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: v2.6.6
|
||||
version: v2.11.0
|
||||
# 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
|
||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||
# It is recommended to use it with quotes.
|
||||
appVersion: "v2.6.6"
|
||||
appVersion: "v2.11.0"
|
||||
|
||||
@@ -10,7 +10,7 @@ image:
|
||||
# This sets the pull policy for images.
|
||||
pullPolicy: IfNotPresent
|
||||
# Overrides the image tag whose default is the chart appVersion.
|
||||
tag: v2.6.6
|
||||
tag: v2.11.0
|
||||
# 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:
|
||||
- name: gitlab-pull-secret
|
||||
|
||||
@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
|
||||
type: application
|
||||
# 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.
|
||||
version: v2.6.6
|
||||
version: v2.11.0
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v2.6.6
|
||||
appVersion: v2.11.0
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
version: "0.1.0"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||
tag: v2.6.6
|
||||
tag: v2.11.0
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: argocd
|
||||
namespace: argocd
|
||||
chart: argo/argo-cd
|
||||
version: 9.5.12
|
||||
version: 9.5.17
|
||||
condition: argo.enabled
|
||||
values:
|
||||
- ../values/argo/values/argocd.yaml.gotmpl
|
||||
@@ -27,7 +27,7 @@ releases:
|
||||
- name: argocd-apps
|
||||
namespace: argocd
|
||||
chart: argo/argocd-apps
|
||||
version: 2.0.4
|
||||
version: 2.0.5
|
||||
condition: argo.apps.enabled
|
||||
values:
|
||||
- ../values/argo/values/apps.yaml.gotmpl
|
||||
@@ -35,7 +35,7 @@ releases:
|
||||
- name: argo-rollouts
|
||||
namespace: argocd
|
||||
chart: argo/argo-rollouts
|
||||
version: 2.40.9
|
||||
version: 2.40.10
|
||||
condition: argo.rollouts.enabled
|
||||
values:
|
||||
- ../values/argo/values/rollouts.yaml.gotmpl
|
||||
@@ -43,7 +43,7 @@ releases:
|
||||
- name: argo-workflows
|
||||
namespace: argocd
|
||||
chart: argo/argo-workflows
|
||||
version: 1.0.13
|
||||
version: 1.0.14
|
||||
condition: argo.workflows.enabled
|
||||
missingFileHandler: Info
|
||||
- name: manifests
|
||||
|
||||
@@ -13,7 +13,7 @@ releases:
|
||||
- name: ingress-haproxy
|
||||
namespace: ingress-haproxy
|
||||
chart: haproxytech/kubernetes-ingress
|
||||
version: 1.42.0
|
||||
version: 1.49.0
|
||||
condition: haproxy.enabled
|
||||
values:
|
||||
- ../values/ingress-haproxy/values/ingress-haproxy.yaml.gotmpl
|
||||
|
||||
@@ -8,7 +8,7 @@ releases:
|
||||
- name: kueue
|
||||
namespace: kueue-system
|
||||
chart: oci://registry.k8s.io/kueue/charts/kueue
|
||||
version: 0.17.1
|
||||
version: 0.17.3
|
||||
condition: kueue.enabled
|
||||
values:
|
||||
- ../values/kueue/values/values.yaml
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: kyverno
|
||||
namespace: kyverno
|
||||
chart: kyverno/kyverno
|
||||
version: 3.8.0
|
||||
version: 3.8.1
|
||||
condition: kyverno.enabled
|
||||
values:
|
||||
- ../values/kyverno/values/kyverno.yaml.gotmpl
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
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
|
||||
@@ -16,7 +16,7 @@ releases:
|
||||
namespace: {{ .Environment.Name }}-openfga
|
||||
{{- end }}
|
||||
chart: openfga/openfga
|
||||
version: 0.3.3
|
||||
version: 0.3.5
|
||||
condition: openfga.enabled
|
||||
values:
|
||||
- ../values/openfga/values/values.yaml
|
||||
|
||||
@@ -12,7 +12,7 @@ releases:
|
||||
- name: opentelemetry-collector
|
||||
namespace: otel
|
||||
chart: open-telemetry/opentelemetry-collector
|
||||
version: 0.153.0
|
||||
version: 0.156.2
|
||||
condition: otel.enabled
|
||||
values:
|
||||
- ../values/opentelemetry-collector/values/values.yaml
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: postgres-operator
|
||||
namespace: cnpg
|
||||
chart: cloudnative-pg/cloudnative-pg
|
||||
version: 0.28.0
|
||||
version: 0.28.2
|
||||
condition: postgres_operator.enabled
|
||||
values:
|
||||
- ../values/postgres-operator/values/postgres-operator.yaml.gotmpl
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: prometheus
|
||||
namespace: prometheus
|
||||
chart: prometheus/kube-prometheus-stack
|
||||
version: 82.15.1
|
||||
version: 85.4.0
|
||||
condition: prometheus.enabled
|
||||
values:
|
||||
- ../values/prometheus/values/prometheus.yaml.gotmpl
|
||||
|
||||
@@ -14,7 +14,7 @@ releases:
|
||||
- name: umami
|
||||
namespace: analytics
|
||||
chart: umami/umami
|
||||
version: 7.9.1
|
||||
version: 7.9.4
|
||||
condition: umami.enabled
|
||||
values:
|
||||
- ../values/umami/values/values.yaml
|
||||
|
||||
@@ -3,7 +3,8 @@ bases:
|
||||
|
||||
repositories:
|
||||
- name: x509-exporter
|
||||
url: 'https://charts.enix.io'
|
||||
oci: true
|
||||
url: 'quay.io/enix/charts'
|
||||
|
||||
commonLabels:
|
||||
tier: sys
|
||||
@@ -12,7 +13,7 @@ releases:
|
||||
- name: x509-exporter
|
||||
namespace: x509-exporter
|
||||
chart: x509-exporter/x509-certificate-exporter
|
||||
version: 3.21.0
|
||||
version: 4.1.0
|
||||
condition: x509_exporter.enabled
|
||||
values:
|
||||
- ../values/x509-exporter/values/x509-exporter.yaml.gotmpl
|
||||
|
||||
@@ -102,6 +102,8 @@ spec:
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: catalyst
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: niks3
|
||||
server: https://kubernetes.default.svc
|
||||
sourceRepos:
|
||||
- https://argoproj.github.io/argo-helm
|
||||
- https://kubernetes-sigs.github.io/metrics-server/
|
||||
@@ -141,6 +143,7 @@ spec:
|
||||
- ghcr.io/spegel-org/helm-charts
|
||||
- quay.io/cilium/charts
|
||||
- quay.io/jetstack/charts
|
||||
- quay.io/enix/charts
|
||||
- registry.k8s.io/jobset/charts/jobset
|
||||
- ghcr.io/dragonflydb/dragonfly-operator/helm/dragonfly-operator
|
||||
- docker.gitea.com
|
||||
|
||||
@@ -3,7 +3,8 @@ kind: ConfigMap
|
||||
metadata:
|
||||
name: beta-atlantis-actor-config
|
||||
data:
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
|
||||
KUEUE_NAMESPACE: "prod-queue"
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.14"
|
||||
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.14"
|
||||
PLUME_QUEUE: "prod-queue"
|
||||
|
||||
@@ -3,6 +3,7 @@ kind: ConfigMap
|
||||
metadata:
|
||||
name: prod-atlantis-actor-config
|
||||
data:
|
||||
KUEUE_NAMESPACE: "prod-queue"
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
|
||||
XTRACT_QUEUE: "prod-queue"
|
||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
|
||||
|
||||
@@ -3,7 +3,7 @@ kind: ConfigMap
|
||||
metadata:
|
||||
name: staging-atlantis-actor-config
|
||||
data:
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.12"
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.4.0"
|
||||
XTRACT_QUEUE: "dev-queue"
|
||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.12"
|
||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.4.0"
|
||||
PLUME_QUEUE: "dev-queue"
|
||||
|
||||
@@ -2,7 +2,7 @@ replicaCount: 1
|
||||
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: v2.6.6
|
||||
tag: v2.10.0
|
||||
|
||||
podAnnotations:
|
||||
dapr.io/app-id: "beta-atlantis"
|
||||
@@ -11,7 +11,7 @@ env:
|
||||
- name: APP_NAMESPACE
|
||||
value: beta-atlantis
|
||||
- name: APP_VERSION
|
||||
value: "2.6.6-beta"
|
||||
value: "2.10.0-beta"
|
||||
- name: LOG_LEVEL
|
||||
value: "1"
|
||||
- name: ANALYTICS_WEB_ID
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: 0042495a-debug
|
||||
tag: acc3745a-debug
|
||||
podAnnotations:
|
||||
dapr.io/app-id: "staging-atlantis"
|
||||
env:
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
attic:
|
||||
enabled: false
|
||||
@@ -1,27 +0,0 @@
|
||||
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,167 +0,0 @@
|
||||
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=="
|
||||
@@ -1,63 +0,0 @@
|
||||
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
|
||||
@@ -1,28 +0,0 @@
|
||||
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
|
||||
@@ -1,13 +0,0 @@
|
||||
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
|
||||
@@ -1,12 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: attic
|
||||
labels:
|
||||
app: attic
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 20Gi
|
||||
@@ -1,6 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: server
|
||||
stringData:
|
||||
token: "ref+sops://secrets.yml#attic/jwtToken"
|
||||
@@ -1,3 +1,3 @@
|
||||
catalyst:
|
||||
enabled: true
|
||||
enabled: false
|
||||
autosync: false
|
||||
|
||||
@@ -38,4 +38,4 @@ volumeMounts:
|
||||
readOnly: true
|
||||
subPath: appsettings.json
|
||||
image:
|
||||
tag: 0042495a-debug
|
||||
tag: acc3745a-debug
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
tag: "5e339995-debug"
|
||||
tag: "cdfdc59d-debug"
|
||||
env:
|
||||
- name: APP_VERSION
|
||||
value: "0.0.0"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
image:
|
||||
repository: twinproduction/gatus
|
||||
tag: v5.35.0
|
||||
tag: v5.36.0
|
||||
|
||||
# Does envFrom secret named gatus
|
||||
secrets: true
|
||||
|
||||
@@ -8,18 +8,13 @@ spec:
|
||||
resources:
|
||||
requests:
|
||||
cpu: 150m
|
||||
memory: 256Mi
|
||||
memory: 1Gi
|
||||
limits:
|
||||
memory: 256Mi
|
||||
memory: 1Gi
|
||||
args:
|
||||
- --dbfilename=dump # Static filename prevents disk exhaustion
|
||||
- --maxmemory=$(MAX_MEMORY)Mi # Graceful memory management (90% of limit)
|
||||
- --dbfilename=dump # Static filename prevents disk exhaustion
|
||||
- --maxmemory=920Mi # ~90% of the 1Gi limit, leaving headroom
|
||||
- --cache_mode=true # evict near maxmemory instead of rejecting writes (graceful degradation)
|
||||
- --proactor_threads=1 # Auto-detect CPU cores (optimal threading)
|
||||
- --cluster_mode=emulated
|
||||
- --logtostderr
|
||||
env:
|
||||
- name: MAX_MEMORY
|
||||
valueFrom:
|
||||
resourceFieldRef:
|
||||
resource: limits.memory
|
||||
divisor: 1Mi
|
||||
|
||||
@@ -3,11 +3,11 @@ replicaCount: 1
|
||||
image:
|
||||
registry: "docker.gitea.com"
|
||||
repository: gitea
|
||||
tag: "1.26.1"
|
||||
tag: "1.26.2"
|
||||
|
||||
resources:
|
||||
requests:
|
||||
cpu: 200m
|
||||
cpu: 500m
|
||||
memory: 512Mi
|
||||
|
||||
strategy:
|
||||
@@ -82,6 +82,8 @@ gitea:
|
||||
database:
|
||||
DB_TYPE: postgres
|
||||
MAX_OPEN_CONNS: 90
|
||||
MAX_IDLE_CONNS: 20
|
||||
CONN_MAX_LIFETIME: 3h
|
||||
openid:
|
||||
ENABLE_OPENID_SIGNIN: false
|
||||
ENABLE_OPENID_SIGNUP: false
|
||||
|
||||
@@ -129,6 +129,7 @@ configMaps:
|
||||
"group:dev": [],
|
||||
"group:intern": [
|
||||
"haavahak@stud.ntnu.no",
|
||||
"haavahak@ntnu.no",
|
||||
],
|
||||
"group:ceph": [
|
||||
"jonas.juselius@oceanbox.io",
|
||||
@@ -309,6 +310,7 @@ configMaps:
|
||||
{ "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": "cache.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": "grafana.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
|
||||
|
||||
@@ -19,6 +19,10 @@ controller:
|
||||
ssl-redirect: "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
|
||||
quic-enabled: "false"
|
||||
|
||||
|
||||
@@ -1,3 +1,42 @@
|
||||
---
|
||||
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
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
tag: "fd47bfc5-debug"
|
||||
tag: "e49d3f4f-debug"
|
||||
env:
|
||||
- name: APP_VERSION
|
||||
value: "0.0.0"
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
niks3:
|
||||
enabled: true
|
||||
@@ -1,3 +1,3 @@
|
||||
attic:
|
||||
niks3:
|
||||
enabled: false
|
||||
autosync: false
|
||||
@@ -1,10 +1,10 @@
|
||||
apiVersion: postgresql.cnpg.io/v1
|
||||
kind: Cluster
|
||||
metadata:
|
||||
name: attic-db
|
||||
namespace: attic
|
||||
name: niks3-db
|
||||
namespace: niks3
|
||||
labels:
|
||||
app: attic-db
|
||||
app: niks3-db
|
||||
spec:
|
||||
instances: 1
|
||||
primaryUpdateStrategy: unsupervised
|
||||
@@ -0,0 +1,73 @@
|
||||
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
|
||||
@@ -0,0 +1,49 @@
|
||||
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
|
||||
@@ -0,0 +1,28 @@
|
||||
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
|
||||
@@ -0,0 +1,39 @@
|
||||
{{- 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 }}
|
||||
@@ -0,0 +1,47 @@
|
||||
{{- 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 }}
|
||||
@@ -0,0 +1,35 @@
|
||||
{{- 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 }}
|
||||
@@ -1,14 +1,14 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: attic
|
||||
name: niks3
|
||||
labels:
|
||||
app: attic
|
||||
app: niks3
|
||||
spec:
|
||||
type: ClusterIP
|
||||
selector:
|
||||
app: attic
|
||||
app: niks3
|
||||
ports:
|
||||
- name: http
|
||||
port: 8080
|
||||
port: 5751
|
||||
targetPort: http
|
||||
@@ -21,7 +21,7 @@
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
secretRef:
|
||||
name: prod-sorcerer-env
|
||||
name: beta-sorcerer-env
|
||||
- op: add
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
|
||||
@@ -2,7 +2,7 @@ replicaCount: 1
|
||||
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||
tag: v2.6.6
|
||||
tag: v2.10.0
|
||||
|
||||
podAnnotations:
|
||||
dapr.io/enabled: "true"
|
||||
@@ -19,7 +19,7 @@ podAnnotations:
|
||||
|
||||
env:
|
||||
- name: APP_VERSION
|
||||
value: "2.6.6-beta"
|
||||
value: "2.10.0-beta"
|
||||
- name: LOG_LEVEL
|
||||
value: "1"
|
||||
- name: REDIS_USER
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||
tag: 0042495a-debug
|
||||
tag: 5db33158-debug
|
||||
podAnnotations:
|
||||
dapr.io/enabled: "true"
|
||||
dapr.io/app-id: "staging-sorcerer"
|
||||
|
||||
@@ -23,8 +23,8 @@ SELECT
|
||||
*
|
||||
FROM
|
||||
crosstab(
|
||||
'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_v2 ORDER BY 1'
|
||||
'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 DISTINCT sim_type FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1'
|
||||
) AS ct (
|
||||
group_name text,
|
||||
lice bigint,
|
||||
@@ -33,3 +33,9 @@ FROM
|
||||
virus bigint,
|
||||
watercontact bigint
|
||||
)
|
||||
WHERE
|
||||
(lice + sedimentation + transport + virus + watercontact) <> 0
|
||||
AND "group" <> '@oceanbox.io'
|
||||
ORDER BY
|
||||
(lice + sedimentation + transport + virus + watercontact) DESC
|
||||
;
|
||||
|
||||
@@ -9,9 +9,11 @@ WITH base AS (
|
||||
WHERE
|
||||
w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
|
||||
AND w.event_type = 1
|
||||
AND w.created_at BETWEEN '2025-10-13' AND '2025-10-19'
|
||||
-- NOTE: This is only available in grafana
|
||||
-- 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 substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ('@leroyseafood.com')
|
||||
-- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ($groups)
|
||||
),
|
||||
unique_totals AS (
|
||||
SELECT
|
||||
@@ -28,9 +30,12 @@ unique_users AS (
|
||||
GROUP BY "Group"
|
||||
)
|
||||
SELECT
|
||||
SUM("Users in range")
|
||||
FROM
|
||||
unique_totals
|
||||
t."Group",
|
||||
t."Users in range" AS "Weekly users"
|
||||
FROM unique_totals t
|
||||
LEFT JOIN
|
||||
unique_users u USING ("Group")
|
||||
WHERE
|
||||
LOWER("Group") NOT IN ('@oceanbox.io')
|
||||
;
|
||||
t."Group" <> '@oceanbox.io'
|
||||
ORDER BY
|
||||
"Users in range" DESC;
|
||||
|
||||
@@ -14,6 +14,10 @@ WHERE
|
||||
AND w.event_type = 1
|
||||
AND s.distinct_id IS NOT NULL
|
||||
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
|
||||
week
|
||||
ORDER BY
|
||||
|
||||
Reference in New Issue
Block a user