diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 235fc07f0..8a21c4adc 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -51,11 +51,11 @@ // **auto-genereated** section, don't edit manually // #### BEGIN Helm Chart repositories #### - {"matchDepPatterns":"graphops\\/.*","ignoreUnstable":false,"registryUrls":["https://graphops.github.io/launchpad-charts/canary"]}, + {"matchDepPatterns":"graphops\\/.*","registryUrls":["https://graphops.github.io/launchpad-charts/canary"],"ignoreUnstable":false}, {"matchDepPatterns":"ingress-nginx\\/.*","registryUrls":["https://kubernetes.github.io/ingress-nginx"]}, {"matchDepPatterns":"jetstack\\/.*","registryUrls":["https://charts.jetstack.io"]}, {"matchDepPatterns":"prometheus-community\\/.*","registryUrls":["https://prometheus-community.github.io/helm-charts"]}, - {"matchDepPatterns":"deliveryhero\\/.*","registryUrls":["https://charts.deliveryhero.io"]}, + {"matchDepPatterns":"deliveryhero\\/.*","registryUrls":["ghcr.io/deliveryhero/helm-charts/node-problem-detector"]}, {"matchDepPatterns":"grafana\\/.*","registryUrls":["https://grafana.github.io/helm-charts"]}, {"matchDepPatterns":"postgres-operator-charts\\/.*","registryUrls":["https://opensource.zalando.com/postgres-operator/charts/postgres-operator"]}, {"matchDepPatterns":"sealed-secrets\\/.*","registryUrls":["https://bitnami-labs.github.io/sealed-secrets"]}, diff --git a/.husky/commit-msg b/.husky/commit-msg index 4c49ae6ae..2785bc1d2 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - yarn commitlint --edit $1 diff --git a/.husky/pre-commit b/.husky/pre-commit index 36f9c3515..0b0587771 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,6 +1,3 @@ -#!/usr/bin/env sh -. "$(dirname "$0")/_/husky.sh" - readonly BASEDIR="$(dirname -- "$0")" readonly REPOROOT="$(realpath "$BASEDIR/../")" readonly SCRIPTSDIR="$(realpath "$REPOROOT/src/scripts")" diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index b1c7c63c2..aa4a4e15b 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/README.md b/README.md index 19b98a488..5e423ac7f 100644 --- a/README.md +++ b/README.md @@ -223,7 +223,7 @@ This *Namespace* adds software for log and metrics collection and visualization, - [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)
Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules -- [loki](https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed)
+- [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
Helm chart for Grafana Loki in microservices mode - [node-problem-detector](https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector)
This chart installs a node-problem-detector daemonset. This tool aims to make various node problems visible to the upstream layers in cluster management stack. diff --git a/arbitrum/helmfile.yaml b/arbitrum/helmfile.yaml index 050104b15..a3035f975 100644 --- a/arbitrum/helmfile.yaml +++ b/arbitrum/helmfile.yaml @@ -1,5 +1,5 @@ #namespace defaults -{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"one","one":{"targetNamespace":"arbitrum-one","scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"features":["proxyd-classic","proxyd-nitro","arbitrum-classic","arbitrum-nitro"]},"common":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}}},"sepolia":{"targetNamespace":"arbitrum-sepolia","scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"features":["proxyd-nitro","arbitrum-nitro"]}}` | fromJson ) }} +{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}}},"flavor":"one","one":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"targetNamespace":"arbitrum-one","features":["proxyd-classic","proxyd-nitro","arbitrum-classic","arbitrum-nitro"]},"sepolia":{"scaling":{"deployments":1,"arbitrum-classic":{},"arbitrum-nitro":{}},"targetNamespace":"arbitrum-sepolia","features":["proxyd-nitro","arbitrum-nitro"]}}` | fromJson ) }} #set default flavor when missing {{ if not ( hasKey .Values "flavor" ) }} {{ $_ := set .Values "flavor" "one" }} @@ -155,8 +155,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' arbitrum-nitro: {{- if ( .Values | get "arbitrum-nitro" dict | get "chartUrl" false ) }} diff --git a/celo/helmfile.yaml b/celo/helmfile.yaml index 537db2c34..b183783cf 100644 --- a/celo/helmfile.yaml +++ b/celo/helmfile.yaml @@ -1,5 +1,5 @@ #namespace defaults -{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"celo-mainnet","features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"alfajores":{"targetNamespace":"celo-alfajores","features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"common":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"baklava":{"targetNamespace":"celo-baklava","features":["proxyd"],"scaling":{"deployments":1,"celo":{}}}}` | fromJson ) }} +{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}}},"flavor":"mainnet","mainnet":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}},"targetNamespace":"celo-mainnet"},"alfajores":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}},"targetNamespace":"celo-alfajores"},"baklava":{"features":["proxyd"],"scaling":{"deployments":1,"celo":{}},"targetNamespace":"celo-baklava"}}` | fromJson ) }} #set default flavor when missing {{ if not ( hasKey .Values "flavor" ) }} {{ $_ := set .Values "flavor" "mainnet" }} @@ -155,8 +155,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' celo: {{- if ( .Values | get "celo" dict | get "chartUrl" false ) }} diff --git a/ethereum/helmfile.yaml b/ethereum/helmfile.yaml index a6595f446..40686babe 100644 --- a/ethereum/helmfile.yaml +++ b/ethereum/helmfile.yaml @@ -1,5 +1,5 @@ #namespace defaults -{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"eth-mainnet","features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}}},"goerli":{"targetNamespace":"eth-goerli","features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}}},"holesky":{"targetNamespace":"eth-holesky","features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}}},"common":{"features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}}},"sepolia":{"targetNamespace":"eth-sepolia","features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}}}}` | fromJson ) }} +{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}}},"flavor":"mainnet","mainnet":{"features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}},"targetNamespace":"eth-mainnet"},"goerli":{"features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}},"targetNamespace":"eth-goerli"},"holesky":{"features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}},"targetNamespace":"eth-holesky"},"sepolia":{"features":["nimbus","proxyd"],"scaling":{"deployments":1,"erigon":{},"nimbus":{}},"targetNamespace":"eth-sepolia"}}` | fromJson ) }} #set default flavor when missing {{ if not ( hasKey .Values "flavor" ) }} {{ $_ := set .Values "flavor" "mainnet" }} @@ -155,8 +155,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' erigon: {{- if ( .Values | get "erigon" dict | get "chartUrl" false ) }} diff --git a/gnosis/helmfile.yaml b/gnosis/helmfile.yaml index 558021591..b346533e4 100644 --- a/gnosis/helmfile.yaml +++ b/gnosis/helmfile.yaml @@ -1,5 +1,5 @@ #namespace defaults -{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"gnosis-mainnet","features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}},"common":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}},"chiado":{"targetNamespace":"gnosis-chiado","features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}}}` | fromJson ) }} +{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}}},"flavor":"mainnet","mainnet":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}},"targetNamespace":"gnosis-mainnet"},"chiado":{"features":["erigon","lighthouse","proxyd"],"scaling":{"deployments":1,"erigon":{},"lighthouse":{}},"targetNamespace":"gnosis-chiado"}}` | fromJson ) }} #set default flavor when missing {{ if not ( hasKey .Values "flavor" ) }} {{ $_ := set .Values "flavor" "mainnet" }} @@ -155,8 +155,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' erigon: {{- if ( .Values | get "erigon" dict | get "chartUrl" false ) }} diff --git a/graph/helmfile.yaml b/graph/helmfile.yaml index 03c43ecb8..91d18523a 100644 --- a/graph/helmfile.yaml +++ b/graph/helmfile.yaml @@ -1,5 +1,5 @@ #namespace defaults -{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"graph-mainnet","features":["subgraph-radio"]},"arbitrum-one":{"targetNamespace":"graph-arbitrum-one","features":["subgraph-radio"]},"common":{"features":["subgraph-radio"]},"arbitrum-sepolia":{"targetNamespace":"graph-arbitrum-sepolia","features":["subgraph-radio"]}}` | fromJson ) }} +{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["subgraph-radio"]},"flavor":"mainnet","mainnet":{"features":["subgraph-radio"],"targetNamespace":"graph-mainnet"},"arbitrum-one":{"features":["subgraph-radio"],"targetNamespace":"graph-arbitrum-one"},"arbitrum-sepolia":{"features":["subgraph-radio"],"targetNamespace":"graph-arbitrum-sepolia"}}` | fromJson ) }} #set default flavor when missing {{ if not ( hasKey .Values "flavor" ) }} {{ $_ := set .Values "flavor" "mainnet" }} @@ -143,8 +143,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' graph-node: {{- if ( .Values | get "graph-node" dict | get "chartUrl" false ) }} diff --git a/ingress/helmfile.yaml b/ingress/helmfile.yaml index 3f369b932..f9d222aa7 100644 --- a/ingress/helmfile.yaml +++ b/ingress/helmfile.yaml @@ -143,8 +143,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' ingress-nginx: {{- if ( .Values | get "ingress-nginx" dict | get "chartUrl" false ) }} diff --git a/monitoring/README.md b/monitoring/README.md index cb78a3913..122ba6b57 100644 --- a/monitoring/README.md +++ b/monitoring/README.md @@ -9,7 +9,7 @@ This *Namespace* adds software for log and metrics collection and visualization, ## Releases - [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)
Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules -- [loki](https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed)
+- [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
Helm chart for Grafana Loki in microservices mode - [node-problem-detector](https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector)
This chart installs a node-problem-detector daemonset. This tool aims to make various node problems visible to the upstream layers in cluster management stack. diff --git a/monitoring/helmfile.yaml b/monitoring/helmfile.yaml index db4f00a84..d731744f2 100644 --- a/monitoring/helmfile.yaml +++ b/monitoring/helmfile.yaml @@ -137,14 +137,14 @@ repositories: - name: prometheus-community url: https://prometheus-community.github.io/helm-charts - name: deliveryhero - url: https://charts.deliveryhero.io + url: https://raw.githubusercontent.com/deliveryhero/helm-charts/refs/heads/master/ - name: grafana url: https://grafana.github.io/helm-charts templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' kube-prometheus-stack: {{- if ( .Values | get "kube-prometheus-stack" dict | get "chartUrl" false ) }} @@ -158,7 +158,7 @@ templates: version: {{ .Values | get "kube-prometheus-stack" | get "chartVersion" }} {{- end }} {{- if (not (or ( .Values | get "kube-prometheus-stack" dict | get "chartVersion" false ) ( .Values | get "kube-prometheus-stack" dict | get "chartUrl" false ) )) }} - version: "60.3.0" + version: "79.5.0" {{- end }} disableValidationOnInstall: true @@ -174,14 +174,14 @@ templates: version: {{ .Values | get "node-problem-detector" | get "chartVersion" }} {{- end }} {{- if (not (or ( .Values | get "node-problem-detector" dict | get "chartVersion" false ) ( .Values | get "node-problem-detector" dict | get "chartUrl" false ) )) }} - version: "2.3.13" + version: "2.3.22" {{- end }} loki: {{- if ( .Values | get "loki" dict | get "chartUrl" false ) }} chart: {{ .Values | get "loki" | get "chartUrl" }} {{- else }} - chart: "grafana/loki-distributed" + chart: "grafana/loki" {{- end }} inherit: - template: "defaults" @@ -189,7 +189,7 @@ templates: version: {{ .Values | get "loki" | get "chartVersion" }} {{- end }} {{- if (not (or ( .Values | get "loki" dict | get "chartVersion" false ) ( .Values | get "loki" dict | get "chartUrl" false ) )) }} - version: "0.79.0" + version: "6.36.1" {{- end }} promtail: @@ -204,7 +204,7 @@ templates: version: {{ .Values | get "promtail" | get "chartVersion" }} {{- end }} {{- if (not (or ( .Values | get "promtail" dict | get "chartVersion" false ) ( .Values | get "promtail" dict | get "chartUrl" false ) )) }} - version: "6.16.0" + version: "6.16.6" {{- end }} releases: diff --git a/monitoring/values/kube-prometheus-stack.yaml b/monitoring/values/kube-prometheus-stack.yaml index 59fe4b509..415b521fa 100644 --- a/monitoring/values/kube-prometheus-stack.yaml +++ b/monitoring/values/kube-prometheus-stack.yaml @@ -57,7 +57,7 @@ grafana: - name: Loki access: proxy type: loki - url: http://loki-loki-distributed-gateway + url: http://loki-gateway version: 1 sidecar: logLevel: DEBUG diff --git a/monitoring/values/loki.yaml b/monitoring/values/loki.yaml index 70bd9b93b..501dfdf24 100644 --- a/monitoring/values/loki.yaml +++ b/monitoring/values/loki.yaml @@ -1,29 +1,73 @@ -ingester: - persistence: - enabled: true # change to true to enable - claims: - - name: data - size: 20Gi - storageClass: openebs-rawfile-localpv # change if not using openebs-rawfile-localpv - loki: auth_enabled: false extraArgs: - -config.expand-env=true schemaConfig: configs: - - from: 2022-01-01 - store: boltdb-shipper - object_store: filesystem - schema: v11 + - from: 2024-04-01 + store: tsdb + object_store: s3 + schema: v13 index: prefix: loki_index_ period: 24h storageConfig: - boltdb_shipper: - shared_store: filesystem - active_index_directory: /var/loki/index - cache_location: /var/loki/cache - cache_ttl: 168h filesystem: directory: /var/loki/chunks + ingester: + chunk_encoding: snappy + tracing: + enabled: true + querier: + # Default is 4, if you have enough memory and CPU you can increase, reduce if OOMing + max_concurrent: 4 + +#gateway: +# ingress: +# enabled: true +# hosts: +# - host: FIXME +# paths: +# - path: / +# pathType: Prefix + +deploymentMode: Distributed + +ingester: + replicas: 3 +querier: + replicas: 3 + maxUnavailable: 2 +queryFrontend: + replicas: 2 + maxUnavailable: 1 +queryScheduler: + replicas: 2 +distributor: + replicas: 3 + maxUnavailable: 2 +compactor: + replicas: 1 +indexGateway: + replicas: 2 + maxUnavailable: 1 + +bloomCompactor: + replicas: 0 +bloomGateway: + replicas: 0 + +# Enable minio for storage +minio: + enabled: true + +# Zero out replica counts of other deployment modes +backend: + replicas: 0 +read: + replicas: 0 +write: + replicas: 0 + +singleBinary: + replicas: 0 diff --git a/monitoring/values/promtail.yaml b/monitoring/values/promtail.yaml index 23b2a8a5f..f902a29b9 100644 --- a/monitoring/values/promtail.yaml +++ b/monitoring/values/promtail.yaml @@ -1,7 +1,7 @@ config: - lokiAddress: http://loki-loki-distributed-gateway/loki/api/v1/push + lokiAddress: http://loki-gateway/loki/api/v1/push clients: - - url: http://loki-loki-distributed-gateway/loki/api/v1/push + - url: http://loki-gateway/loki/api/v1/push containerSecurityContext: privileged: true allowPrivilegeEscalation: true diff --git a/polygon/helmfile.yaml b/polygon/helmfile.yaml index 596c5921e..1d10d661b 100644 --- a/polygon/helmfile.yaml +++ b/polygon/helmfile.yaml @@ -1,5 +1,5 @@ #namespace defaults -{{ $_ := set .Values "_namespaceDefaults" ( `{"flavor":"mainnet","mainnet":{"targetNamespace":"polygon-mainnet","features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}},"common":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}},"amoy":{"targetNamespace":"polygon-amoy","features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}}}` | fromJson ) }} +{{ $_ := set .Values "_namespaceDefaults" ( `{"common":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}}},"flavor":"mainnet","mainnet":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}},"targetNamespace":"polygon-mainnet"},"amoy":{"features":["proxyd","erigon","heimdall","heimdall-ha-svc"],"scaling":{"deployments":1,"erigon":{},"heimdall":{}},"targetNamespace":"polygon-amoy"}}` | fromJson ) }} #set default flavor when missing {{ if not ( hasKey .Values "flavor" ) }} {{ $_ := set .Values "flavor" "mainnet" }} @@ -155,8 +155,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' erigon: {{- if ( .Values | get "erigon" dict | get "chartUrl" false ) }} diff --git a/postgres-operator/helmfile.yaml b/postgres-operator/helmfile.yaml index 92832629b..eca1477e8 100644 --- a/postgres-operator/helmfile.yaml +++ b/postgres-operator/helmfile.yaml @@ -134,8 +134,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' postgres-operator: {{- if ( .Values | get "postgres-operator" dict | get "chartUrl" false ) }} diff --git a/schema.json b/schema.json index 2d5c002e6..2bcf269c9 100644 --- a/schema.json +++ b/schema.json @@ -849,14 +849,6 @@ "$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_nitro" } ], - "enum": [ - [ - "proxyd-classic", - "proxyd-nitro", - "arbitrum-classic", - "arbitrum-nitro" - ] - ], "default": [ "proxyd-classic", "proxyd-nitro", @@ -896,12 +888,6 @@ "$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_nitro" } ], - "enum": [ - [ - "proxyd-nitro", - "arbitrum-nitro" - ] - ], "default": [ "proxyd-nitro", "arbitrum-nitro" @@ -942,34 +928,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/OffchainLabs/nitro/" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "arbitrum-nitro" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Nitro is the latest iteration of the Arbitrum technology. It is a fully integrated, complete layer 2 optimistic rollup system, including fraud proofs, the sequencer, the token bridges, advanced calldata compression, and more." + "https://github.com/OffchainLabs/nitro/" ] }, - "name": { + "description": { "type": "string", "enum": [ - "arbitrum-nitro" + "Nitro is the latest iteration of the Arbitrum technology. It is a fully integrated, complete layer 2 optimistic rollup system, including fraud proofs, the sequencer, the token bridges, advanced calldata compression, and more." ] } } @@ -1025,34 +1011,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/OffchainLabs/arbitrum-classic" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "arbitrum-classic" ] }, - "description": { + "url": { "type": "string", "enum": [ - "The old \"classic\" Arbitrum tech stack." + "https://github.com/OffchainLabs/arbitrum-classic" ] }, - "name": { + "description": { "type": "string", "enum": [ - "arbitrum-classic" + "The old \"classic\" Arbitrum tech stack." ] } } @@ -1108,34 +1094,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "proxyd" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." + "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "name": { + "description": { "type": "string", "enum": [ - "proxyd" + "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." ] } } @@ -1184,34 +1170,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "proxyd" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." + "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "name": { + "description": { "type": "string", "enum": [ - "proxyd" + "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." ] } } @@ -1463,7 +1449,12 @@ "type": "object", "properties": { "flavor": { - "$ref": "#/components/schemas/namespaces.arbitrum.flavor.enum" + "type": "string", + "enum": [ + "one", + "sepolia" + ], + "default": "one" }, "targetNamespace": { "description": "the default is arbitrum-", @@ -1472,14 +1463,102 @@ }, "features": { "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.arbitrum.features.enum" - }, "default": [ "proxyd-classic", "proxyd-nitro", "arbitrum-classic", "arbitrum-nitro" + ], + "oneOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.proxyd_classic" + }, + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.proxyd_nitro" + }, + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_classic" + }, + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_nitro" + } + ] + }, + { + "allOf": [ + { + "items": { + "$ref": "#/components/schemas/namespaces.arbitrum.features.enum" + } + }, + { + "not": { + "anyOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.proxyd_classic" + }, + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.proxyd_nitro" + }, + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_classic" + }, + { + "$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_nitro" + } + ] + } + ] + } + } + ] + } + ] + }, + "scaling": { + "type": "object", + "default": { + "deployments": 1, + "arbitrum-classic": {}, + "arbitrum-nitro": {} + }, + "oneOf": [ + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.arbitrum.defaults.one.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.arbitrum.scaling" + } + ] + } + } + ] + }, + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.arbitrum.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.arbitrum.defaults.one.scaling" + } + ] + } + } + ] + } ] }, "arbitrum-nitro": { @@ -1491,9 +1570,6 @@ "proxyd-nitro": { "$ref": "#/components/schemas/base.releaseValues" }, - "scaling": { - "$ref": "#/components/schemas/namespaces.arbitrum.scaling" - }, "proxyd-classic": { "$ref": "#/components/schemas/base.releaseValues" } @@ -1640,34 +1716,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/celo-org/celo-blockchain" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "celo" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Official golang implementation of the Celo blockchain" + "https://github.com/celo-org/celo-blockchain" ] }, - "name": { + "description": { "type": "string", "enum": [ - "celo" + "Official golang implementation of the Celo blockchain" ] } } @@ -1720,34 +1796,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "proxyd" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." + "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "name": { + "description": { "type": "string", "enum": [ - "proxyd" + "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." ] } } @@ -1848,11 +1924,6 @@ "$ref": "#/components/schemas/namespaces.celo.features.proxyd" } ], - "enum": [ - [ - "proxyd" - ] - ], "default": [ "proxyd" ] @@ -1993,7 +2064,13 @@ "type": "object", "properties": { "flavor": { - "$ref": "#/components/schemas/namespaces.celo.flavor.enum" + "type": "string", + "enum": [ + "mainnet", + "alfajores", + "baklava" + ], + "default": "mainnet" }, "targetNamespace": { "description": "the default is celo-", @@ -2009,12 +2086,50 @@ "proxyd" ] }, + "scaling": { + "type": "object", + "default": { + "deployments": 1, + "celo": {} + }, + "oneOf": [ + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.celo.defaults.mainnet.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.celo.scaling" + } + ] + } + } + ] + }, + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.celo.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.celo.defaults.mainnet.scaling" + } + ] + } + } + ] + } + ] + }, "celo": { "$ref": "#/components/schemas/base.releaseValues" }, - "scaling": { - "$ref": "#/components/schemas/namespaces.celo.scaling" - }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -2184,34 +2299,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ledgerwatch/erigon" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "erigon" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." + "https://github.com/ledgerwatch/erigon" ] }, - "name": { + "description": { "type": "string", "enum": [ - "erigon" + "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." ] } } @@ -2264,34 +2379,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/status-im/nimbus-eth2" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "nimbus" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Nimbus-eth2 is an extremely efficient consensus layer (eth2) client implementation." + "https://github.com/status-im/nimbus-eth2" ] }, - "name": { + "description": { "type": "string", "enum": [ - "nimbus" + "Nimbus-eth2 is an extremely efficient consensus layer (eth2) client implementation." ] } } @@ -2347,34 +2462,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "proxyd" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." + "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "name": { + "description": { "type": "string", "enum": [ - "proxyd" + "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." ] } } @@ -2478,12 +2593,6 @@ "$ref": "#/components/schemas/namespaces.ethereum.features.proxyd" } ], - "enum": [ - [ - "nimbus", - "proxyd" - ] - ], "default": [ "nimbus", "proxyd" @@ -2654,7 +2763,14 @@ "type": "object", "properties": { "flavor": { - "$ref": "#/components/schemas/namespaces.ethereum.flavor.enum" + "type": "string", + "enum": [ + "mainnet", + "goerli", + "holesky", + "sepolia" + ], + "default": "mainnet" }, "targetNamespace": { "description": "the default is eth-", @@ -2663,12 +2779,88 @@ }, "features": { "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.ethereum.features.enum" - }, "default": [ "nimbus", "proxyd" + ], + "oneOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.ethereum.features.nimbus" + }, + { + "$ref": "#/components/schemas/namespaces.ethereum.features.proxyd" + } + ] + }, + { + "allOf": [ + { + "items": { + "$ref": "#/components/schemas/namespaces.ethereum.features.enum" + } + }, + { + "not": { + "anyOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.ethereum.features.nimbus" + }, + { + "$ref": "#/components/schemas/namespaces.ethereum.features.proxyd" + } + ] + } + ] + } + } + ] + } + ] + }, + "scaling": { + "type": "object", + "default": { + "deployments": 1, + "erigon": {}, + "nimbus": {} + }, + "oneOf": [ + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.ethereum.defaults.mainnet.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.ethereum.scaling" + } + ] + } + } + ] + }, + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.ethereum.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.ethereum.defaults.mainnet.scaling" + } + ] + } + } + ] + } ] }, "erigon": { @@ -2677,9 +2869,6 @@ "nimbus": { "$ref": "#/components/schemas/base.releaseValues" }, - "scaling": { - "$ref": "#/components/schemas/namespaces.ethereum.scaling" - }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -2806,34 +2995,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ledgerwatch/erigon" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "erigon" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." + "https://github.com/ledgerwatch/erigon" ] }, - "name": { + "description": { "type": "string", "enum": [ - "erigon" + "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." ] } } @@ -2889,34 +3078,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/sigp/lighthouse" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "lighthouse" ] }, - "description": { + "url": { "type": "string", "enum": [ - "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime." + "https://github.com/sigp/lighthouse" ] }, - "name": { + "description": { "type": "string", "enum": [ - "lighthouse" + "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime." ] } } @@ -2972,34 +3161,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "proxyd" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." + "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "name": { + "description": { "type": "string", "enum": [ - "proxyd" + "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." ] } } @@ -3106,13 +3295,6 @@ "$ref": "#/components/schemas/namespaces.gnosis.features.proxyd" } ], - "enum": [ - [ - "erigon", - "lighthouse", - "proxyd" - ] - ], "default": [ "erigon", "lighthouse", @@ -3276,30 +3458,75 @@ "type": "object", "properties": { "flavor": { - "$ref": "#/components/schemas/namespaces.gnosis.flavor.enum" + "type": "string", + "enum": [ + "mainnet", + "chiado" + ], + "default": "mainnet" }, "targetNamespace": { "description": "the default is gnosis-", "type": "string", "default": "gnosis-mainnet" }, - "erigon": { - "$ref": "#/components/schemas/base.releaseValues" - }, - "lighthouse": { - "$ref": "#/components/schemas/base.releaseValues" - }, "features": { "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.gnosis.features.enum" - }, "default": [ "erigon", "lighthouse", "proxyd" + ], + "oneOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.gnosis.features.erigon" + }, + { + "$ref": "#/components/schemas/namespaces.gnosis.features.lighthouse" + }, + { + "$ref": "#/components/schemas/namespaces.gnosis.features.proxyd" + } + ] + }, + { + "allOf": [ + { + "items": { + "$ref": "#/components/schemas/namespaces.gnosis.features.enum" + } + }, + { + "not": { + "anyOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.gnosis.features.erigon" + }, + { + "$ref": "#/components/schemas/namespaces.gnosis.features.lighthouse" + }, + { + "$ref": "#/components/schemas/namespaces.gnosis.features.proxyd" + } + ] + } + ] + } + } + ] + } ] }, + "erigon": { + "$ref": "#/components/schemas/base.releaseValues" + }, + "lighthouse": { + "$ref": "#/components/schemas/base.releaseValues" + }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -3449,34 +3676,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphprotocol/graph-node" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "graph-node" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Graph Node is an open source Rust implementation that event sources the Ethereum blockchain to deterministically update a data store that can be queried via the GraphQL endpoint." + "https://github.com/graphprotocol/graph-node" ] }, - "name": { + "description": { "type": "string", "enum": [ - "graph-node" + "Graph Node is an open source Rust implementation that event sources the Ethereum blockchain to deterministically update a data store that can be queried via the GraphQL endpoint." ] } } @@ -3492,34 +3719,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphprotocol/indexer" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "graph-network-indexer" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Graph protocol indexer components" + "https://github.com/graphprotocol/indexer" ] }, - "name": { + "description": { "type": "string", "enum": [ - "graph-network-indexer" + "Graph protocol indexer components" ] } } @@ -3535,34 +3762,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/docker-builds/tree/main/dockerfiles/graph-toolbox" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "graph-toolbox" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Utility kit for interacting and managing the Graph indexer stack." + "https://github.com/graphops/docker-builds/tree/main/dockerfiles/graph-toolbox" ] }, - "name": { + "description": { "type": "string", "enum": [ - "graph-toolbox" + "Utility kit for interacting and managing the Graph indexer stack." ] } } @@ -3578,34 +3805,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "resource-injector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "resource-injector" + "Manage Raw Kubernetes Resources using Helm" ] } } @@ -3621,34 +3848,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "resource-injector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "resource-injector" + "Manage Raw Kubernetes Resources using Helm" ] } } @@ -3665,34 +3892,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/subgraph-radio" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "subgraph-radio" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Gossip about Subgraphs with other Graph Protocol Indexers" + "https://github.com/graphops/subgraph-radio" ] }, - "name": { + "description": { "type": "string", "enum": [ - "subgraph-radio" + "Gossip about Subgraphs with other Graph Protocol Indexers" ] } } @@ -3743,11 +3970,6 @@ "$ref": "#/components/schemas/namespaces.graph.features.subgraph_radio" } ], - "enum": [ - [ - "subgraph-radio" - ] - ], "default": [ "subgraph-radio" ] @@ -3838,13 +4060,28 @@ "type": "object", "properties": { "flavor": { - "$ref": "#/components/schemas/namespaces.graph.flavor.enum" + "type": "string", + "enum": [ + "mainnet", + "arbitrum-one", + "arbitrum-sepolia" + ], + "default": "mainnet" }, "targetNamespace": { "description": "the default is graph-", "type": "string", "default": "graph-mainnet" }, + "features": { + "type": "array", + "items": { + "$ref": "#/components/schemas/namespaces.graph.features.enum" + }, + "default": [ + "subgraph-radio" + ] + }, "graph-node": { "$ref": "#/components/schemas/base.releaseValues" }, @@ -3860,15 +4097,6 @@ "graph-database": { "$ref": "#/components/schemas/base.releaseValues" }, - "features": { - "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.graph.features.enum" - }, - "default": [ - "subgraph-radio" - ] - }, "subgraph-radio": { "$ref": "#/components/schemas/base.releaseValues" } @@ -3938,34 +4166,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx" + "ingress-nginx" ] }, - "repository": { + "name": { "type": "string", "enum": [ "ingress-nginx" ] }, - "description": { + "url": { "type": "string", "enum": [ - "ingress-nginx is an Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer." + "https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx" ] }, - "name": { + "description": { "type": "string", "enum": [ - "ingress-nginx" + "ingress-nginx is an Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer." ] } } @@ -3985,34 +4213,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/cert-manager/cert-manager" + "jetstack" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "jetstack" + "cert-manager" ] }, - "description": { + "url": { "type": "string", "enum": [ - "cert-manager adds certificates and certificate issuers as resource types in Kubernetes clusters, and simplifies the process of obtaining, renewing and using those certificates." + "https://github.com/cert-manager/cert-manager" ] }, - "name": { + "description": { "type": "string", "enum": [ - "cert-manager" + "cert-manager adds certificates and certificate issuers as resource types in Kubernetes clusters, and simplifies the process of obtaining, renewing and using those certificates." ] } } @@ -4032,34 +4260,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "resource-injector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "resource-injector" + "Manage Raw Kubernetes Resources using Helm" ] } } @@ -4127,12 +4355,6 @@ "$ref": "#/components/schemas/namespaces.ingress.features.certManager" } ], - "enum": [ - [ - "ingress", - "cert-manager" - ] - ], "default": [ "ingress", "cert-manager" @@ -4204,22 +4426,56 @@ "type": "string", "default": "ingress" }, - "ingress-nginx": { - "$ref": "#/components/schemas/base.releaseValues" - }, - "cert-manager": { - "$ref": "#/components/schemas/base.releaseValues" - }, "features": { "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.ingress.features.enum" - }, "default": [ "ingress", "cert-manager" + ], + "oneOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.ingress.features.ingress" + }, + { + "$ref": "#/components/schemas/namespaces.ingress.features.certManager" + } + ] + }, + { + "allOf": [ + { + "items": { + "$ref": "#/components/schemas/namespaces.ingress.features.enum" + } + }, + { + "not": { + "anyOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.ingress.features.ingress" + }, + { + "$ref": "#/components/schemas/namespaces.ingress.features.certManager" + } + ] + } + ] + } + } + ] + } ] }, + "ingress-nginx": { + "$ref": "#/components/schemas/base.releaseValues" + }, + "cert-manager": { + "$ref": "#/components/schemas/base.releaseValues" + }, "cert-manager-resources": { "$ref": "#/components/schemas/base.releaseValues" } @@ -4290,34 +4546,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack" + "prometheus-community" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "prometheus-community" + "kube-prometheus-stack" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules" + "https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack" ] }, - "name": { + "description": { "type": "string", "enum": [ - "kube-prometheus-stack" + "Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules" ] } } @@ -4337,34 +4593,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector" + "deliveryhero" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "deliveryhero" + "node-problem-detector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "This chart installs a node-problem-detector daemonset. This tool aims to make various node problems visible to the upstream layers in cluster management stack." + "https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "node-problem-detector" + "This chart installs a node-problem-detector daemonset. This tool aims to make various node problems visible to the upstream layers in cluster management stack." ] } } @@ -4384,34 +4640,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed" + "grafana" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "grafana" + "loki" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Helm chart for Grafana Loki in microservices mode" + "https://github.com/grafana/loki/tree/main/production/helm/loki" ] }, - "name": { + "description": { "type": "string", "enum": [ - "loki-distributed" + "Helm chart for Grafana Loki in microservices mode" ] } } @@ -4431,34 +4687,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/grafana/helm-charts/tree/main/charts/promtail" + "grafana" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "grafana" + "promtail" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Promtail is an agent which ships the contents of local logs to a Loki instance" + "https://github.com/grafana/helm-charts/tree/main/charts/promtail" ] }, - "name": { + "description": { "type": "string", "enum": [ - "promtail" + "Promtail is an agent which ships the contents of local logs to a Loki instance" ] } } @@ -4526,12 +4782,6 @@ "$ref": "#/components/schemas/namespaces.monitoring.features.logs" } ], - "enum": [ - [ - "metrics", - "logs" - ] - ], "default": [ "metrics", "logs" @@ -4604,6 +4854,50 @@ "type": "string", "default": "monitoring" }, + "features": { + "type": "array", + "default": [ + "metrics", + "logs" + ], + "oneOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.monitoring.features.metrics" + }, + { + "$ref": "#/components/schemas/namespaces.monitoring.features.logs" + } + ] + }, + { + "allOf": [ + { + "items": { + "$ref": "#/components/schemas/namespaces.monitoring.features.enum" + } + }, + { + "not": { + "anyOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.monitoring.features.metrics" + }, + { + "$ref": "#/components/schemas/namespaces.monitoring.features.logs" + } + ] + } + ] + } + } + ] + } + ] + }, "kube-prometheus-stack": { "$ref": "#/components/schemas/base.releaseValues" }, @@ -4613,16 +4907,6 @@ "loki": { "$ref": "#/components/schemas/base.releaseValues" }, - "features": { - "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.monitoring.features.enum" - }, - "default": [ - "metrics", - "logs" - ] - }, "promtail": { "$ref": "#/components/schemas/base.releaseValues" } @@ -4750,34 +5034,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ledgerwatch/erigon" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "erigon" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." + "https://github.com/ledgerwatch/erigon" ] }, - "name": { + "description": { "type": "string", "enum": [ - "erigon" + "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." ] } } @@ -4833,34 +5117,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/maticnetwork/heimdall" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "heimdall" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Validator node for Matic Network." + "https://github.com/maticnetwork/heimdall" ] }, - "name": { + "description": { "type": "string", "enum": [ - "heimdall" + "Validator node for Matic Network." ] } } @@ -4916,34 +5200,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "resource-injector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "resource-injector" + "Manage Raw Kubernetes Resources using Helm" ] } } @@ -4992,34 +5276,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "proxyd" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." + "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "name": { + "description": { "type": "string", "enum": [ - "proxyd" + "Proxyd is an EVM-blockchain JSON-RPC router and load balancer developed in Go by Optimism. It is capable of load balancing, automatic failover, intelligent request routing and very basic caching." ] } } @@ -5129,14 +5413,6 @@ "$ref": "#/components/schemas/namespaces.polygon.features.heimdall_ha_svc" } ], - "enum": [ - [ - "proxyd", - "erigon", - "heimdall", - "heimdall-ha-svc" - ] - ], "default": [ "proxyd", "erigon", @@ -5291,41 +5567,134 @@ "type": "integer", "minimum": 1 } - } + } + }, + "heimdall": { + "type": "object", + "properties": { + "deployments": { + "type": "integer", + "minimum": 1 + } + } + } + } + }, + "namespaces.polygon.values": { + "description": "polygon namespace values schema", + "type": "object", + "properties": { + "flavor": { + "type": "string", + "enum": [ + "mainnet", + "amoy" + ], + "default": "mainnet" + }, + "targetNamespace": { + "description": "the default is polygon-", + "type": "string", + "default": "polygon-mainnet" + }, + "features": { + "type": "array", + "default": [ + "proxyd", + "erigon", + "heimdall", + "heimdall-ha-svc" + ], + "oneOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.polygon.features.proxyd" + }, + { + "$ref": "#/components/schemas/namespaces.polygon.features.erigon" + }, + { + "$ref": "#/components/schemas/namespaces.polygon.features.heimdall" + }, + { + "$ref": "#/components/schemas/namespaces.polygon.features.heimdall_ha_svc" + } + ] + }, + { + "allOf": [ + { + "items": { + "$ref": "#/components/schemas/namespaces.polygon.features.enum" + } + }, + { + "not": { + "anyOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.polygon.features.proxyd" + }, + { + "$ref": "#/components/schemas/namespaces.polygon.features.erigon" + }, + { + "$ref": "#/components/schemas/namespaces.polygon.features.heimdall" + }, + { + "$ref": "#/components/schemas/namespaces.polygon.features.heimdall_ha_svc" + } + ] + } + ] + } + } + ] + } + ] }, - "heimdall": { + "scaling": { "type": "object", - "properties": { - "deployments": { - "type": "integer", - "minimum": 1 - } - } - } - } - }, - "namespaces.polygon.values": { - "description": "polygon namespace values schema", - "type": "object", - "properties": { - "flavor": { - "$ref": "#/components/schemas/namespaces.polygon.flavor.enum" - }, - "targetNamespace": { - "description": "the default is polygon-", - "type": "string", - "default": "polygon-mainnet" - }, - "features": { - "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.polygon.features.enum" + "default": { + "deployments": 1, + "erigon": {}, + "heimdall": {} }, - "default": [ - "proxyd", - "erigon", - "heimdall", - "heimdall-ha-svc" + "oneOf": [ + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.polygon.defaults.mainnet.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.polygon.scaling" + } + ] + } + } + ] + }, + { + "allOf": [ + { + "$ref": "#/components/schemas/namespaces.polygon.scaling" + }, + { + "not": { + "anyOf": [ + { + "$ref": "#/components/schemas/namespaces.polygon.defaults.mainnet.scaling" + } + ] + } + } + ] + } ] }, "erigon": { @@ -5337,9 +5706,6 @@ "heimdall-ha-svc": { "$ref": "#/components/schemas/base.releaseValues" }, - "scaling": { - "$ref": "#/components/schemas/namespaces.polygon.scaling" - }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -5406,34 +5772,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/zalando/postgres-operator" + "postgres-operator-charts" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "postgres-operator-charts" + "postgres-operator" ] }, - "description": { + "url": { "type": "string", "enum": [ - "The Postgres Operator delivers an easy to run highly-available PostgreSQL clusters on Kubernetes (K8s) powered by Patroni." + "https://github.com/zalando/postgres-operator" ] }, - "name": { + "description": { "type": "string", "enum": [ - "postgres-operator" + "The Postgres Operator delivers an easy to run highly-available PostgreSQL clusters on Kubernetes (K8s) powered by Patroni." ] } } @@ -5595,34 +5961,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/bitnami/charts/tree/main/bitnami/sealed-secrets" + "sealed-secrets" ] }, - "repository": { + "name": { "type": "string", "enum": [ "sealed-secrets" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Sealed Secrets are 'one-way' encrypted K8s Secrets that can be created by anyone, but can only be decrypted by the controller running in the target cluster recovering the original object." + "https://github.com/bitnami/charts/tree/main/bitnami/sealed-secrets" ] }, - "name": { + "description": { "type": "string", "enum": [ - "sealed-secrets" + "Sealed Secrets are 'one-way' encrypted K8s Secrets that can be created by anyone, but can only be decrypted by the controller running in the target cluster recovering the original object." ] } } @@ -5827,34 +6193,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/openebs/openebs" + "openebs" ] }, - "repository": { + "name": { "type": "string", "enum": [ "openebs" ] }, - "description": { + "url": { "type": "string", "enum": [ - "OpenEBS is the leading open-source example of a category of cloud native storage solutions sometimes called Container Attached Storage." + "https://github.com/openebs/openebs" ] }, - "name": { + "description": { "type": "string", "enum": [ - "openebs" + "OpenEBS is the leading open-source example of a category of cloud native storage solutions sometimes called Container Attached Storage." ] } } @@ -5871,34 +6237,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/openebs-rawfile-localpv" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "openebs-rawfile-localpv" ] }, - "description": { + "url": { "type": "string", "enum": [ - "RawFile Driver Container Storage Interface" + "https://github.com/graphops/launchpad-charts/tree/main/charts/openebs-rawfile-localpv" ] }, - "name": { + "description": { "type": "string", "enum": [ - "openebs-rawfile-localpv" + "RawFile Driver Container Storage Interface" ] } } @@ -5918,34 +6284,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "resource-injector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "resource-injector" + "Manage Raw Kubernetes Resources using Helm" ] } } @@ -5965,34 +6331,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/openebs/zfs-localpv/tree/b70fb1e847b8c9ba32e3fd8cba877767686f6b26" + "openebs-zfs-localpv" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "openebs-zfs-localpv" + "zfs-localpv" ] }, - "description": { + "url": { "type": "string", "enum": [ - "CSI driver for provisioning Local PVs backed by ZFS and more." + "https://github.com/openebs/zfs-localpv/tree/b70fb1e847b8c9ba32e3fd8cba877767686f6b26" ] }, - "name": { + "description": { "type": "string", "enum": [ - "zfs-localpv" + "CSI driver for provisioning Local PVs backed by ZFS and more." ] } } @@ -6012,34 +6378,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "resource-injector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "resource-injector" + "Manage Raw Kubernetes Resources using Helm" ] } } @@ -6059,34 +6425,34 @@ "chart": { "type": "object", "required": [ - "url", "repository", - "description", - "name" + "name", + "url", + "description" ], "properties": { - "url": { + "repository": { "type": "string", "enum": [ - "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" + "graphops" ] }, - "repository": { + "name": { "type": "string", "enum": [ - "graphops" + "resource-injector" ] }, - "description": { + "url": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "name": { + "description": { "type": "string", "enum": [ - "resource-injector" + "Manage Raw Kubernetes Resources using Helm" ] } } @@ -6120,11 +6486,6 @@ "$ref": "#/components/schemas/namespaces.storage.features.rawfile" } ], - "enum": [ - [ - "rawfile" - ] - ], "default": [ "rawfile" ] @@ -6195,6 +6556,43 @@ "type": "string", "default": "storage" }, + "features": { + "type": "array", + "default": [ + "rawfile" + ], + "oneOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.storage.features.rawfile" + } + ] + }, + { + "allOf": [ + { + "items": { + "$ref": "#/components/schemas/namespaces.storage.features.enum" + } + }, + { + "not": { + "anyOf": [ + { + "items": [ + { + "$ref": "#/components/schemas/namespaces.storage.features.rawfile" + } + ] + } + ] + } + } + ] + } + ] + }, "openebs": { "$ref": "#/components/schemas/base.releaseValues" }, @@ -6210,15 +6608,6 @@ "openebs-zfs-storageclass": { "$ref": "#/components/schemas/base.releaseValues" }, - "features": { - "type": "array", - "items": { - "$ref": "#/components/schemas/namespaces.storage.features.enum" - }, - "default": [ - "rawfile" - ] - }, "openebs-zfs-snapclass": { "$ref": "#/components/schemas/base.releaseValues" } @@ -6768,7 +7157,7 @@ "url": { "type": "string", "enum": [ - "https://charts.deliveryhero.io" + "https://raw.githubusercontent.com/deliveryhero/helm-charts/refs/heads/master/" ] }, "description": { @@ -6832,7 +7221,7 @@ "type": "object", "required": [ "promtail", - "loki-distributed" + "loki" ], "properties": { "promtail": { @@ -6856,7 +7245,7 @@ } } }, - "loki-distributed": { + "loki": { "type": "object", "required": [ "url", @@ -6866,7 +7255,7 @@ "url": { "type": "string", "enum": [ - "https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed" + "https://github.com/grafana/loki/tree/main/production/helm/loki" ] }, "description": { diff --git a/sealed-secrets/helmfile.yaml b/sealed-secrets/helmfile.yaml index 50f55b4ae..95016d409 100644 --- a/sealed-secrets/helmfile.yaml +++ b/sealed-secrets/helmfile.yaml @@ -134,8 +134,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' sealed-secrets: {{- if ( .Values | get "sealed-secrets" dict | get "chartUrl" false ) }} diff --git a/src/charts.cue b/src/charts.cue index ea067ae69..12add428c 100644 --- a/src/charts.cue +++ b/src/charts.cue @@ -139,7 +139,7 @@ package LaunchpadNamespaces } "deliveryhero": { - url: "https://charts.deliveryhero.io" + url: "https://raw.githubusercontent.com/deliveryhero/helm-charts/refs/heads/master/" description: """ Delivery Hero are big fans of Kubernetes and use Helm extensively. Here we have collected a few charts that are used across our organisation. """ @@ -160,8 +160,8 @@ package LaunchpadNamespaces url: "https://github.com/grafana/helm-charts/tree/main/charts/promtail" description: "Promtail is an agent which ships the contents of local logs to a Loki instance" } - "loki-distributed": { - url: "https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed" + "loki": { + url: "https://github.com/grafana/loki/tree/main/production/helm/loki" description: "Helm chart for Grafana Loki in microservices mode" } } diff --git a/src/schemas/build_tool.cue b/src/schemas/build_tool.cue index a67f972ab..1f626b179 100644 --- a/src/schemas/build_tool.cue +++ b/src/schemas/build_tool.cue @@ -18,7 +18,7 @@ command: { print: cli.Print & {text: _out.out} } "build:renovate": { - _out: _renovate.render + _out: _renovate.render print: cli.Print & {text: _out.out} } } @@ -119,6 +119,9 @@ _helmfile: { "\(releaseName)": { name: release.chart.repository url: _repositories[release.chart.repository].url + if _repositories[release.chart.repository].oci != _|_ { + oci: true + } } } } diff --git a/src/schemas/monitoring.cue b/src/schemas/monitoring.cue index c5e436d94..0b9231ee5 100644 --- a/src/schemas/monitoring.cue +++ b/src/schemas/monitoring.cue @@ -51,24 +51,24 @@ package LaunchpadNamespaces chart: {_repositories["prometheus-community"].charts["kube-prometheus-stack"]} feature: #features.#metrics _template: { - version: "60.3.0" + version: "79.5.0" disableValidationOnInstall: true } } "node-problem-detector": { chart: {_repositories.deliveryhero.charts["node-problem-detector"]} feature: #features.#metrics - _template: {version: "2.3.13"} + _template: {version: "2.3.22"} } loki: { - chart: {_repositories.grafana.charts["loki-distributed"]} + chart: {_repositories.grafana.charts["loki"]} feature: #features.#logs - _template: {version: "0.79.0"} + _template: {version: "6.36.1"} } promtail: { chart: {_repositories.grafana.charts.promtail} feature: #features.#logs - _template: {version: "6.16.0"} + _template: {version: "6.16.6"} } } diff --git a/storage/helmfile.yaml b/storage/helmfile.yaml index 0d1a6abc8..491480b60 100644 --- a/storage/helmfile.yaml +++ b/storage/helmfile.yaml @@ -143,8 +143,8 @@ repositories: templates: defaults: - namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' missingFileHandler: Warn + namespace: '{{ .Values | get "targetNamespace" $_defaultNamespace }}' openebs: {{- if ( .Values | get "openebs" dict | get "chartUrl" false ) }}