feat(observability): encrypt persistent data

Refs: DevFW/infra-deploy#36

README.md

@@ -1,6 +1,6 @@
 # edpbuilder stacks
 
-This repository contains the building blocks to instanciate Internal Developer Platform's.
+This repository contains the building blocks to instantiate Internal Developer Platforms.
 
 ### Install edpbuilder
 

template/registry/forgejo.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: monitoring
+  name: forgejo
   namespace: argocd
   labels:
     env: dev
@@ -12,7 +12,7 @@ spec:
     name: in-cluster
     namespace: argocd
   source:
-    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/monitoring"
+    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo"
     repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
     targetRevision: HEAD
   project: default

template/registry/observability-client.yaml

@@ -1,25 +1,24 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: grafana-dashboards
+  name: observability-client
   namespace: argocd
   labels:
     env: dev
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-  project: default
-  source:
-    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
-    targetRevision: HEAD
-    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/monitoring/kube-prometheus/dashboards"
   destination:
-    server: "https://kubernetes.default.svc"
+    name: in-cluster
-    namespace: monitoring
+    namespace: argocd
+  source:
+    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability-client"
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
+    targetRevision: HEAD
+  project: default
   syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
     syncOptions:
       - CreateNamespace=true
-    automated:
-      selfHeal: true
-    retry:
-      limit: -1

template/registry/observability.yaml

@@ -1,22 +1,24 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: ingress-apps
+  name: observability
   namespace: argocd
   labels:
-    example: ref-implementation
+    env: dev
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
-    server: "https://kubernetes.default.svc"
+    name: in-cluster
+    namespace: argocd
   source:
-    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability"
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
     targetRevision: HEAD
-    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/ingress-apps"
   project: default
   syncPolicy:
     automated:
+      prune: true
       selfHeal: true
     syncOptions:
       - CreateNamespace=true

template/stacks/core/argocd.yaml

@@ -12,6 +12,8 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+    retry:
+      limit: -1
   destination:
     name: in-cluster
     namespace: argocd
@@ -30,4 +32,4 @@ spec:
       ref: values
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
-      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/argocd/manifests"
+      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/argocd/manifests"

template/stacks/core/argocd/manifests/argocd-forgejo-access-token.yaml

@@ -1,29 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: forgejo-access-token
-  namespace: argocd 
-spec:
-  secretStoreRef:
-    name: gitea
-    kind: ClusterSecretStore
-  refreshInterval: "0"
-  target:
-    name: forgejo-access-token
-    template:
-      engineVersion: v2
-      data:
-        forgejo_username: "{{.FORGEJO_ACCESS_USERNAME}}"
-        forgejo_token: "{{.FORGEJO_ACCESS_TOKEN}}"
-      metadata:
-        labels:
-          app.kubernetes.io/part-of: argocd
-  data:
-    - secretKey: FORGEJO_ACCESS_USERNAME
-      remoteRef:
-        key: forgejo-access-token
-        property: username
-    - secretKey: FORGEJO_ACCESS_TOKEN
-      remoteRef:
-        key: forgejo-access-token
-        property: token

template/stacks/core/argocd/manifests/argocd-secret.yaml

@@ -1,24 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: auth-generic-oauth-secret
-  namespace: argocd 
-spec:
-  secretStoreRef:
-    name: keycloak
-    kind: ClusterSecretStore
-  refreshInterval: "0"
-  target:
-    name: auth-generic-oauth-secret
-    template:
-      engineVersion: v2
-      data:
-        client_secret: "{{.ARGOCD_CLIENT_SECRET}}"
-      metadata:
-        labels:
-          app.kubernetes.io/part-of: argocd
-  data:
-    - secretKey: ARGOCD_CLIENT_SECRET
-      remoteRef:
-        key: keycloak-clients
-        property: ARGOCD_CLIENT_SECRET

template/stacks/core/argocd/manifests/argocd-server-ingress.yaml

@@ -4,9 +4,10 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/backend-protocol: HTTP
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    cert-manager.io/cluster-issuer: main
 {{{ if eq .Env.CLUSTER_TYPE "osc" }}}
     dns.gardener.cloud/class: garden
-    dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN }}}
+    dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN_ARGOCD }}}
     dns.gardener.cloud/ttl: "600"
 {{{ end }}}
   name: argocd-server
@@ -14,7 +15,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: {{{ .Env.DOMAIN }}}
+  - host: {{{ .Env.DOMAIN_ARGOCD }}}
     http:
       paths:
       - backend:
@@ -22,9 +23,9 @@ spec:
             name: argocd-server
             port:
               number: 80
-        path: /argocd
+        path: /
         pathType: Prefix
   tls:
   - hosts:
-    - {{{ .Env.DOMAIN }}}
+    - {{{ .Env.DOMAIN_ARGOCD }}}
     secretName: argocd-net-tls

template/stacks/core/argocd/manifests/argocd-sso-config.yaml

@@ -1,54 +0,0 @@
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: argocd-config
-  namespace: argocd
-spec:
-  template:
-    metadata:
-      generateName: argocd-config-
-    spec:
-      restartPolicy: OnFailure
-      containers:
-        - name: push
-          image: docker.io/library/ubuntu:22.04
-          env:
-            - name: FORGEJO_USER
-              valueFrom:
-                secretKeyRef:
-                  name: forgejo-access-token
-                  key: forgejo_username
-            - name: FORGEJO_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: forgejo-access-token
-                  key: forgejo_token
-          command: ["/bin/bash", "-c"]
-          args:
-            - |
-              #! /bin/bash
-
-              apt -qq update
-              apt -qq install git wget -y
-              if [[ "$(uname -m)" == "x86_64" ]]; then
-                wget https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64
-                install yq_linux_amd64 /usr/local/bin/yq
-                rm yq_linux_amd64
-              else
-                wget https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_arm64
-                install yq_linux_arm64 /usr/local/bin/yq
-                rm yq_linux_arm64
-              fi
-
-              git config --global user.email "bot@bots.de"
-              git config --global user.name "bot"
-              
-              git clone https://${FORGEJO_USER}:${FORGEJO_TOKEN}@{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder.git
-              cd edfbuilder
-              yq eval '.configs.cm."oidc.config" = "name: Keycloak\nissuer: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe\nclientID: argocd\nclientSecret: $auth-generic-oauth-secret:client_secret\nrequestedScopes: [\"openid\", \"profile\", \"email\", \"groups\"]"' -i stacks/core/argocd/values.yaml
-              
-              git add stacks/core/argocd/values.yaml
-              git commit -m "adds Forgejo SSO config"
-              git push
-  backoffLimit: 99           

template/stacks/core/argocd/values.yaml

@@ -1,11 +1,9 @@
 global:
-  domain: {{{ .Env.DOMAIN }}}
+  domain: {{{ .Env.DOMAIN_ARGOCD }}}
 
 configs:
   params:
     server.insecure: true
-    server.basehref: /argocd
-    server.rootpath: /argocd
   cm:
     application.resourceTrackingMethod: annotation
     timeout.reconciliation: 60s
@@ -21,7 +19,7 @@ configs:
         clusters:
         - "*"
     accounts.provider-argocd: apiKey
-    url: https://{{{ .Env.DOMAIN }}}/argocd
+    url: https://{{{ .Env.DOMAIN_ARGOCD }}}
   rbac:
     policy.csv: 'g, provider-argocd, role:admin'
 

template/stacks/core/forgejo/manifests/forgejo-access-token.yaml

@@ -1,26 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: forgejo-access-token
-  namespace: gitea 
-spec:
-  secretStoreRef:
-    name: gitea
-    kind: ClusterSecretStore
-  refreshInterval: "0"
-  target:
-    name: forgejo-access-token
-    template:
-      engineVersion: v2
-      data:
-        forgejo_username: "{{.FORGEJO_ACCESS_USERNAME}}"
-        forgejo_token: "{{.FORGEJO_ACCESS_TOKEN}}"
-  data:
-    - secretKey: FORGEJO_ACCESS_USERNAME
-      remoteRef:
-        key: forgejo-access-token
-        property: username
-    - secretKey: FORGEJO_ACCESS_TOKEN
-      remoteRef:
-        key: forgejo-access-token
-        property: token

template/stacks/core/forgejo/manifests/forgejo-secret.yaml

@@ -1,26 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: auth-generic-oauth-secret
-  namespace: gitea 
-spec:
-  secretStoreRef:
-    name: keycloak
-    kind: ClusterSecretStore
-  refreshInterval: "0"
-  target:
-    name: auth-generic-oauth-secret
-    template:
-      engineVersion: v2
-      data:
-        key: "{{.FORGEJO_CLIENT_ID}}"
-        secret: "{{.FORGEJO_CLIENT_SECRET}}"
-  data:
-    - secretKey: FORGEJO_CLIENT_ID
-      remoteRef:
-        key: keycloak-clients
-        property: FORGEJO_CLIENT_ID
-    - secretKey: FORGEJO_CLIENT_SECRET
-      remoteRef:
-        key: keycloak-clients
-        property: FORGEJO_CLIENT_SECRET

template/stacks/core/forgejo/manifests/forgejo-sso-config.yaml

@@ -1,76 +0,0 @@
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: forgejo-config
-  namespace: gitea
-spec:
-  template:
-    metadata:
-      generateName: forgejo-config-
-    spec:
-      restartPolicy: OnFailure
-      containers:
-        - name: push
-          image: docker.io/library/ubuntu:22.04
-          env:
-            - name: FORGEJO_USER
-              valueFrom:
-                secretKeyRef:
-                  name: forgejo-access-token
-                  key: forgejo_username
-            - name: FORGEJO_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: forgejo-access-token
-                  key: forgejo_token
-          command: ["/bin/bash", "-c"]
-          args:
-            - |
-              #! /bin/bash
-
-              apt -qq update
-              apt -qq install git wget -y
-              if [[ "$(uname -m)" == "x86_64" ]]; then
-                wget https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64
-                install yq_linux_amd64 /usr/local/bin/yq
-                rm yq_linux_amd64
-              else
-                wget https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_arm64
-                install yq_linux_arm64 /usr/local/bin/yq
-                rm yq_linux_arm64
-              fi
-
-              git config --global user.email "bot@bots.de"
-              git config --global user.name "giteaAdmin"
-              
-              git clone https://${FORGEJO_USER}:${FORGEJO_TOKEN}@{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder.git
-              cd edfbuilder
-              yq eval ".gitea.oauth = [
-                {
-                  \"name\": \"Keycloak\",
-                  \"provider\": \"openidConnect\",
-                  \"existingSecret\": \"auth-generic-oauth-secret\",
-                  \"autoDiscoverUrl\": \"https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/.well-known/openid-configuration\"
-                }
-              ] |
-                (.gitea.oauth[] | .name) |= (. style=\"single\")
-                |
-                (.gitea.oauth[] | .provider) |= (. style=\"single\")
-                |
-                (.gitea.oauth[] | .existingSecret) |= (. style=\"single\")
-                |
-                (.gitea.oauth[] | .autoDiscoverUrl) |= (. style=\"single\")
-              " -i stacks/core/forgejo/values.yaml
-
-              yq eval '.gitea.config.oauth2_client = 
-                {
-                  "ENABLE_AUTO_REGISTRATION" : true,
-                  "ACCOUNT_LINKING" : "auto"
-                }
-              ' -i stacks/core/forgejo/values.yaml
-              
-              git add stacks/core/forgejo/values.yaml
-              git commit -m "adds Forgejo SSO config"
-              git push
-  backoffLimit: 99

template/stacks/core/forgejo/manifests/secret-admin-password.yaml

@@ -1,36 +0,0 @@
-apiVersion: generators.external-secrets.io/v1alpha1
-kind: Password
-metadata:
-  name: forgejo-admin-password-generator
-  namespace: gitea 
-spec:
-  length: 36
-  digits: 5
-  symbols: 5
-  symbolCharacters: "/-+"
-  noUpper: false
-  allowRepeat: true
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: forgejo-admin-password-generator
-  namespace: gitea 
-spec:
-  refreshInterval: "0"
-  target:
-    name: gitea-credential
-    template:
-      engineVersion: v2
-      data:
-        username: giteaAdmin
-        password: "{{.INITIAL_ADMIN_PASSWORD}}"
-  dataFrom:
-    - sourceRef:
-        generatorRef:
-          apiVersion: generators.external-secrets.io/v1alpha1
-          kind: Password
-          name: forgejo-admin-password-generator
-      rewrite:
-        - transform:
-            template: "INITIAL_ADMIN_PASSWORD"

template/stacks/core/forgejo/values.yaml

@@ -1,67 +0,0 @@
-redis-cluster:
-  enabled: true
-postgresql:
-  enabled: false
-postgresql-ha:
-  enabled: false
-
-persistence:
-  enabled: true
-  size: 5Gi
-
-test:
-  enabled: false
-
-gitea:
-  admin:
-    existingSecret: gitea-credential
-  config:
-    service:
-      DISABLE_REGISTRATION: true
-    other:
-      SHOW_FOOTER_VERSION: false
-      SHOW_FOOTER_TEMPLATE_LOAD_TIME: false
-    database:
-      DB_TYPE: sqlite3
-    session:
-      PROVIDER: memory
-    cache:
-      ADAPTER: memory
-    queue:
-      TYPE: level
-    server:
-      DOMAIN: '{{{ .Env.DOMAIN_GITEA }}}'
-      ROOT_URL: 'https://{{{ .Env.DOMAIN_GITEA }}}:443'
-    mailer:
-      ENABLED: true
-      FROM: forgejo@{{{ .Env.DOMAIN_GITEA }}}
-      PROTOCOL: smtp
-      SMTP_ADDR: mailhog.mailhog.svc.cluster.local
-      SMTP_PORT: 1025
-
-service:
-  ssh:
-    type: NodePort
-    nodePort: 32222
-    externalTrafficPolicy: Local
-
-image:
-  pullPolicy: "IfNotPresent"
-  # Overrides the image tag whose default is the chart appVersion.
-  #tag: "8.0.3"
-  # Adds -rootless suffix to image name
-  rootless: true
-
-forgejo:
-  runner:
-    enabled: true
-    image:
-      tag: latest
-    # replicas: 3
-    config:
-      runner:
-        labels:
-          - docker:docker://node:16-bullseye
-          - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-22.04
-          - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04
-          - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04

template/stacks/core/ingress-apps/argo-workflows-ingress.yaml

@@ -1,31 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-    nginx.ingress.kubernetes.io/use-regex: "true"
-  name: argo-workflows-ingress
-  namespace: argo
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: localhost
-    http:
-      paths:
-      - backend:
-          service:
-            name: argo-server
-            port:
-              name: web
-        path: /argo-workflows(/|$)(.*)
-        pathType: ImplementationSpecific
-  - host: {{{ .Env.DOMAIN }}}
-    http:
-      paths:
-      - backend:
-          service:
-            name: argo-server
-            port:
-              name: web
-        path: /argo-workflows(/|$)(.*)
-        pathType: ImplementationSpecific

template/stacks/core/ingress-apps/backstage.yaml

@@ -1,28 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: backstage
-  namespace: backstage
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: localhost
-    http:
-      paths:
-      - backend:
-          service:
-            name: backstage
-            port:
-              name: http
-        path: /
-        pathType: Prefix
-  - host: {{{ .Env.DOMAIN }}}
-    http:
-      paths:
-      - backend:
-          service:
-            name: backstage
-            port:
-              name: http
-        path: /
-        pathType: Prefix

template/stacks/core/ingress-apps/keycloak-ingress-localhost.yaml

@@ -1,28 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: keycloak-ingress-localhost
-  namespace: keycloak
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: localhost
-    http:
-      paths:
-      - backend:
-          service:
-            name: keycloak
-            port:
-              name: http
-        path: /keycloak
-        pathType: ImplementationSpecific
-  - host: {{{ .Env.DOMAIN }}}
-    http:
-      paths:
-      - backend:
-          service:
-            name: keycloak
-            port:
-              name: http
-        path: /keycloak
-        pathType: ImplementationSpecific

template/stacks/core/ingress-apps/kube-prometheus-stack-grafana.yaml

@@ -1,18 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: kube-prometheus-stack-grafana
-  namespace: monitoring
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: {{{ .Env.DOMAIN }}}
-    http:
-      paths:
-      - backend:
-          service:
-            name: kube-prometheus-stack-grafana
-            port:
-              number: 80
-        path: /grafana
-        pathType: Prefix

template/stacks/core/ingress-apps/mailhog.yaml

@@ -1,18 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: mailhog
-  namespace: mailhog
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: {{{ .Env.DOMAIN }}}
-    http:
-      paths:
-      - backend:
-          service:
-            name: mailhog
-            port:
-              number: 8025
-        path: /mailhog
-        pathType: Prefix

template/stacks/core/ingress-apps/openbao.yaml

@@ -1,24 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: openbao
-  namespace: openbao
-{{{ if eq .Env.CLUSTER_TYPE "osc" }}}
-  annotations:
-    dns.gardener.cloud/class: garden
-    dns.gardener.cloud/dnsnames: openbao.{{{ .Env.DOMAIN }}}
-    dns.gardener.cloud/ttl: "600"
-{{{ end }}}
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: openbao.{{{ .Env.DOMAIN }}}
-    http:
-      paths:
-      - backend:
-          service:
-            name: openbao
-            port:
-              number: 8200
-        path: /
-        pathType: Prefix

template/stacks/core/ingress-nginx/values.yaml

@@ -1,49 +0,0 @@
-controller:
-  updateStrategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 1
-
-  ingressClassResource:
-    name: nginx
-
-  # added for idpbuilder
-  allowSnippetAnnotations: true
-
-  # added for idpbuilder
-  config:
-    proxy-buffer-size: 32k
-    use-forwarded-headers: "true"
-
-  # monitoring nginx
-  metrics:
-    enabled: true
-    serviceMonitor:
-      additionalLabels: 
-        release: "ingress-nginx"  
-      enabled: true
-
-{{{ if eq .Env.CLUSTER_TYPE "kind" }}}
-  hostPort:
-    enabled: true
-  terminationGracePeriodSeconds: 0
-  service:
-    type: NodePort
-
-  nodeSelector:
-    ingress-ready: "true"
-  tolerations:
-    - key: "node-role.kubernetes.io/master"
-      operator: "Equal"
-      effect: "NoSchedule"
-    - key: "node-role.kubernetes.io/control-plane"
-      operator: "Equal"
-      effect: "NoSchedule"
-
-  publishService:
-    enabled: false
-  extraArgs:
-    publish-status-address: localhost
-    # added for idpbuilder
-    enable-ssl-passthrough: ""
-{{{ end }}}

template/stacks/forgejo/forgejo-runner.yaml

@@ -14,9 +14,11 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+    retry:
+      limit: -1
   destination:
     server: "https://kubernetes.default.svc"
   source:
     repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
-    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/forgejo-runner"
+    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-runner"

template/stacks/forgejo/forgejo-server.yaml

@@ -0,0 +1,38 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: forgejo-server
+  namespace: argocd
+  labels:
+    env: dev
+spec:
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+    retry:
+      limit: -1
+  destination:
+    name: in-cluster
+    namespace: gitea
+  sources:
+    - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/forgejo-helm.git
+      path: .
+      # first check out the desired version (example v9.0.0): https://code.forgejo.org/forgejo-helm/forgejo-helm/src/tag/v9.0.0/Chart.yaml
+      # (note that the chart version is not the same as the forgejo application version, which is specified in the above Chart.yaml file)
+      # then use the devops pipeline and select development, forgejo and the desired version (example v9.0.0):
+      # https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/devops-pipelines/actions?workflow=update-helm-depends.yaml&actor=0&status=0
+      # finally update the desired version here and include "-depends", it is created by the devops pipeline. 
+      # why do we have an added "-depends" tag? it resolves rate limitings when downloading helm OCI dependencies
+      targetRevision: v9.0.0-depends
+      helm:
+        valueFiles:
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-server/values.yaml
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+      targetRevision: HEAD
+      ref: values
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+      targetRevision: HEAD
+      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-server/manifests"

template/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml

@@ -4,12 +4,13 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/proxy-body-size: 512m
+    cert-manager.io/cluster-issuer: main
 {{{ if eq .Env.CLUSTER_TYPE "osc" }}}
     dns.gardener.cloud/class: garden
     dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN_GITEA }}}
     dns.gardener.cloud/ttl: "600"
 {{{ end }}}
-  name: forgejo
+  name: forgejo-server
   namespace: gitea
 spec:
   ingressClassName: nginx
@@ -19,7 +20,7 @@ spec:
       paths:
       - backend:
           service:
-            name: forgejo-http
+            name: forgejo-server-http
             port:
               number: 3000
         path: /

template/stacks/forgejo/forgejo-server/values.yaml

@@ -0,0 +1,175 @@
+# We use recreate to make sure only one instance with one version is running, because Forgejo might break or data gets inconsistant. 
+strategy:
+  type: Recreate
+
+redis-cluster:
+  enabled: false
+
+redis:
+  enabled: false
+
+postgresql:
+  enabled: false
+
+postgresql-ha:
+  enabled: false
+
+persistence:
+  enabled: true
+  size: 200Gi
+  annotations:
+    everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}}
+
+test:
+  enabled: false
+
+deployment:
+  env:
+    - name: SSL_CERT_DIR
+      value: /etc/ssl/forgejo
+
+extraVolumeMounts:
+  - mountPath: /etc/ssl/forgejo
+    name: custom-database-certs-volume
+    readOnly: true
+
+extraVolumes:
+  - name: custom-database-certs-volume
+    secret:
+      secretName: custom-database-certs
+
+gitea:
+  additionalConfigFromEnvs:
+    - name: FORGEJO__storage__MINIO_ACCESS_KEY_ID
+      valueFrom:
+        secretKeyRef:
+          name: forgejo-cloud-credentials
+          key: access-key
+    - name: FORGEJO__storage__MINIO_SECRET_ACCESS_KEY
+      valueFrom:
+        secretKeyRef:
+          name: forgejo-cloud-credentials
+          key: secret-key
+    - name: FORGEJO__queue__CONN_STR
+      valueFrom:
+        secretKeyRef:
+          name: redis-forgejo-cloud-credentials
+          key: connection-string
+    - name: FORGEJO__session__PROVIDER_CONFIG
+      valueFrom:
+        secretKeyRef:
+          name: redis-forgejo-cloud-credentials
+          key: connection-string
+    - name: FORGEJO__cache__HOST
+      valueFrom:
+        secretKeyRef:
+          name: redis-forgejo-cloud-credentials
+          key: connection-string
+    - name: FORGEJO__database__HOST
+      valueFrom:
+        secretKeyRef:
+          name: postgres-forgejo-cloud-credentials
+          key: host_port
+    - name: FORGEJO__database__NAME
+      valueFrom:
+        secretKeyRef:
+          name: postgres-forgejo-cloud-credentials
+          key: database
+    - name: FORGEJO__database__USER
+      valueFrom:
+        secretKeyRef:
+          name: postgres-forgejo-cloud-credentials
+          key: username
+    - name: FORGEJO__database__PASSWD
+      valueFrom:
+        secretKeyRef:
+          name: postgres-forgejo-cloud-credentials
+          key: password
+    - name: FORGEJO__indexer__ISSUE_INDEXER_CONN_STR
+      valueFrom:
+        secretKeyRef:
+          name: elasticsearch-cloud-credentials
+          key: connection-string
+    - name: FORGEJO__mailer__PASSWD
+      valueFrom:
+        secretKeyRef:
+          name: email-user-credentials
+          key: connection-string
+
+  admin:
+    existingSecret: gitea-credential
+
+  config:
+    indexer:
+      ISSUE_INDEXER_ENABLED: true
+      ISSUE_INDEXER_TYPE: elasticsearch
+      # TODO next
+      REPO_INDEXER_ENABLED: false
+      # REPO_INDEXER_TYPE: meilisearch # not yet working
+
+    storage:
+      MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443
+      STORAGE_TYPE: minio
+      MINIO_LOCATION: eu-de
+      MINIO_BUCKET: edp-forgejo-{{{ .Env.CLUSTER_ENVIRONMENT }}}
+      MINIO_USE_SSL: true
+
+    queue:
+      TYPE: redis
+
+    session:
+      PROVIDER: redis
+
+    cache:
+      ENABLED: true
+      ADAPTER: redis
+
+    service:
+      DISABLE_REGISTRATION: true
+
+    other:
+      SHOW_FOOTER_VERSION: false
+      SHOW_FOOTER_TEMPLATE_LOAD_TIME: false
+
+    database:
+      DB_TYPE: postgres
+      SSL_MODE: verify-ca
+
+    server:
+      DOMAIN: '{{{ .Env.DOMAIN_GITEA }}}'
+      ROOT_URL: 'https://{{{ .Env.DOMAIN_GITEA }}}:443'
+
+    mailer:
+      ENABLED: true
+      USER: ipcei-cis-devfw@mms-support.de
+      PROTOCOL: smtps
+      FROM: '"IPCEI CIS DevFW" <ipcei-cis-devfw@mms-support.de>'
+      SMTP_ADDR: mail.mms-support.de
+      SMTP_PORT: 465
+
+service:
+  ssh:
+    type: NodePort
+    nodePort: 32222
+    externalTrafficPolicy: Local
+
+image:
+  pullPolicy: "IfNotPresent"
+  # Overrides the image tag whose default is the chart appVersion.
+  #tag: "8.0.3"
+  # Adds -rootless suffix to image name
+  rootless: true
+
+forgejo:
+  runner:
+    enabled: true
+    image:
+      tag: latest
+    # replicas: 3
+    config:
+      runner:
+        labels:
+          - docker:docker://node:16-bullseye
+          - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+          - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+          - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04

template/stacks/monitoring/alloy/values.yaml

@@ -1,78 +0,0 @@
-alloy:
-  create: false
-  name: alloy-config
-  key: config.alloy
-
-  uiPathPrefix: "/alloy"
-
-  configMap:
-    content: |-
-
-      logging {
-        level  = "info"
-        format = "logfmt"
-      }
-
-      loki.write "local_loki" {
-          endpoint {
-              url = "http://loki-loki-distributed-gateway/loki/api/v1/push"
-          }
-      }
-
-      discovery.kubernetes "pod" {
-        role = "pod"
-      }
-
-      discovery.kubernetes "nodes" {
-        role = "node"
-      }
-
-      discovery.kubernetes "services" {
-        role = "service"
-      }
-
-      discovery.kubernetes "endpoints" {
-        role = "endpoints"
-      }
-
-      discovery.kubernetes "endpointslices" {
-        role = "endpointslice"
-      }
-
-      discovery.kubernetes "ingresses" {
-        role = "ingress"
-      }
-
-      discovery.relabel "pod_logs" {
-        targets = discovery.kubernetes.pod.targets
-
-        rule {
-          source_labels = ["__meta_kubernetes_namespace"]
-          action        = "replace"
-          target_label  = "namespace"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_name"]
-          action        = "replace"
-          target_label  = "pod"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_node_name"]
-          action        = "replace"
-          target_label  = "node"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_container_name"]
-          action        = "replace"
-          target_label  = "container"
-        }
-
-      }
-
-      loki.source.kubernetes "all_pod_logs" {
-        targets    = discovery.relabel.pod_logs.output
-        forward_to = [loki.write.local_loki.receiver]
-      }

template/stacks/monitoring/kube-prometheus/dashboards/dashboard_loki_apps.yaml

@@ -1,268 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: grafana-dashboard-1
-  labels:
-    grafana_dashboard: "1"
-data:
-  k8s-dashboard-01.json: |
-    {
-        "annotations": {
-            "list": [
-                {
-                    "builtIn": 1,
-                    "datasource": {
-                        "type": "grafana",
-                        "uid": "-- Grafana --"
-                    },
-                    "enable": true,
-                    "hide": true,
-                    "iconColor": "rgba(0, 211, 255, 1)",
-                    "name": "Annotations & Alerts",
-                    "type": "dashboard"
-                }
-            ]
-        },
-        "editable": true,
-        "fiscalYearStartMonth": 0,
-        "graphTooltip": 0,
-        "id": 1,
-        "links": [
-        ],
-        "panels": [
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 0
-                },
-                "id": 5,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "expr": "{app=\"crossplane\"}",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: App crossplane",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 8
-                },
-                "id": 4,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "expr": "{app=\"argo-server\"}",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: App argo-server",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 16
-                },
-                "id": 3,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "expr": "{app=\"forgejo\"}",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: App forgejo",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 24
-                },
-                "id": 2,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "expr": "{app=\"backstage\"}",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: App backstage",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 32
-                },
-                "id": 1,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "expr": "{app=\"shoot-control-plane\"}",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: App shoot-control-plane",
-                "type": "logs"
-            }
-        ],
-        "preload": false,
-        "schemaVersion": 40,
-        "tags": [
-        ],
-        "templating": {
-            "list": [
-            ]
-        },
-        "time": {
-            "from": "now-6h",
-            "to": "now"
-        },
-        "timepicker": {
-        },
-        "timezone": "browser",
-        "title": "Loki Logs: Apps",
-        "uid": "ee4iuluru756of",
-        "version": 2,
-        "weekStart": ""
-    }

template/stacks/monitoring/kube-prometheus/dashboards/dashboard_loki_components.yaml

@@ -1,845 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: grafana-dashboard-2
-  labels:
-    grafana_dashboard: "1"
-data:
-  k8s-dashboard-02.json: |
-    {
-        "annotations": {
-            "list": [
-                {
-                    "builtIn": 1,
-                    "datasource": {
-                        "type": "grafana",
-                        "uid": "-- Grafana --"
-                    },
-                    "enable": true,
-                    "hide": true,
-                    "iconColor": "rgba(0, 211, 255, 1)",
-                    "name": "Annotations & Alerts",
-                    "type": "dashboard"
-                }
-            ]
-        },
-        "editable": true,
-        "fiscalYearStartMonth": 0,
-        "graphTooltip": 0,
-        "id": 30,
-        "links": [
-        ],
-        "panels": [
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 0
-                },
-                "id": 19,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"server\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component server",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 8
-                },
-                "id": 17,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"repo-server\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component repo-server",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 16
-                },
-                "id": 16,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"redis\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component redis",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 24
-                },
-                "id": 15,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"query-frontend\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component query-frontend",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 32
-                },
-                "id": 14,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"querier\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component querier",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 40
-                },
-                "id": 13,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"prometheus-operator-webhook\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component prometheus-operator-webhook",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 48
-                },
-                "id": 12,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"prometheus-operator\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component prometheus-operator",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 56
-                },
-                "id": 11,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"metrics\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component metrics",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 64
-                },
-                "id": 10,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"kube-scheduler\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component kube-scheduler",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 72
-                },
-                "id": 9,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"kube-controller-manager\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component kube-controller-manager",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 80
-                },
-                "id": 8,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"kube-apiserver\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component kube-apiserver",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 88
-                },
-                "id": 7,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"ingester\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component ingester",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 96
-                },
-                "id": 6,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"gateway\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component gateway",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 104
-                },
-                "id": 5,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"etcd\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component etcd",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 112
-                },
-                "id": 4,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"distributor\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component distributor",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 120
-                },
-                "id": 3,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"controller\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component controller",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 128
-                },
-                "id": 2,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"cloud-infrastructure-controller\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component cloud-infrastructure-controller",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 136
-                },
-                "id": 1,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{component=\"applicationset-controller\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Component application-controller",
-                "type": "logs"
-            }
-        ],
-        "preload": false,
-        "schemaVersion": 40,
-        "tags": [
-        ],
-        "templating": {
-            "list": [
-            ]
-        },
-        "time": {
-            "from": "now-6h",
-            "to": "now"
-        },
-        "timepicker": {
-        },
-        "timezone": "browser",
-        "title": "Loki Logs: Components",
-        "uid": "ae4zuyp1kui9sc",
-        "version": 2,
-        "weekStart": ""
-    }

template/stacks/monitoring/kube-prometheus/dashboards/dashboard_loki_container.yaml

@@ -1,537 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: grafana-dashboard-3
-  labels:
-    grafana_dashboard: "1"
-data:
-  k8s-dashboard-03.json: |
-    {
-        "annotations": {
-            "list": [
-                {
-                    "builtIn": 1,
-                    "datasource": {
-                        "type": "grafana",
-                        "uid": "-- Grafana --"
-                    },
-                    "enable": true,
-                    "hide": true,
-                    "iconColor": "rgba(0, 211, 255, 1)",
-                    "name": "Annotations & Alerts",
-                    "type": "dashboard"
-                }
-            ]
-        },
-        "editable": true,
-        "fiscalYearStartMonth": 0,
-        "graphTooltip": 0,
-        "id": 31,
-        "links": [
-        ],
-        "panels": [
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 0
-                },
-                "id": 11,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"repo-server\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container repo-server",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 8
-                },
-                "id": 10,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"alloy\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container alloy",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 16
-                },
-                "id": 9,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"prometheus\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container prometheus",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 24
-                },
-                "id": 8,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"postgres\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container postgres",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 32
-                },
-                "id": 7,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"kube-prometheus-stack\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container kube-prometheus-stack",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 40
-                },
-                "id": 6,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"keycloak\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container keycloak",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 48
-                },
-                "id": 5,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"grafana\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container grafana",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 56
-                },
-                "id": 4,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"forgejo\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container forgejo",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 64
-                },
-                "id": 3,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"crossplane\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container crossplane",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 72
-                },
-                "id": 2,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"backstage\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container backstage",
-                "type": "logs"
-            },
-            {
-                "datasource": {
-                    "type": "loki",
-                    "uid": "P8E80F9AEF21F6940"
-                },
-                "fieldConfig": {
-                    "defaults": {
-                    },
-                    "overrides": [
-                    ]
-                },
-                "gridPos": {
-                    "h": 8,
-                    "w": 24,
-                    "x": 0,
-                    "y": 80
-                },
-                "id": 1,
-                "options": {
-                    "dedupStrategy": "none",
-                    "enableLogDetails": true,
-                    "prettifyLogMessage": false,
-                    "showCommonLabels": false,
-                    "showLabels": false,
-                    "showTime": false,
-                    "sortOrder": "Descending",
-                    "wrapLogMessage": false
-                },
-                "pluginVersion": "11.3.1",
-                "targets": [
-                    {
-                        "datasource": {
-                            "type": "loki",
-                            "uid": "P8E80F9AEF21F6940"
-                        },
-                        "editorMode": "builder",
-                        "expr": "{container=\"argo-server\"} |= ``",
-                        "queryType": "range",
-                        "refId": "A"
-                    }
-                ],
-                "title": "Logs: Container argo-server",
-                "type": "logs"
-            }
-        ],
-        "preload": false,
-        "schemaVersion": 40,
-        "tags": [
-        ],
-        "templating": {
-            "list": [
-            ]
-        },
-        "time": {
-            "from": "now-6h",
-            "to": "now"
-        },
-        "timepicker": {
-        },
-        "timezone": "browser",
-        "title": "Loki Logs: Container",
-        "uid": "ee50bcaehmv40e",
-        "version": 2,
-        "weekStart": ""
-    }

template/stacks/monitoring/kube-prometheus/manifests/secret-admin-password.yaml

@@ -1,36 +0,0 @@
-apiVersion: generators.external-secrets.io/v1alpha1
-kind: Password
-metadata:
-  name: grafana-admin-password-generator
-  namespace: monitoring 
-spec:
-  length: 36
-  digits: 5
-  symbols: 5
-  symbolCharacters: "/-+"
-  noUpper: false
-  allowRepeat: true
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: grafana-admin-password-generator
-  namespace: monitoring 
-spec:
-  refreshInterval: "0"
-  target:
-    name: kube-prometheus-stack-grafana-admin-password
-    template:
-      engineVersion: v2
-      data:
-        admin-user: admin
-        admin-password: "{{.INITIAL_ADMIN_PASSWORD}}"
-  dataFrom:
-    - sourceRef:
-        generatorRef:
-          apiVersion: generators.external-secrets.io/v1alpha1
-          kind: Password
-          name: grafana-admin-password-generator
-      rewrite:
-        - transform:
-            template: "INITIAL_ADMIN_PASSWORD"

template/stacks/monitoring/kube-prometheus/manifests/secret-grafana.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: auth-generic-oauth-secret
-  namespace: monitoring
-spec:
-  secretStoreRef:
-    name: keycloak
-    kind: ClusterSecretStore
-  refreshInterval: "0"
-  target:
-    name: auth-generic-oauth-secret
-    template:
-      engineVersion: v2
-      data:
-        client_secret: "{{.GRAFANA_CLIENT_SECRET}}"
-  data:
-    - secretKey: GRAFANA_CLIENT_SECRET
-      remoteRef:
-        key: keycloak-clients
-        property: GRAFANA_CLIENT_SECRET

template/stacks/monitoring/kube-prometheus/values.yaml

@@ -1,71 +0,0 @@
-grafana:
-  namespaceOverride: "monitoring"
-
-  admin:
-    existingSecret: "kube-prometheus-stack-grafana-admin-password"
-    userKey: admin-user
-    passwordKey: admin-password
-
-  defaultDashboardsTimezone: Europe/Berlin
-
-  additionalDataSources:
-    - name: Loki
-      type: loki
-      url: http://loki-loki-distributed-gateway.monitoring:80
-
-  # syncPolicy:
-  #   syncOptions:
-  #   - ServerSideApply=true
-
-  sidecar:
-    dashboards:
-      enabled: true
-      label: grafana_dashboard
-      folder: /tmp/dashboards
-      updateIntervalSeconds: 10
-      folderAnnotation: grafana_folder
-      provider:
-        allowUiUpdates: true
-        foldersFromFilesStructure: true
-
-  grafana.ini:
-    server:
-      domain: {{{ .Env.DOMAIN }}}
-      root_url: "%(protocol)s://%(domain)s/grafana"
-      serve_from_sub_path: true
-    auth:
-      disable_login: true
-      disable_login_form: true
-    auth.generic_oauth:
-      enabled: true
-      name: Keycloak-OAuth
-      allow_sign_up: true
-      use_refresh_token: true
-      client_id: grafana
-      client_secret: $__file{/etc/secrets/auth_generic_oauth/client_secret}
-      scopes: openid email profile offline_access roles
-      email_attribute_path: email
-      login_attribute_path: username
-      name_attribute_path: full_name
-      auth_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/auth
-      token_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/token
-      api_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/userinfo
-      redirect_uri: http://{{{ .Env.DOMAIN }}}/grafana/login/generic_oauth
-      role_attribute_path: "contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'editor') && 'Editor' || 'Viewer'"
-      
-  extraSecretMounts:
-    - name: auth-generic-oauth-secret-mount
-      secretName: auth-generic-oauth-secret
-      defaultMode: 0440
-      mountPath: /etc/secrets/auth_generic_oauth
-      readOnly: true
-
-  serviceMonitor:
-    # If true, a ServiceMonitor CRD is created for a prometheus operator https://github.com/coreos/prometheus-operator
-    enabled: true
-
-#monitoring nginx
-prometheus:
-  prometheusSpec:
-    podMonitorSelectorNilUsesHelmValues: false
-    serviceMonitorSelectorNilUsesHelmValues: false     

template/stacks/monitoring/loki/values.yaml

@@ -1,7 +0,0 @@
-loki:
-  commonConfig:
-    replication_factor: 1
-  auth_enabled: false
-
-#  storageConfig:
-#    filesystem: null

template/stacks/observability-client/metrics-server.yaml

@@ -1,12 +1,10 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: loki
+  name: metrics-server
   namespace: argocd
   labels:
     env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
   syncPolicy:
@@ -14,20 +12,18 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+    retry:
+      limit: -1
   destination:
     name: in-cluster
-    namespace: monitoring
+    namespace: observability
   sources:
-    - repoURL: https://github.com/grafana/helm-charts
+    - chart: metrics-server
-      path: charts/loki-distributed
+      repoURL: https://kubernetes-sigs.github.io/metrics-server/
-      targetRevision: HEAD
+      targetRevision: 3.12.2
       helm:
         valueFiles:
-          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/monitoring/loki/values.yaml
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability-client/metrics-server/values.yaml
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
-
-    ## consider using the following version, if it works again
-    #- repoURL: https://github.com/grafana/loki
-    #  path: production/helm/loki

template/stacks/observability-client/metrics-server/values.yaml

@@ -0,0 +1,4 @@
+metrics:
+  enabled: true
+serviceMonitor:
+  enabled: true

template/stacks/observability-client/vector.yaml

@@ -1,12 +1,10 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: alloy
+  name: vector
   namespace: argocd
   labels:
     env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
   syncPolicy:
@@ -14,16 +12,18 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+    retry:
+      limit: -1
   destination:
     name: in-cluster
-    namespace: monitoring
+    namespace: observability
   sources:
-    - repoURL: https://github.com/grafana/alloy.git
+    - chart: vector
-      path: operations/helm/charts/alloy
+      repoURL: https://helm.vector.dev
-      targetRevision: HEAD
+      targetRevision: 0.43.0
       helm:
         valueFiles:
-          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/monitoring/alloy/values.yaml
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability-client/vector/values.yaml
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values

template/stacks/observability-client/vector/values.yaml

@@ -0,0 +1,57 @@
+# -- Enable deployment of vector
+role: Agent
+dataDir: /vector-data-dir
+resources: {}
+args:
+  - -w
+  - --config-dir
+  - /etc/vector/
+containerPorts:
+  - name: prom-exporter
+    containerPort: 9090
+    protocol: TCP
+service:
+  enabled: false
+customConfig:
+  data_dir: /vector-data-dir
+  api:
+    enabled: false
+    address: 0.0.0.0:8686
+    playground: true
+  sources:
+    k8s:
+      type: kubernetes_logs
+    internal_metrics:
+      type: internal_metrics
+  transforms:
+    parser:
+      type: remap
+      inputs: [k8s]
+      source: |
+        ._msg = parse_json(.message) ?? .message
+        del(.message)
+        # Add the cluster environment to the log event
+        .cluster_environment = "{{{ .Env.CLUSTER_ENVIRONMENT }}}"
+  sinks:
+    vlogs:
+      type: elasticsearch
+      inputs: [parser]
+      endpoints: 
+        - https://{{{ .Env.DOMAIN_O12Y }}}/insert/elasticsearch/
+      auth:
+        strategy: basic
+        user: simple-user
+        password: simple-password  
+      mode: bulk
+      api_version: v8
+      compression: gzip
+      healthcheck:
+        enabled: false
+      request:
+        headers:
+          AccountID: "0"
+          ProjectID: "0"
+      query:
+        _msg_field: _msg
+        _time_field: _time
+        _stream_fields: cluster_environment,kubernetes.container_name,kubernetes.namespace       

template/stacks/observability-client/vm-client-stack.yaml

@@ -1,12 +1,10 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: kube-prometheus-stack
+  name: vm-client
   namespace: argocd
   labels:
     env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
   syncPolicy:
@@ -14,26 +12,19 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
-      - ServerSideApply=true # do not copy metdata, since (because of its large size) it can lead to sync failure
-    retry:
-      limit: -1
-      backoff:
-        duration: 15s
-        factor: 1
-        maxDuration: 15s
   destination:
     name: in-cluster
-    namespace: monitoring
+    namespace: observability
   sources:
-    - repoURL: https://github.com/prometheus-community/helm-charts
+    - chart: victoria-metrics-k8s-stack
-      path: charts/kube-prometheus-stack
+      repoURL: https://victoriametrics.github.io/helm-charts/
-      targetRevision: HEAD
+      targetRevision: 0.48.1
       helm:
         valueFiles:
-          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/monitoring/kube-prometheus/values.yaml
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability-client/vm-client-stack/values.yaml
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
-      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/monitoring/kube-prometheus/manifests"
+      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability-client/vm-client-stack/manifests"

template/stacks/observability-client/vm-client-stack/manifests/simple-user-secret.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: simple-user-secret
+  namespace: observability
+type: Opaque
+stringData:
+  username: simple-user
+  password: simple-password

template/stacks/observability/grafana-operator.yaml

@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: grafana-operator
+  namespace: argocd
+  labels:
+    env: dev
+spec:
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
+  destination:
+    name: in-cluster
+    namespace: observability
+  sources:
+    - chart: grafana-operator
+      repoURL: ghcr.io/grafana/helm-charts
+      targetRevision: v5.18.0
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+      targetRevision: HEAD
+      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability/grafana-operator/manifests"

template/stacks/observability/grafana-operator/manifests/argocd.yaml

@@ -0,0 +1,9 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: argocd
+spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  url: "https://raw.githubusercontent.com/argoproj/argo-cd/refs/heads/master/examples/dashboard.json"

template/stacks/observability/grafana-operator/manifests/grafana.yaml

@@ -0,0 +1,14 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: Grafana
+metadata:
+  name: grafana
+  labels:
+    dashboards: "grafana"
+spec:
+  persistentVolumeClaim:
+    spec:
+      accessModes:
+        - ReadWriteOnce
+      resources:
+        requests:
+          storage: 10Gi

template/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml

@@ -0,0 +1,9 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: ingress-nginx 
+spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  url: "https://raw.githubusercontent.com/adinhodovic/ingress-nginx-mixin/refs/heads/main/dashboards_out/ingress-nginx-overview.json"

template/stacks/observability/grafana-operator/manifests/victoria-logs.yaml

@@ -0,0 +1,9 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: victoria-logs
+spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  url: "https://raw.githubusercontent.com/VictoriaMetrics/VictoriaMetrics/refs/heads/master/dashboards/vm/victorialogs.json"

template/stacks/observability/victoria-k8s-stack.yaml

@@ -0,0 +1,31 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: o12y
+  namespace: argocd
+  labels:
+    env: dev
+spec:
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
+  destination:
+    name: in-cluster
+    namespace: observability
+  sources:
+    - chart: victoria-metrics-k8s-stack
+      repoURL: https://victoriametrics.github.io/helm-charts/
+      targetRevision: 0.48.1
+      helm:
+        valueFiles:
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability/victoria-k8s-stack/values.yaml
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+      targetRevision: HEAD
+      ref: values
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+      targetRevision: HEAD
+      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/observability/victoria-k8s-stack/manifests"

template/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml

@@ -0,0 +1,24 @@
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VLogs
+metadata:
+  name: victorialogs
+  namespace: observability
+spec:
+  retentionPeriod: "12"
+  removePvcAfterDelete: true
+  storage:
+    metadata:
+      annotations:
+        everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}}       
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: 50Gi
+  resources:
+    requests:
+      memory: 500Mi
+      cpu: 500m
+    limits:
+      memory: 10Gi
+      cpu: 2

template/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml

@@ -0,0 +1,15 @@
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMUser
+metadata:
+  name: simple-user
+  namespace: observability
+spec:
+  username: simple-user
+  password: simple-password
+  targetRefs:
+    - static:
+        url: http://vmsingle-o12y:8429
+      paths: ["/api/v1/write"]
+    - static:
+        url: http://vlogs-victorialogs:9428
+      paths: ["/insert/elasticsearch/.*"]

template/stacks/otc/cert-manager/manifests/clusterissuer.yaml

@@ -0,0 +1,14 @@
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: main
+spec:
+  acme:
+    email: admin@think-ahead.tech
+    server: https://acme-v02.api.letsencrypt.org/directory
+    privateKeySecretRef:
+      name: cluster-issuer-account-key
+    solvers:
+    - http01:
+        ingress:
+          ingressClassName: nginx

template/stacks/otc/cert-manager/values.yaml

@@ -0,0 +1,4 @@
+crds:
+  enabled: true
+
+replicaCount: 1

template/stacks/otc/cert-manger.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: forgejo
+  name: cert-manager
   namespace: argocd
   labels:
     env: dev
@@ -12,19 +12,21 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+    retry:
+      limit: -1
   destination:
     name: in-cluster
-    namespace: gitea
+    namespace: cert-manager
   sources:
-    - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/forgejo-helm.git
+    - chart: cert-manager
-      path: .
+      repoURL: https://charts.jetstack.io
-      targetRevision: v12.0.0-depends
+      targetRevision: v1.17.2
       helm:
         valueFiles:
-          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/forgejo/values.yaml
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/otc/cert-manager/values.yaml
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
-      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/forgejo/manifests"
+      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/otc/cert-manager/manifests"

template/stacks/otc/ingress-nginx.yaml

@@ -12,6 +12,8 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+    retry:
+      limit: -1
   destination:
     name: in-cluster
     namespace: ingress-nginx
@@ -21,7 +23,7 @@ spec:
       targetRevision: helm-chart-4.12.1-depends
       helm:
         valueFiles:
-          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/ingress-nginx/values.yaml
+          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/otc/ingress-nginx/values.yaml
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values

template/stacks/otc/ingress-nginx/values.yaml

@@ -0,0 +1,31 @@
+controller:
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+
+  service:
+    annotations:
+      kubernetes.io/elb.class: union
+      kubernetes.io/elb.port: '80'
+      kubernetes.io/elb.id: {{{ .Env.LOADBALANCER_ID }}}
+      kubernetes.io/elb.ip: {{{ .Env.LOADBALANCER_IP }}}
+
+  ingressClassResource:
+    name: nginx
+
+  # added for idpbuilder
+  allowSnippetAnnotations: true
+
+  # added for idpbuilder
+  config:
+    proxy-buffer-size: 32k
+    use-forwarded-headers: "true"
+
+  # monitoring nginx
+  metrics:
+    enabled: true
+    serviceMonitor:
+      additionalLabels: 
+        release: "ingress-nginx"  
+      enabled: true

template/stacks/otc/storageclass.yaml

@@ -21,3 +21,5 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+    retry:
+      limit: -1