From 4590ddc30a182f7fb6637d78d02d3b27a97c7047 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 6 May 2025 15:58:18 +0200 Subject: [PATCH] wip: add guards around apps for move to helm template --- apps/cerbos.yaml | 32 ----- apps/jaeger-operator.yaml | 2 + apps/loki.yaml | 2 + apps/opentelemetry-collector.yaml | 2 + apps/prod-atlantis.yaml | 66 ---------- apps/staging-atlantis.yaml | 72 ----------- apps/staging-openfga.yaml | 39 ------ apps/staging-sorcerer.yaml | 54 --------- apps/sys/templates/atlantis.yaml | 2 + apps/{ => sys/templates}/busynix.yaml | 2 + apps/{ => sys/templates}/dapr.yaml | 2 + .../{prod-dex.yaml => sys/templates/dex.yaml} | 3 +- .../templates/geoserver.yaml} | 2 + apps/{ => sys/templates}/headscale.yaml | 2 + .../templates/keycloak.yaml} | 3 +- .../templates/openfga.yaml} | 4 + apps/{ => sys/templates}/osm-tile-server.yaml | 10 +- apps/{ => sys/templates}/plausible.yaml | 2 + apps/{ => sys/templates}/rabbitmq.yaml | 8 +- apps/{ => sys/templates}/redis.yaml | 2 + apps/{ => sys/templates}/seq.yaml | 2 + .../templates/sorcerer.yaml} | 4 + apps/sys/templates/velero.yaml | 6 +- apps/{ => sys/templates}/wordpress.yaml | 2 + apps/{ => sys/templates}/yolo-dl.yaml | 2 + apps/{ => sys/templates}/yolo-registry.yaml | 2 + apps/sys/values.yaml | 114 +++++++++++------- apps/tempo.yaml | 2 + 28 files changed, 127 insertions(+), 318 deletions(-) delete mode 100644 apps/cerbos.yaml delete mode 100644 apps/prod-atlantis.yaml delete mode 100644 apps/staging-atlantis.yaml delete mode 100644 apps/staging-openfga.yaml delete mode 100644 apps/staging-sorcerer.yaml rename apps/{ => sys/templates}/busynix.yaml (91%) rename apps/{ => sys/templates}/dapr.yaml (94%) rename apps/{prod-dex.yaml => sys/templates/dex.yaml} (94%) rename apps/{prod-geoserver.yaml => sys/templates/geoserver.yaml} (92%) rename apps/{ => sys/templates}/headscale.yaml (91%) rename apps/{prod-keycloak.yaml => sys/templates/keycloak.yaml} (95%) rename apps/{prod-openfga.yaml => sys/templates/openfga.yaml} (91%) rename apps/{ => sys/templates}/osm-tile-server.yaml (79%) rename apps/{ => sys/templates}/plausible.yaml (97%) rename apps/{ => sys/templates}/rabbitmq.yaml (81%) rename apps/{ => sys/templates}/redis.yaml (94%) rename apps/{ => sys/templates}/seq.yaml (91%) rename apps/{prod-sorcerer.yaml => sys/templates/sorcerer.yaml} (93%) rename apps/{ => sys/templates}/wordpress.yaml (91%) rename apps/{ => sys/templates}/yolo-dl.yaml (87%) rename apps/{ => sys/templates}/yolo-registry.yaml (86%) diff --git a/apps/cerbos.yaml b/apps/cerbos.yaml deleted file mode 100644 index a4b7758b..00000000 --- a/apps/cerbos.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: cerbos - namespace: argocd -spec: - generators: - - list: - elements: - - cluster: https://kubernetes.default.svc - env: prod - - cluster: https://staging-vcluster.staging-vcluster - env: staging - template: - metadata: - name: '{{ env }}-cerbos' - spec: - project: aux - destination: - server: https://kubernetes.default.svc - namespace: idp - sources: - - repoURL: https://download.cerbos.dev/helm-charts - targetRevision: 0.33.0 - chart: cerbos - helm: - valueFiles: - - $values/values/cerbos/values.yaml - - $values/values/cerbos/values-{{ env }}.yaml - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - ref: values diff --git a/apps/jaeger-operator.yaml b/apps/jaeger-operator.yaml index 82074ef0..31848608 100644 --- a/apps/jaeger-operator.yaml +++ b/apps/jaeger-operator.yaml @@ -1,3 +1,4 @@ +{{- if .Values.jaeger-operator.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -20,3 +21,4 @@ spec: # path: values/jaeger/manifests ref: values +{{- end }} diff --git a/apps/loki.yaml b/apps/loki.yaml index 86c8983e..90260805 100644 --- a/apps/loki.yaml +++ b/apps/loki.yaml @@ -1,3 +1,4 @@ +{{- if .Values.loki.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -148,3 +149,4 @@ spec: secretKeyRef: name: loki-s3 key: AWS_ACCESS_KEY_SECRET +{{- end }} diff --git a/apps/opentelemetry-collector.yaml b/apps/opentelemetry-collector.yaml index 2eec055d..70b04b6b 100644 --- a/apps/opentelemetry-collector.yaml +++ b/apps/opentelemetry-collector.yaml @@ -1,3 +1,4 @@ +{{- if .Values.opentelemetry-collector.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -107,3 +108,4 @@ spec: - secretName: collector-tls hosts: - opentelemetry-collector.adm.oceanbox.io +{{- end }} diff --git a/apps/prod-atlantis.yaml b/apps/prod-atlantis.yaml deleted file mode 100644 index 76d0ae97..00000000 --- a/apps/prod-atlantis.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: prod-atlantis - namespace: argocd - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: prod-atlantis - server: https://kubernetes.default.svc - project: atlantis - sources: - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - ref: values - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - path: values/atlantis - plugin: - name: kustomize-helm-with-rewrite - parameters: - - name: env - string: prod - - name: hostname - string: maps.oceanbox.io - - repoURL: https://charts.bitnami.com/bitnami - targetRevision: 20.1.7 - chart: redis - helm: - valueFiles: - - $values/values/atlantis/prod/redis.yaml - ignoreDifferences: - - kind: Secret - name: azure-keyvault - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: prod-atlantis-rabbitmq - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: prod-archmeister-replication - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: prod-archmeister-ca - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - syncPolicy: - syncOptions: - - CreateNamespace=true - - ApplyOutOfSyncOnly=true - # automated: - # prune: true - # selfHeal: false diff --git a/apps/staging-atlantis.yaml b/apps/staging-atlantis.yaml deleted file mode 100644 index 802af532..00000000 --- a/apps/staging-atlantis.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: staging-atlantis - namespace: argocd - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: staging-atlantis - server: https://kubernetes.default.svc - project: atlantis - sources: - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - ref: values - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - path: values/atlantis - plugin: - name: kustomize-helm-with-rewrite - parameters: - - name: env - string: staging - - name: hostname - string: atlantis.beta.oceanbox.io - - repoURL: https://charts.bitnami.com/bitnami - targetRevision: 20.1.7 - chart: redis - helm: - valueFiles: - - $values/values/atlantis/staging/redis.yaml - ignoreDifferences: - - kind: Secret - name: dapr-api-token - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: azure-keyvault - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: staging-atlantis-rabbitmq - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: prod-atlantis-db-replication - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: prod-atlantis-db-ca - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - syncPolicy: - syncOptions: - - CreateNamespace=true - - ApplyOutOfSyncOnly=true - automated: - prune: true - selfHeal: false diff --git a/apps/staging-openfga.yaml b/apps/staging-openfga.yaml deleted file mode 100644 index c29ad695..00000000 --- a/apps/staging-openfga.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: staging-openfga - namespace: argocd - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: openfga - server: https://kubernetes.default.svc - project: aux - # ignoreDifferences: - # - group: apps - # kind: StatefulSet - # jsonPointers: - # - /spec/persistentVolumeClaimRetentionPolicy - syncPolicy: - managedNamespaceMetadata: - labels: - component: aux - syncOptions: - - CreateNamespace=true - - ApplyOutOfSyncOnly=true - automated: - prune: true - selfHeal: true - sources: - - repoURL: https://openfga.github.io/helm-charts - targetRevision: 0.2.21 - chart: openfga - helm: - valueFiles: - - $values/values/openfga/values-staging.yaml - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - ref: values diff --git a/apps/staging-sorcerer.yaml b/apps/staging-sorcerer.yaml deleted file mode 100644 index 9c1edd4c..00000000 --- a/apps/staging-sorcerer.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: staging-sorcerer - namespace: argocd - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: staging-sorcerer - server: https://10.255.241.99:4443 - project: atlantis - sources: - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - ref: values - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main - path: values/sorcerer - plugin: - name: kustomize-helm-with-rewrite - parameters: - - name: env - string: staging - - name: hostname - string: sorcerer.ekman.oceanbox.io - - repoURL: https://charts.bitnami.com/bitnami - targetRevision: 20.1.7 - chart: redis - helm: - valueFiles: - - $values/values/sorcerer/staging/redis.yaml - ignoreDifferences: - - kind: Secret - name: azure-keyvault - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - - kind: Secret - name: prod-atlantis-rabbitmq - jqPathExpressions: - - '.data' - - '.metadata.labels' - - '.metadata.annotations' - syncPolicy: - syncOptions: - - CreateNamespace=true - - ApplyOutOfSyncOnly=true - automated: - prune: true - selfHeal: false diff --git a/apps/sys/templates/atlantis.yaml b/apps/sys/templates/atlantis.yaml index bf101d99..9f09c373 100644 --- a/apps/sys/templates/atlantis.yaml +++ b/apps/sys/templates/atlantis.yaml @@ -1,3 +1,4 @@ +{{ if .Values.atlantis.enabled }} {{- range .Values.atlantis.envs }} apiVersion: argoproj.io/v1alpha1 kind: Application @@ -66,3 +67,4 @@ spec: # prune: true # selfHeal: false {{- end }} +{{- end }} diff --git a/apps/busynix.yaml b/apps/sys/templates/busynix.yaml similarity index 91% rename from apps/busynix.yaml rename to apps/sys/templates/busynix.yaml index 5e9fbaae..d232531e 100644 --- a/apps/busynix.yaml +++ b/apps/sys/templates/busynix.yaml @@ -1,3 +1,4 @@ +{{- if .Values.busynix.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -19,3 +20,4 @@ spec: string: staging - name: hostname string: busynix.beta.oceanbox.io +{{- end }} diff --git a/apps/dapr.yaml b/apps/sys/templates/dapr.yaml similarity index 94% rename from apps/dapr.yaml rename to apps/sys/templates/dapr.yaml index 6d244677..dc686c68 100644 --- a/apps/dapr.yaml +++ b/apps/sys/templates/dapr.yaml @@ -1,3 +1,4 @@ +{{- if .Values.dapr.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -31,3 +32,4 @@ spec: global: ha: enabled: true +{{- end }} diff --git a/apps/prod-dex.yaml b/apps/sys/templates/dex.yaml similarity index 94% rename from apps/prod-dex.yaml rename to apps/sys/templates/dex.yaml index 1549a7fe..fa8289e0 100644 --- a/apps/prod-dex.yaml +++ b/apps/sys/templates/dex.yaml @@ -1,3 +1,4 @@ +{{ if .Values.dex.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -25,4 +26,4 @@ spec: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: main ref: values - +{{- end }} diff --git a/apps/prod-geoserver.yaml b/apps/sys/templates/geoserver.yaml similarity index 92% rename from apps/prod-geoserver.yaml rename to apps/sys/templates/geoserver.yaml index 05d13a8b..f5c3b589 100644 --- a/apps/prod-geoserver.yaml +++ b/apps/sys/templates/geoserver.yaml @@ -1,3 +1,4 @@ +{{ if .Values.geoserver.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -23,3 +24,4 @@ spec: string: "--skip-tests" - name: chart string: ncsa/geoserver +{{- end }} diff --git a/apps/headscale.yaml b/apps/sys/templates/headscale.yaml similarity index 91% rename from apps/headscale.yaml rename to apps/sys/templates/headscale.yaml index 656572bb..f2392c5a 100644 --- a/apps/headscale.yaml +++ b/apps/sys/templates/headscale.yaml @@ -1,3 +1,4 @@ +{{- if .Values.headscale.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -19,3 +20,4 @@ spec: targetRevision: main ref: values +{{- end }} diff --git a/apps/prod-keycloak.yaml b/apps/sys/templates/keycloak.yaml similarity index 95% rename from apps/prod-keycloak.yaml rename to apps/sys/templates/keycloak.yaml index a78a581e..e3425eab 100644 --- a/apps/prod-keycloak.yaml +++ b/apps/sys/templates/keycloak.yaml @@ -1,3 +1,4 @@ +{{ if .Values.keycloak.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -35,4 +36,4 @@ spec: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: main ref: values - +{{- end }} diff --git a/apps/prod-openfga.yaml b/apps/sys/templates/openfga.yaml similarity index 91% rename from apps/prod-openfga.yaml rename to apps/sys/templates/openfga.yaml index f72c53dd..7c83f346 100644 --- a/apps/prod-openfga.yaml +++ b/apps/sys/templates/openfga.yaml @@ -1,3 +1,5 @@ +{{ if .Values.openfga.enabled }} +{{- range .Values.atlantis.envs }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -37,3 +39,5 @@ spec: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: main ref: values +{{- end }} +{{- end }} diff --git a/apps/osm-tile-server.yaml b/apps/sys/templates/osm-tile-server.yaml similarity index 79% rename from apps/osm-tile-server.yaml rename to apps/sys/templates/osm-tile-server.yaml index 9b9ecbcd..c5a4753c 100644 --- a/apps/osm-tile-server.yaml +++ b/apps/sys/templates/osm-tile-server.yaml @@ -1,3 +1,4 @@ +{{- if .Values.osm-tile-server.enabled }} apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: @@ -15,12 +16,12 @@ spec: hostname: osm.beta.oceanbox.io template: metadata: - name: '{{ env }}-osm-tile-server' + name: '{{- env }}-osm-tile-server' spec: project: aux destination: namespace: oceanbox - server: '{{ cluster }}' + server: '{{- cluster }}' source: repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: HEAD @@ -29,6 +30,7 @@ spec: name: kustomize-helm-with-rewrite parameters: - name: env - string: '{{ env }}' + string: '{{- env }}' - name: hostname - string: '{{ hostname }}' + string: '{{- hostname }}' +{{- end }} diff --git a/apps/plausible.yaml b/apps/sys/templates/plausible.yaml similarity index 97% rename from apps/plausible.yaml rename to apps/sys/templates/plausible.yaml index 9224bd78..16cb1333 100644 --- a/apps/plausible.yaml +++ b/apps/sys/templates/plausible.yaml @@ -1,3 +1,4 @@ +{{- if .Values.plausible.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -65,3 +66,4 @@ spec: enablePodMonitor: true storage: size: 10Gi +{{- end }} diff --git a/apps/rabbitmq.yaml b/apps/sys/templates/rabbitmq.yaml similarity index 81% rename from apps/rabbitmq.yaml rename to apps/sys/templates/rabbitmq.yaml index 09f6b4dc..418dbd50 100644 --- a/apps/rabbitmq.yaml +++ b/apps/sys/templates/rabbitmq.yaml @@ -1,3 +1,4 @@ +{{- if .Values.rabbitmq.enabled }} apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: @@ -15,7 +16,7 @@ spec: hostname: rabbitmq.beta.oceanbox.io template: metadata: - name: '{{ env }}-rabbitmq' + name: '{{- env }}-rabbitmq' spec: project: aux destination: @@ -27,8 +28,9 @@ spec: chart: rabbitmq helm: valueFiles: - - $values/values/rabbitmq/values-{{ env }}.yaml + - $values/values/rabbitmq/values-{{- env }}.yaml - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: main - path: values/rabbitmq/{{ env }} + path: values/rabbitmq/{{- env }} ref: values +{{- end }} diff --git a/apps/redis.yaml b/apps/sys/templates/redis.yaml similarity index 94% rename from apps/redis.yaml rename to apps/sys/templates/redis.yaml index 588d6739..83eccd76 100644 --- a/apps/redis.yaml +++ b/apps/sys/templates/redis.yaml @@ -1,3 +1,4 @@ +{{- if .Values.redis.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -26,3 +27,4 @@ spec: kind: StatefulSet jqPathExpressions: - '.spec.template.spec.containers[].resources.limits.cpu' +{{- end }} diff --git a/apps/seq.yaml b/apps/sys/templates/seq.yaml similarity index 91% rename from apps/seq.yaml rename to apps/sys/templates/seq.yaml index 9420acb9..bcb8f87a 100644 --- a/apps/seq.yaml +++ b/apps/sys/templates/seq.yaml @@ -1,3 +1,4 @@ +{{- if .Values.seq.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -18,3 +19,4 @@ spec: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: main ref: values +{{- end }} diff --git a/apps/prod-sorcerer.yaml b/apps/sys/templates/sorcerer.yaml similarity index 93% rename from apps/prod-sorcerer.yaml rename to apps/sys/templates/sorcerer.yaml index 00a31306..f348fc80 100644 --- a/apps/prod-sorcerer.yaml +++ b/apps/sys/templates/sorcerer.yaml @@ -1,3 +1,5 @@ +{{ if .Values.sorcerer.enabled }} +{{- range .Values.atlantis.envs }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -52,3 +54,5 @@ spec: # automated: # prune: true # selfHeal: false +{{- end }} +{{- end }} diff --git a/apps/sys/templates/velero.yaml b/apps/sys/templates/velero.yaml index 866f878e..1b6142ab 100644 --- a/apps/sys/templates/velero.yaml +++ b/apps/sys/templates/velero.yaml @@ -62,11 +62,7 @@ spec: ## ONLY us-east-1 region is supported by nutanix region: {{ .Values.velero.s3.region }} s3ForcePathStyle: "true" - {{- with .Values.global.velero.s3 }} - {{- if .server }} - s3Url: {{ .protocol }}://{{ .server }}:{{ .port }} - {{- end }} - {{- end }} + s3Url: {{ .Values.velero.s3.url }} {{- if .Values.velero.s3.insecureSkipTLSVerify }} insecureSkipTLSVerify: true {{- end }} diff --git a/apps/wordpress.yaml b/apps/sys/templates/wordpress.yaml similarity index 91% rename from apps/wordpress.yaml rename to apps/sys/templates/wordpress.yaml index 379f5bc8..8529f258 100644 --- a/apps/wordpress.yaml +++ b/apps/sys/templates/wordpress.yaml @@ -1,3 +1,4 @@ +{{- if .Values.wordpress.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -18,3 +19,4 @@ spec: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: HEAD ref: values +{{- end }} diff --git a/apps/yolo-dl.yaml b/apps/sys/templates/yolo-dl.yaml similarity index 87% rename from apps/yolo-dl.yaml rename to apps/sys/templates/yolo-dl.yaml index 19696a26..4184573a 100644 --- a/apps/yolo-dl.yaml +++ b/apps/sys/templates/yolo-dl.yaml @@ -1,3 +1,4 @@ +{{- if .Values.yolo-dl.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -12,3 +13,4 @@ spec: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: main path: charts/yolo-dl +{{- end }} diff --git a/apps/yolo-registry.yaml b/apps/sys/templates/yolo-registry.yaml similarity index 86% rename from apps/yolo-registry.yaml rename to apps/sys/templates/yolo-registry.yaml index bc4727a1..19985466 100644 --- a/apps/yolo-registry.yaml +++ b/apps/sys/templates/yolo-registry.yaml @@ -1,3 +1,4 @@ +{{- if .Values.yolo-registry.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -12,3 +13,4 @@ spec: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: main path: charts/yolo-registry +{{- end }} diff --git a/apps/sys/values.yaml b/apps/sys/values.yaml index b2ea7241..60c925d3 100644 --- a/apps/sys/values.yaml +++ b/apps/sys/values.yaml @@ -48,6 +48,8 @@ cluster_config: # name: github-oidc # allowed_organizations: # allowed_teams: + + argocd: autosync: true version: 7.5.2 @@ -87,10 +89,8 @@ argo_rollouts: metrics: enabled: false dashboard_enabled: false -actions_runner_controller: - enabled: false - autosync: true - version: 0.23.7 + + cilium: enabled: false autosync: true @@ -204,24 +204,6 @@ kubernetes_dashboard: enabled: false autosync: true version: v2.3.1 -gitlab_runner: - enabled: true - autosync: true - version: 0.39.0 - createCertSecret: true - tag: "obx" - s3: - server: "" - access_key: "" - secret_key: "" -postgres_operator: - enabled: true - autosync: true - version: 0.18.2 -rabbitmq_operator: - enabled: false - autosync: true - version: 4.3.27 metrics_server: autosync: true version: 3.8.2 @@ -236,10 +218,6 @@ nginx: controller: cpu: "100m" memory: "100Mi" -jaeger_operator: - enabled: false - autosync: true - version: 1.38.0 kyverno: enabled: false autosync: true @@ -281,6 +259,48 @@ velero: memory: 1Gi limit: memory: 2Gi +x509_exporter: + enabled: true + autosync: true + alerts: true + version: 3.6.0 +downscaler: + enabled: false + autosync: true + version: 0.2.12 + extraConfig: | + DEFAULT_UPTIME: "Mon-Fri 07:00-20:00 Europe/Berlin" + excludedNamespaces: + - py-kube-downscaler + - kube-downscaler + - kube-system + +actions_runner_controller: + enabled: false + autosync: true + version: 0.23.7 +gitlab_runner: + enabled: true + autosync: true + version: 0.39.0 + createCertSecret: true + tag: "obx" + s3: + server: "" + access_key: "" + secret_key: "" +postgres_operator: + enabled: true + autosync: true + version: 0.18.2 +rabbitmq_operator: + enabled: false + autosync: true + version: 4.3.27 +jaeger_operator: + enabled: false + autosync: true + version: 1.38.0 loki: enabled: false autosync: true @@ -319,11 +339,6 @@ promtail: enabled: false autosync: true version: 6.6.1 -x509_exporter: - enabled: true - autosync: true - alerts: true - version: 3.6.0 mariadb_operator: enabled: false autosync: true @@ -336,16 +351,6 @@ chartmuseum: size: 8Gi ingress: enabled: true -downscaler: - enabled: false - autosync: true - version: 0.2.12 - extraConfig: | - DEFAULT_UPTIME: "Mon-Fri 07:00-20:00 Europe/Berlin" - excludedNamespaces: - - py-kube-downscaler - - kube-downscaler - - kube-system clickhouse_operator: enabled: false autosync: true @@ -354,7 +359,34 @@ oncall: enabled: false externalGrafana: url: "" +dapr: + enable: true + +busynix.enable: false +headscale.enable: false +plausible.enable: false +dex.enable: false +keycloak.enable: false +rabbitmq.enable: false +redis.enable: false +wordpress.enable: false +yolo-dl.enable: false +yolo-registry.enable: false +osm-tile-server.enable: false +geoserver.enable: false + atlantis: + enabled: false + envs: + - prod + - staging +sorcerer: + enabled: false + envs: + - prod + - staging +openfga: + enabled: false envs: - prod - staging diff --git a/apps/tempo.yaml b/apps/tempo.yaml index 32727b61..85240ca9 100644 --- a/apps/tempo.yaml +++ b/apps/tempo.yaml @@ -1,3 +1,4 @@ +{{- if .Values.tempo.enabled }} apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -74,3 +75,4 @@ spec: - secretName: tempo-query-tls hosts: - query.tempo.adm.oceanbox.io +{{- end }}