diff --git a/otc/dev.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml b/otc/dev.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml index 4cf0126..87a993b 100644 --- a/otc/dev.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml +++ b/otc/dev.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml @@ -65,7 +65,7 @@ metadata: namespace: gitea annotations: everest.io/disk-volume-type: GPSSD - everest.io/crypt-key-id: 504da534-e5dc-4886-b20d-87ba595e56da + everest.io/crypt-key-id: ff425543-74a9-4cda-885e-6020ceb8d74e spec: storageClassName: csi-disk accessModes: diff --git a/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml b/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml index f515f6c..6b329a5 100644 --- a/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml +++ b/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml @@ -19,7 +19,7 @@ persistence: size: 200Gi storageClass: csi-disk annotations: - everest.io/crypt-key-id: 504da534-e5dc-4886-b20d-87ba595e56da + everest.io/crypt-key-id: ff425543-74a9-4cda-885e-6020ceb8d74e everest.io/disk-volume-type: GPSSD test: @@ -166,7 +166,7 @@ service: nodePort: 32222 externalTrafficPolicy: Cluster annotations: - kubernetes.io/elb.id: 36251ad1-0277-43d5-8b41-6099a789a648 + kubernetes.io/elb.id: 682b203e-40b4-460d-ada5-35d1923f3fcd image: pullPolicy: "IfNotPresent" diff --git a/otc/dev.t09.de/stacks/garm/optimiser-receiver.yaml b/otc/dev.t09.de/stacks/garm/optimiser-receiver.yaml new file mode 100644 index 0000000..b7c259e --- /dev/null +++ b/otc/dev.t09.de/stacks/garm/optimiser-receiver.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: optimiser-receiver + namespace: argocd + labels: + env: dev + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + syncPolicy: + automated: + selfHeal: true + syncOptions: + - CreateNamespace=true + retry: + limit: -1 + destination: + name: in-cluster + namespace: garm + source: + repoURL: https://edp.buildth.ing/DevFW-CICD/stacks-instances + targetRevision: HEAD + path: "otc/dev.t09.de/stacks/garm/optimiser-receiver" diff --git a/otc/dev.t09.de/stacks/garm/optimiser-receiver/deployment.yaml b/otc/dev.t09.de/stacks/garm/optimiser-receiver/deployment.yaml new file mode 100644 index 0000000..f7e366b --- /dev/null +++ b/otc/dev.t09.de/stacks/garm/optimiser-receiver/deployment.yaml @@ -0,0 +1,93 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: optimiser-receiver + labels: + app: optimiser-receiver +spec: + replicas: 1 + selector: + matchLabels: + app: optimiser-receiver + template: + metadata: + labels: + app: optimiser-receiver + spec: + containers: + - name: receiver + image: edp.buildth.ing/devfw-cicd/forgejo-runner-optimiser-receiver:0.0.3 + args: + - --db=/data/metrics.db + ports: + - name: http + containerPort: 8080 + protocol: TCP + env: + - name: RECEIVER_READ_TOKEN + valueFrom: + secretKeyRef: + name: optimiser-tokens + key: read-token + - name: RECEIVER_HMAC_KEY + valueFrom: + secretKeyRef: + name: optimiser-tokens + key: hmac-key + volumeMounts: + - name: data + mountPath: /data + livenessProbe: + httpGet: + path: /health + port: http + initialDelaySeconds: 5 + periodSeconds: 30 + readinessProbe: + httpGet: + path: /health + port: http + initialDelaySeconds: 2 + periodSeconds: 10 + resources: + requests: + cpu: 50m + memory: 64Mi + limits: + cpu: 200m + memory: 128Mi + volumes: + - name: data + persistentVolumeClaim: + claimName: optimiser-receiver-data +--- +apiVersion: v1 +kind: Service +metadata: + name: optimiser-receiver + labels: + app: optimiser-receiver +spec: + selector: + app: optimiser-receiver + ports: + - name: http + port: 8080 + targetPort: http + protocol: TCP +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: optimiser-receiver-data + labels: + app: optimiser-receiver + annotations: + everest.io/disk-volume-type: GPSSD +spec: + storageClassName: csi-disk + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi diff --git a/otc/dev.t09.de/stacks/garm/optimiser-receiver/ingress.yaml b/otc/dev.t09.de/stacks/garm/optimiser-receiver/ingress.yaml new file mode 100644 index 0000000..c00666e --- /dev/null +++ b/otc/dev.t09.de/stacks/garm/optimiser-receiver/ingress.yaml @@ -0,0 +1,26 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + cert-manager.io/cluster-issuer: main + + name: optimiser-receiver + namespace: garm +spec: + ingressClassName: nginx + rules: + - host: optimiser.dev.t09.de + http: + paths: + - backend: + service: + name: optimiser-receiver + port: + number: 8080 + path: / + pathType: Prefix + tls: + - hosts: + - optimiser.dev.t09.de + secretName: optimiser-receiver-tls diff --git a/otc/dev.t09.de/stacks/observability-client/vector/values.yaml b/otc/dev.t09.de/stacks/observability-client/vector/values.yaml index 0012c76..c0644cf 100644 --- a/otc/dev.t09.de/stacks/observability-client/vector/values.yaml +++ b/otc/dev.t09.de/stacks/observability-client/vector/values.yaml @@ -48,7 +48,7 @@ customConfig: type: elasticsearch inputs: [parser] endpoints: - - https://o12y.observability.t09.de/insert/elasticsearch/ + - https://o12y.observability./insert/elasticsearch/ auth: strategy: basic user: ${VECTOR_USER} diff --git a/otc/dev.t09.de/stacks/observability-client/vm-client-stack/values.yaml b/otc/dev.t09.de/stacks/observability-client/vm-client-stack/values.yaml index 1e67d6e..f85a786 100644 --- a/otc/dev.t09.de/stacks/observability-client/vm-client-stack/values.yaml +++ b/otc/dev.t09.de/stacks/observability-client/vm-client-stack/values.yaml @@ -778,7 +778,7 @@ vmagent: # -- Remote write configuration of VMAgent, allowed parameters defined in a [spec](https://docs.victoriametrics.com/operator/api#vmagentremotewritespec) additionalRemoteWrites: # [] - - url: https://o12y.observability.t09.de/api/v1/write + - url: https://o12y.observability./api/v1/write basicAuth: username: name: simple-user-secret diff --git a/otc/dev.t09.de/stacks/observability/grafana-operator/manifests/grafana.yaml b/otc/dev.t09.de/stacks/observability/grafana-operator/manifests/grafana.yaml index f0142b9..9f1078f 100644 --- a/otc/dev.t09.de/stacks/observability/grafana-operator/manifests/grafana.yaml +++ b/otc/dev.t09.de/stacks/observability/grafana-operator/manifests/grafana.yaml @@ -9,7 +9,7 @@ spec: metadata: annotations: everest.io/disk-volume-type: GPSSD - everest.io/crypt-key-id: 504da534-e5dc-4886-b20d-87ba595e56da + everest.io/crypt-key-id: ff425543-74a9-4cda-885e-6020ceb8d74e spec: storageClassName: csi-disk accessModes: diff --git a/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml b/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml index 8b05c69..844253c 100644 --- a/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml +++ b/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml @@ -8,7 +8,7 @@ spec: removePvcAfterDelete: true storageMetadata: annotations: - everest.io/crypt-key-id: 504da534-e5dc-4886-b20d-87ba595e56da + everest.io/crypt-key-id: ff425543-74a9-4cda-885e-6020ceb8d74e everest.io/disk-volume-type: GPSSD storage: storageClassName: csi-disk diff --git a/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/values.yaml b/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/values.yaml index 64e3b8e..03297b5 100644 --- a/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/values.yaml +++ b/otc/dev.t09.de/stacks/observability/victoria-k8s-stack/values.yaml @@ -288,7 +288,7 @@ vmsingle: extraArgs: {} storageMetadata: annotations: - everest.io/crypt-key-id: 504da534-e5dc-4886-b20d-87ba595e56da + everest.io/crypt-key-id: ff425543-74a9-4cda-885e-6020ceb8d74e everest.io/disk-volume-type: GPSSD storage: storageClassName: csi-disk @@ -690,9 +690,9 @@ vmauth: annotations: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: main - host: o12y.observability.t09.de + host: o12y.observability. tlsHosts: - - o12y.observability.t09.de + - o12y.observability. tlsSecretName: vmauth-tls-secret unauthorizedUserAccessSpec: {} selectAllByDefault: true diff --git a/otc/dev.t09.de/stacks/otc/ingress-nginx/values.yaml b/otc/dev.t09.de/stacks/otc/ingress-nginx/values.yaml index ba7b04f..201a3bb 100644 --- a/otc/dev.t09.de/stacks/otc/ingress-nginx/values.yaml +++ b/otc/dev.t09.de/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: 36251ad1-0277-43d5-8b41-6099a789a648 - kubernetes.io/elb.ip: 164.30.7.223 + kubernetes.io/elb.id: 682b203e-40b4-460d-ada5-35d1923f3fcd + kubernetes.io/elb.ip: 80.158.57.225 ingressClassResource: name: nginx