From d1c293bfd1607d5f8f6755d11632e225e33a9fb4 Mon Sep 17 00:00:00 2001 From: Automated pipeline Date: Mon, 2 Jun 2025 13:14:59 +0000 Subject: [PATCH] Initial upload --- .../stacks/core/forgejo/values.yaml | 4 ++-- .../stacks/core/vector/values.yaml | 6 +++++- .../observability/victoria-k8s-stack.yaml | 2 +- .../victoria-k8s-stack/manifests/vmauth.yaml | 16 ++++++---------- .../victoria-k8s-stack/values.yaml | 19 ++++--------------- .../stacks/otc/ingress-nginx/values.yaml | 4 ++-- 6 files changed, 20 insertions(+), 31 deletions(-) diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml index 6019bf1..206b2ca 100644 --- a/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml +++ b/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml @@ -53,12 +53,12 @@ gitea: valueFrom: secretKeyRef: name: postgres-forgejo-cloud-credentials - key: name + key: database - name: FORGEJO__database__USER valueFrom: secretKeyRef: name: postgres-forgejo-cloud-credentials - key: user + key: username - name: FORGEJO__database__PASSWD valueFrom: secretKeyRef: diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/core/vector/values.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/core/vector/values.yaml index 7638071..6d98171 100644 --- a/otc/central-forgejo.think-ahead.cloud/stacks/core/vector/values.yaml +++ b/otc/central-forgejo.think-ahead.cloud/stacks/core/vector/values.yaml @@ -39,7 +39,11 @@ customConfig: type: elasticsearch inputs: [parser] endpoints: - - http://vlogs-victorialogs:9428/insert/elasticsearch/ + - https://o12y.observability.think-ahead.cloud/insert/elasticsearch/ + auth: + strategy: basic + user: simple-user + password: simple-password mode: bulk api_version: v8 compression: gzip diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack.yaml index dc8d1ce..58dc9ad 100644 --- a/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack.yaml +++ b/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack.yaml @@ -19,7 +19,7 @@ spec: - chart: victoria-metrics-k8s-stack repoURL: https://victoriametrics.github.io/helm-charts/ targetRevision: 0.48.1 - releaseName: victoria + releaseName: vm helm: valueFiles: - $values/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml index 0298c52..c7644b3 100644 --- a/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml +++ b/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml @@ -7,13 +7,9 @@ spec: username: simple-user password: simple-password targetRefs: - - crd: - kind: VMSingle - name: victoria-k8s-stack-victoria-metrics-k8s-stack - namespace: observability - paths: ["/.*"] - - crd: - kind: VLogs - name: victorialogs - namespace: observability - paths: ["/.*"] + - static: + url: http://vmsingle-victoria-k8s-stack-victoria-metrics-k8s-stack:8429 + paths: ["/api/v1/write/.*"] + - static: + url: http://vlogs-victorialogs:9428 + paths: ["/insert/elasticsearch/.*"] diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml index 3804128..dfdf0d9 100644 --- a/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml +++ b/otc/central-forgejo.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml @@ -763,23 +763,12 @@ vmauth: annotations: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: main - host: o12y.penguin-observability.think-ahead.cloud + host: o12y.central-forgejo.think-ahead.cloud tlsHosts: - - o12y.penguin-observability.think-ahead.cloud + - o12y.central-forgejo.think-ahead.cloud tlsSecretName: vmauth-tls-secret - unauthorizedUserAccessSpec: - # -- Flag, that allows to disable default VMAuth unauthorized user access config - disabled: false - discover_backend_ips: true - url_map: - - src_paths: - - '/insert/elasticsearch/.*' - url_prefix: - - 'http://vlogs-victorialogs:9428' - - src_paths: - - '/api/v1/write/.*' - url_prefix: - - 'http://vmsingle-victoria-k8s-stack-victoria-metrics-k8s-stack:8428' + unauthorizedUserAccessSpec: {} + selectAllByDefault: true vmagent: # -- Create VMAgent CR diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/otc/ingress-nginx/values.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/otc/ingress-nginx/values.yaml index 26bc38a..9c6609d 100644 --- a/otc/central-forgejo.think-ahead.cloud/stacks/otc/ingress-nginx/values.yaml +++ b/otc/central-forgejo.think-ahead.cloud/stacks/otc/ingress-nginx/values.yaml @@ -8,8 +8,8 @@ controller: annotations: kubernetes.io/elb.class: union kubernetes.io/elb.port: '80' - kubernetes.io/elb.id: 0aaa2418-382c-4849-95b6-a27e70d00856 - kubernetes.io/elb.ip: 80.158.52.151 + kubernetes.io/elb.id: b7536852-5cd7-4c77-a708-fad6411252ce + kubernetes.io/elb.ip: 80.158.60.18 ingressClassResource: name: nginx