diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 235fc07f..6f89c632 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -51,7 +51,7 @@ // **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"]}, diff --git a/.husky/commit-msg b/.husky/commit-msg index 4c49ae6a..2785bc1d 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 36f9c351..0b058777 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 b1c7c63c..aa4a4e15 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/README.md b/README.md index 19b98a48..5e423ac7 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 050104b1..a3035f97 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 537db2c3..b183783c 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 a6595f44..40686bab 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 55802159..b346533e 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 03c43ecb..91d18523 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 3f369b93..f9d222aa 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 cb78a391..122ba6b5 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 db4f00a8..71d2aed4 100644 --- a/monitoring/helmfile.yaml +++ b/monitoring/helmfile.yaml @@ -143,8 +143,8 @@ repositories: 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: "75.0.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.14" {{- 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.30.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 59fe4b50..415b521f 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 70bd9b93..501dfdf2 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 23b2a8a5..f902a29b 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 596c5921..1d10d661 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 92832629..eca1477e 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 2d5c002e..3a5bfae5 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" @@ -943,8 +929,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -954,16 +940,16 @@ "https://github.com/OffchainLabs/nitro/" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -1026,8 +1012,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -1037,16 +1023,16 @@ "https://github.com/OffchainLabs/arbitrum-classic" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "The old \"classic\" Arbitrum tech stack." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "The old \"classic\" Arbitrum tech stack." + "graphops" ] }, "name": { @@ -1109,8 +1095,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -1120,16 +1106,16 @@ "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -1185,8 +1171,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -1196,16 +1182,16 @@ "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -1482,6 +1468,9 @@ "arbitrum-nitro" ] }, + "scaling": { + "$ref": "#/components/schemas/namespaces.arbitrum.scaling" + }, "arbitrum-nitro": { "$ref": "#/components/schemas/base.releaseValues" }, @@ -1491,9 +1480,6 @@ "proxyd-nitro": { "$ref": "#/components/schemas/base.releaseValues" }, - "scaling": { - "$ref": "#/components/schemas/namespaces.arbitrum.scaling" - }, "proxyd-classic": { "$ref": "#/components/schemas/base.releaseValues" } @@ -1641,8 +1627,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -1652,16 +1638,16 @@ "https://github.com/celo-org/celo-blockchain" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Official golang implementation of the Celo blockchain" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Official golang implementation of the Celo blockchain" + "graphops" ] }, "name": { @@ -1721,8 +1707,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -1732,16 +1718,16 @@ "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -1848,11 +1834,6 @@ "$ref": "#/components/schemas/namespaces.celo.features.proxyd" } ], - "enum": [ - [ - "proxyd" - ] - ], "default": [ "proxyd" ] @@ -2009,12 +1990,12 @@ "proxyd" ] }, - "celo": { - "$ref": "#/components/schemas/base.releaseValues" - }, "scaling": { "$ref": "#/components/schemas/namespaces.celo.scaling" }, + "celo": { + "$ref": "#/components/schemas/base.releaseValues" + }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -2185,8 +2166,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -2196,16 +2177,16 @@ "https://github.com/ledgerwatch/erigon" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." + "graphops" ] }, "name": { @@ -2265,8 +2246,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -2276,16 +2257,16 @@ "https://github.com/status-im/nimbus-eth2" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Nimbus-eth2 is an extremely efficient consensus layer (eth2) client implementation." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Nimbus-eth2 is an extremely efficient consensus layer (eth2) client implementation." + "graphops" ] }, "name": { @@ -2348,8 +2329,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -2359,16 +2340,16 @@ "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -2478,12 +2459,6 @@ "$ref": "#/components/schemas/namespaces.ethereum.features.proxyd" } ], - "enum": [ - [ - "nimbus", - "proxyd" - ] - ], "default": [ "nimbus", "proxyd" @@ -2671,15 +2646,15 @@ "proxyd" ] }, + "scaling": { + "$ref": "#/components/schemas/namespaces.ethereum.scaling" + }, "erigon": { "$ref": "#/components/schemas/base.releaseValues" }, "nimbus": { "$ref": "#/components/schemas/base.releaseValues" }, - "scaling": { - "$ref": "#/components/schemas/namespaces.ethereum.scaling" - }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -2807,8 +2782,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -2818,16 +2793,16 @@ "https://github.com/ledgerwatch/erigon" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." + "graphops" ] }, "name": { @@ -2890,8 +2865,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -2901,16 +2876,16 @@ "https://github.com/sigp/lighthouse" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime." + "graphops" ] }, "name": { @@ -2973,8 +2948,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -2984,16 +2959,16 @@ "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -3106,13 +3081,6 @@ "$ref": "#/components/schemas/namespaces.gnosis.features.proxyd" } ], - "enum": [ - [ - "erigon", - "lighthouse", - "proxyd" - ] - ], "default": [ "erigon", "lighthouse", @@ -3283,12 +3251,6 @@ "type": "string", "default": "gnosis-mainnet" }, - "erigon": { - "$ref": "#/components/schemas/base.releaseValues" - }, - "lighthouse": { - "$ref": "#/components/schemas/base.releaseValues" - }, "features": { "type": "array", "items": { @@ -3300,6 +3262,12 @@ "proxyd" ] }, + "erigon": { + "$ref": "#/components/schemas/base.releaseValues" + }, + "lighthouse": { + "$ref": "#/components/schemas/base.releaseValues" + }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -3450,8 +3418,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3461,16 +3429,16 @@ "https://github.com/graphprotocol/graph-node" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -3493,8 +3461,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3504,16 +3472,16 @@ "https://github.com/graphprotocol/indexer" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Graph protocol indexer components" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Graph protocol indexer components" + "graphops" ] }, "name": { @@ -3536,8 +3504,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3547,16 +3515,16 @@ "https://github.com/graphops/docker-builds/tree/main/dockerfiles/graph-toolbox" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Utility kit for interacting and managing the Graph indexer stack." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Utility kit for interacting and managing the Graph indexer stack." + "graphops" ] }, "name": { @@ -3579,8 +3547,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3590,16 +3558,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Manage Raw Kubernetes Resources using Helm" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "graphops" ] }, "name": { @@ -3622,8 +3590,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3633,16 +3601,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Manage Raw Kubernetes Resources using Helm" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "graphops" ] }, "name": { @@ -3666,8 +3634,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3677,16 +3645,16 @@ "https://github.com/graphops/subgraph-radio" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Gossip about Subgraphs with other Graph Protocol Indexers" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Gossip about Subgraphs with other Graph Protocol Indexers" + "graphops" ] }, "name": { @@ -3743,11 +3711,6 @@ "$ref": "#/components/schemas/namespaces.graph.features.subgraph_radio" } ], - "enum": [ - [ - "subgraph-radio" - ] - ], "default": [ "subgraph-radio" ] @@ -3845,6 +3808,15 @@ "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 +3832,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" } @@ -3939,8 +3902,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3950,16 +3913,16 @@ "https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "ingress-nginx" + "ingress-nginx is an Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "ingress-nginx is an Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer." + "ingress-nginx" ] }, "name": { @@ -3986,8 +3949,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -3997,16 +3960,16 @@ "https://github.com/cert-manager/cert-manager" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "jetstack" + "cert-manager adds certificates and certificate issuers as resource types in Kubernetes clusters, and simplifies the process of obtaining, renewing and using those certificates." ] }, - "description": { + "repository": { "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." + "jetstack" ] }, "name": { @@ -4033,8 +3996,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -4044,16 +4007,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Manage Raw Kubernetes Resources using Helm" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "graphops" ] }, "name": { @@ -4127,12 +4090,6 @@ "$ref": "#/components/schemas/namespaces.ingress.features.certManager" } ], - "enum": [ - [ - "ingress", - "cert-manager" - ] - ], "default": [ "ingress", "cert-manager" @@ -4204,12 +4161,6 @@ "type": "string", "default": "ingress" }, - "ingress-nginx": { - "$ref": "#/components/schemas/base.releaseValues" - }, - "cert-manager": { - "$ref": "#/components/schemas/base.releaseValues" - }, "features": { "type": "array", "items": { @@ -4220,6 +4171,12 @@ "cert-manager" ] }, + "ingress-nginx": { + "$ref": "#/components/schemas/base.releaseValues" + }, + "cert-manager": { + "$ref": "#/components/schemas/base.releaseValues" + }, "cert-manager-resources": { "$ref": "#/components/schemas/base.releaseValues" } @@ -4291,8 +4248,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -4302,16 +4259,16 @@ "https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "prometheus-community" + "Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules" + "prometheus-community" ] }, "name": { @@ -4338,8 +4295,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -4349,16 +4306,16 @@ "https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "deliveryhero" + "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." ] }, - "description": { + "repository": { "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." + "deliveryhero" ] }, "name": { @@ -4385,33 +4342,33 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { "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" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "grafana" + "Helm chart for Grafana Loki in microservices mode" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Helm chart for Grafana Loki in microservices mode" + "grafana" ] }, "name": { "type": "string", "enum": [ - "loki-distributed" + "loki" ] } } @@ -4432,8 +4389,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -4443,16 +4400,16 @@ "https://github.com/grafana/helm-charts/tree/main/charts/promtail" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "grafana" + "Promtail is an agent which ships the contents of local logs to a Loki instance" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Promtail is an agent which ships the contents of local logs to a Loki instance" + "grafana" ] }, "name": { @@ -4526,12 +4483,6 @@ "$ref": "#/components/schemas/namespaces.monitoring.features.logs" } ], - "enum": [ - [ - "metrics", - "logs" - ] - ], "default": [ "metrics", "logs" @@ -4604,15 +4555,6 @@ "type": "string", "default": "monitoring" }, - "kube-prometheus-stack": { - "$ref": "#/components/schemas/base.releaseValues" - }, - "node-problem-detector": { - "$ref": "#/components/schemas/base.releaseValues" - }, - "loki": { - "$ref": "#/components/schemas/base.releaseValues" - }, "features": { "type": "array", "items": { @@ -4623,6 +4565,15 @@ "logs" ] }, + "kube-prometheus-stack": { + "$ref": "#/components/schemas/base.releaseValues" + }, + "node-problem-detector": { + "$ref": "#/components/schemas/base.releaseValues" + }, + "loki": { + "$ref": "#/components/schemas/base.releaseValues" + }, "promtail": { "$ref": "#/components/schemas/base.releaseValues" } @@ -4751,8 +4702,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -4762,16 +4713,16 @@ "https://github.com/ledgerwatch/erigon" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Erigon is an implementation of Ethereum (execution client with light client for consensus layer), on the efficiency frontier." + "graphops" ] }, "name": { @@ -4834,8 +4785,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -4845,16 +4796,16 @@ "https://github.com/maticnetwork/heimdall" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Validator node for Matic Network." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Validator node for Matic Network." + "graphops" ] }, "name": { @@ -4917,8 +4868,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -4928,16 +4879,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Manage Raw Kubernetes Resources using Helm" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "graphops" ] }, "name": { @@ -4993,8 +4944,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -5004,16 +4955,16 @@ "https://github.com/ethereum-optimism/optimism/tree/develop/proxyd" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "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." ] }, - "description": { + "repository": { "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." + "graphops" ] }, "name": { @@ -5129,14 +5080,6 @@ "$ref": "#/components/schemas/namespaces.polygon.features.heimdall_ha_svc" } ], - "enum": [ - [ - "proxyd", - "erigon", - "heimdall", - "heimdall-ha-svc" - ] - ], "default": [ "proxyd", "erigon", @@ -5328,6 +5271,9 @@ "heimdall-ha-svc" ] }, + "scaling": { + "$ref": "#/components/schemas/namespaces.polygon.scaling" + }, "erigon": { "$ref": "#/components/schemas/base.releaseValues" }, @@ -5337,9 +5283,6 @@ "heimdall-ha-svc": { "$ref": "#/components/schemas/base.releaseValues" }, - "scaling": { - "$ref": "#/components/schemas/namespaces.polygon.scaling" - }, "proxyd": { "$ref": "#/components/schemas/base.releaseValues" } @@ -5407,8 +5350,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -5418,16 +5361,16 @@ "https://github.com/zalando/postgres-operator" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "postgres-operator-charts" + "The Postgres Operator delivers an easy to run highly-available PostgreSQL clusters on Kubernetes (K8s) powered by Patroni." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "The Postgres Operator delivers an easy to run highly-available PostgreSQL clusters on Kubernetes (K8s) powered by Patroni." + "postgres-operator-charts" ] }, "name": { @@ -5596,8 +5539,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -5607,16 +5550,16 @@ "https://github.com/bitnami/charts/tree/main/bitnami/sealed-secrets" ] }, - "repository": { + "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." ] }, - "description": { + "repository": { "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." + "sealed-secrets" ] }, "name": { @@ -5828,8 +5771,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -5839,16 +5782,16 @@ "https://github.com/openebs/openebs" ] }, - "repository": { + "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." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "OpenEBS is the leading open-source example of a category of cloud native storage solutions sometimes called Container Attached Storage." + "openebs" ] }, "name": { @@ -5872,8 +5815,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -5883,16 +5826,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/openebs-rawfile-localpv" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "RawFile Driver Container Storage Interface" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "RawFile Driver Container Storage Interface" + "graphops" ] }, "name": { @@ -5919,8 +5862,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -5930,16 +5873,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Manage Raw Kubernetes Resources using Helm" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "graphops" ] }, "name": { @@ -5966,8 +5909,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -5977,16 +5920,16 @@ "https://github.com/openebs/zfs-localpv/tree/b70fb1e847b8c9ba32e3fd8cba877767686f6b26" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "openebs-zfs-localpv" + "CSI driver for provisioning Local PVs backed by ZFS and more." ] }, - "description": { + "repository": { "type": "string", "enum": [ - "CSI driver for provisioning Local PVs backed by ZFS and more." + "openebs-zfs-localpv" ] }, "name": { @@ -6013,8 +5956,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -6024,16 +5967,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Manage Raw Kubernetes Resources using Helm" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "graphops" ] }, "name": { @@ -6060,8 +6003,8 @@ "type": "object", "required": [ "url", - "repository", "description", + "repository", "name" ], "properties": { @@ -6071,16 +6014,16 @@ "https://github.com/graphops/launchpad-charts/tree/main/charts/resource-injector" ] }, - "repository": { + "description": { "type": "string", "enum": [ - "graphops" + "Manage Raw Kubernetes Resources using Helm" ] }, - "description": { + "repository": { "type": "string", "enum": [ - "Manage Raw Kubernetes Resources using Helm" + "graphops" ] }, "name": { @@ -6120,11 +6063,6 @@ "$ref": "#/components/schemas/namespaces.storage.features.rawfile" } ], - "enum": [ - [ - "rawfile" - ] - ], "default": [ "rawfile" ] @@ -6195,6 +6133,15 @@ "type": "string", "default": "storage" }, + "features": { + "type": "array", + "items": { + "$ref": "#/components/schemas/namespaces.storage.features.enum" + }, + "default": [ + "rawfile" + ] + }, "openebs": { "$ref": "#/components/schemas/base.releaseValues" }, @@ -6210,15 +6157,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" } @@ -6832,7 +6770,7 @@ "type": "object", "required": [ "promtail", - "loki-distributed" + "loki" ], "properties": { "promtail": { @@ -6856,7 +6794,7 @@ } } }, - "loki-distributed": { + "loki": { "type": "object", "required": [ "url", @@ -6866,7 +6804,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 50f55b4a..95016d40 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 ea067ae6..b4779ae9 100644 --- a/src/charts.cue +++ b/src/charts.cue @@ -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/monitoring.cue b/src/schemas/monitoring.cue index c5e436d9..640e4644 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: "75.0.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.14"} } loki: { - chart: {_repositories.grafana.charts["loki-distributed"]} + chart: {_repositories.grafana.charts["loki"]} feature: #features.#logs - _template: {version: "0.79.0"} + _template: {version: "6.30.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 0d1a6abc..491480b6 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 ) }}