From c5acd0cd4c804fab76a4fd3787c6c03e3da8da2e Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 15 Nov 2023 18:17:40 +0530 Subject: [PATCH 01/17] Added support for loadBalancerClass Signed-off-by: Sheikh-Abubaker --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/service.yaml | 3 +++ charts/grafana/values.yaml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 8823e6f920..7f0fccba65 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.0.5 +version: 7.0.6 appVersion: 10.1.5 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/service.yaml b/charts/grafana/templates/service.yaml index 9102c1eec1..849a466a3e 100644 --- a/charts/grafana/templates/service.yaml +++ b/charts/grafana/templates/service.yaml @@ -25,6 +25,9 @@ spec: {{- with .Values.service.loadBalancerIP }} loadBalancerIP: {{ . }} {{- end }} + {{- with .Values.service.loadBalancerClass }} + loadBalancerClass: {{ . }} + {{- end }} {{- with .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index ab259791a0..abb3d37a80 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -197,6 +197,7 @@ gossipPortName: gossip service: enabled: true type: ClusterIP + loadBalancerClass: "" port: 80 targetPort: 3000 # targetPort: 4181 To be used with a proxy extraContainer From c27059e040bc8d858a98061862f84cf1e56bb422 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 15 Nov 2023 18:30:04 +0530 Subject: [PATCH 02/17] Bumped Chart Version Signed-off-by: Sheikh-Abubaker --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 7f0fccba65..4260c7da1d 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.0.6 +version: 7.0.7 appVersion: 10.1.5 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From edc1b480ed55c3c07b05dc296794e0d28c7a3c64 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 16 Nov 2023 16:50:21 +0530 Subject: [PATCH 03/17] Modified values.yaml Signed-off-by: Sheikh-Abubaker --- charts/grafana/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index abb3d37a80..f891dc424e 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -196,8 +196,10 @@ gossipPortName: gossip ## service: enabled: true - type: ClusterIP + type: LoadBalancer + loadBalancerIP: "" loadBalancerClass: "" + loadBalancerSourceRanges: [] port: 80 targetPort: 3000 # targetPort: 4181 To be used with a proxy extraContainer From 0d65d0f7a97ca22ca887602784bdfe10bb0e74fa Mon Sep 17 00:00:00 2001 From: verejoel Date: Mon, 9 Oct 2023 13:34:54 +0200 Subject: [PATCH 04/17] [loki-distributed] Query scheduler and index gateway join the memberlist According to the Grafana Loki [documentation](https://grafana.com/docs/loki/latest/get-started/hash-rings/): * the query scheduler must be part of a hashring * the index gateway may optionally be part of a hashring This PR updates the chart such that the query scheduler and index gateway pods will expose the memberlist container port 7946, and include the member list selector label. The index gateway may optionally be prevented from joining the memberlist by setting `.Values.indexGateway.joinMemberlist` to false (default true), reflecting the current state of the documentation. Signed-off-by: verejoel Signed-off-by: Sheikh-Abubaker --- charts/loki-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index e59e7fdf33..10bb5af73c 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -300,7 +300,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | +| ingester.persistence.claims | list | | List of the ingester PVCs | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | From 622edfa6775763e5d2aac210167fcef6f78eca25 Mon Sep 17 00:00:00 2001 From: Heds Simons Date: Fri, 13 Oct 2023 15:45:38 -0700 Subject: [PATCH 05/17] [tempo-distributed] Update distributor proxy routes for GET 2.3.0. GET 2.3.0 now includes functionality that allows the gateway to accept traces both via OTLP gRPC and HTTP. Also includes ability to define own proxy routes as a flag existed to enable this, but no configuration was available to set them. Signed-off-by: Heds Simons --- charts/loki-distributed/README.md | 2 +- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 7 ++++--- charts/tempo-distributed/values.yaml | 18 +++++++++++++----- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 10bb5af73c..e59e7fdf33 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -300,7 +300,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | | List of the ingester PVCs | +| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 12cf79a6f8..991104c69e 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.7.3 +version: 1.7.4 appVersion: 2.3.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index b67bfae36e..31a36713d1 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) +![Version: 1.7.4](https://img.shields.io/badge/Version-1.7.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -315,7 +315,7 @@ The memcached default args are removed and should be provided manually. The sett | distributor.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string | | enterprise.enabled | bool | `false` | | | enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository' | -| enterprise.image.tag | string | `"v2.2.1"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' | +| enterprise.image.tag | string | `"v2.3.0"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' | | enterpriseFederationFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string | | enterpriseFederationFrontend.autoscaling.enabled | bool | `false` | Enable autoscaling for the federation-frontend | | enterpriseFederationFrontend.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the federation-frontend | @@ -368,6 +368,7 @@ The memcached default args are removed and should be provided manually. The sett | enterpriseGateway.podAnnotations | object | `{}` | | | enterpriseGateway.podDisruptionBudget | object | `{}` | | | enterpriseGateway.podLabels | object | `{}` | | +| enterpriseGateway.proxy | object | `{}` | Proxy URLs defined in this object will be used if useDefaultProxyURLs is set to false. | | enterpriseGateway.readinessProbe.httpGet.path | string | `"/ready"` | | | enterpriseGateway.readinessProbe.httpGet.port | string | `"http-metrics"` | | | enterpriseGateway.readinessProbe.initialDelaySeconds | int | `45` | | @@ -384,7 +385,7 @@ The memcached default args are removed and should be provided manually. The sett | enterpriseGateway.terminationGracePeriodSeconds | int | `60` | | | enterpriseGateway.tolerations | list | `[]` | | | enterpriseGateway.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for enterprise-gateway pods. Passed through `tpl` and, thus, to be configured as string | -| enterpriseGateway.useDefaultProxyURLs | bool | `true` | | +| enterpriseGateway.useDefaultProxyURLs | bool | `true` | If you want to use your own proxy URLs, set this to false. | | externalConfigSecretName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"config\") }}"` | Name of the Secret or ConfigMap that contains the configuration (used for naming even if config is internal). | | externalConfigVersion | string | `"0"` | When 'useExternalConfig' is true, then changing 'externalConfigVersion' triggers restart of services - otherwise changes to the configuration cause a restart. | | externalRuntimeConfigName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"runtime\") }}"` | Name of the Secret or ConfigMap that contains the runtime configuration (used for naming even if config is internal). | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 5359988d86..2fb7193097 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1050,15 +1050,21 @@ config: | default: url: http://{{ template "tempo.fullname" . }}-admin-api.{{ .Release.Namespace }}.svc:{{ include "tempo.serverHttpListenPort" . }} distributor: - url: http://{{ template "tempo.fullname" . }}-distributor.{{ .Release.Namespace }}.svc:{{ include "tempo.serverHttpListenPort" . }} - distributor_ingest: - url: h2c://{{ template "tempo.fullname" . }}-distributor.{{ .Release.Namespace }}.svc:4317 + otlp/grpc: + url: h2c://{{ template "tempo.fullname" . }}-distributor.{{ .Release.Namespace }}.svc:4317 + otlp/http: + url: http://{{ template "tempo.fullname" . }}-distributor.{{ .Release.Namespace }}.svc:4318 ingester: url: http://{{ template "tempo.fullname" . }}-ingester.{{ .Release.Namespace }}.svc:{{ include "tempo.serverHttpListenPort" . }} querier: url: http://{{ template "tempo.fullname" . }}-querier.{{ .Release.Namespace }}.svc:{{ include "tempo.serverHttpListenPort" . }} query_frontend: url: http://{{ template "tempo.fullname" . }}-query-frontend.{{ .Release.Namespace }}.svc:{{ include "tempo.serverHttpListenPort" . }}{{get .Values.tempo.structuredConfig "http_api_prefix"}} + {{else}} + {{- if and .Values.enterprise.enabled .Values.enterpriseGateway.proxy }} + gateway: + proxy: {{- toYaml .Values.enterpriseGateway.proxy | nindent 6 }} + {{- end }} {{- end }} compactor: @@ -1838,7 +1844,7 @@ enterprise: # -- Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository' repository: grafana/enterprise-traces # -- Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' - tag: v2.2.1 + tag: v2.3.0 # Note: pullPolicy and optional pullSecrets are set in toplevel 'image' section, not here # In order to use Grafana Enterprise Traces features, you will need to provide the contents of your Grafana Enterprise Traces @@ -1959,8 +1965,10 @@ adminApi: # Settings for the gateway service providing authentication and authorization via the admin_api. # Can only be enabled if enterprise.enabled is true - requires license. enterpriseGateway: - # If you want to use your own proxy URLs, set this to false. + # -- If you want to use your own proxy URLs, set this to false. useDefaultProxyURLs: true + # -- Proxy URLs defined in this object will be used if useDefaultProxyURLs is set to false. + proxy: {} replicas: 1 # -- hostAliases to add hostAliases: [] From ec62be091f1ab5cf80acfeb06abb3624a9764a8c Mon Sep 17 00:00:00 2001 From: Mohd Sadiq Date: Fri, 29 Dec 2023 16:53:13 +0530 Subject: [PATCH 06/17] Quote hostname in ingress.yaml Signed-off-by: Mohd Sadiq --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/ingress.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 8c2c9e1126..dee06d33ca 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.0.19 +version: 7.0.20 appVersion: 10.2.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/ingress.yaml b/charts/grafana/templates/ingress.yaml index 063cdfaa52..b2ffd81095 100644 --- a/charts/grafana/templates/ingress.yaml +++ b/charts/grafana/templates/ingress.yaml @@ -34,7 +34,7 @@ spec: rules: {{- if .Values.ingress.hosts }} {{- range .Values.ingress.hosts }} - - host: {{ tpl . $ }} + - host: {{ tpl . $ | quote }} http: paths: {{- with $extraPaths }} From f72cddc5ee3285cac56a50b2968f7cc61179c2da Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 29 Dec 2023 23:26:18 +0530 Subject: [PATCH 07/17] Resolved merge conflicts Signed-off-by: Sheikh-Abubaker --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 4260c7da1d..4377b6e86a 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 7.0.7 -appVersion: 10.1.5 +version: 7.0.19 +appVersion: 10.2.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.net From 65d84f184426e2a3845eb9ee76979b0a2ed563af Mon Sep 17 00:00:00 2001 From: MH Date: Sun, 31 Dec 2023 18:57:15 +0800 Subject: [PATCH 08/17] Update service.yaml Signed-off-by: MH --- charts/grafana/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/templates/service.yaml b/charts/grafana/templates/service.yaml index 849a466a3e..e9396a15c6 100644 --- a/charts/grafana/templates/service.yaml +++ b/charts/grafana/templates/service.yaml @@ -21,7 +21,7 @@ spec: clusterIP: {{ . }} {{- end }} {{- else if eq .Values.service.type "LoadBalancer" }} - type: {{ .Values.service.type }} + type: LoadBalancer {{- with .Values.service.loadBalancerIP }} loadBalancerIP: {{ . }} {{- end }} From 9e124d0b7b81a128bf10ecae689c105bf85140ab Mon Sep 17 00:00:00 2001 From: MH Date: Sun, 31 Dec 2023 18:57:53 +0800 Subject: [PATCH 09/17] Update values.yaml Signed-off-by: MH --- charts/grafana/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 202058c36e..657e6add8e 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -206,7 +206,7 @@ gossipPortName: gossip ## service: enabled: true - type: LoadBalancer + type: ClusterIP loadBalancerIP: "" loadBalancerClass: "" loadBalancerSourceRanges: [] From 160f4c1a7c8bbd85cd21c3407502c055a9ff85dc Mon Sep 17 00:00:00 2001 From: MH Date: Sun, 31 Dec 2023 18:59:10 +0800 Subject: [PATCH 10/17] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 8c2c9e1126..dee06d33ca 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.0.19 +version: 7.0.20 appVersion: 10.2.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 15f3ffcbb8d279d051c15a6990d2138b769c4232 Mon Sep 17 00:00:00 2001 From: Aksel Skaar Leirvaag <52233080+akselleirv@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:34:54 +0100 Subject: [PATCH 11/17] grafana: app version to 10.2.3 Signed-off-by: aksel-skaar-leirvaag --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 8c2c9e1126..0883c31961 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 7.0.19 -appVersion: 10.2.2 +version: 7.0.20 +appVersion: 10.2.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 6da88b94858d35a4f3dabafa7827900046e75411 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 4 Jan 2024 19:53:38 +0530 Subject: [PATCH 12/17] Bumped prometheus chart version Signed-off-by: Sheikh-Abubaker --- charts/loki-stack/Chart.yaml | 2 +- charts/loki-stack/requirements.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/loki-stack/Chart.yaml b/charts/loki-stack/Chart.yaml index 8069d9fc78..1a9978fe76 100644 --- a/charts/loki-stack/Chart.yaml +++ b/charts/loki-stack/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: loki-stack -version: 2.9.11 +version: 2.9.12 appVersion: v2.6.1 kubeVersion: "^1.10.0-0" description: "Loki: like Prometheus, but for logs." diff --git a/charts/loki-stack/requirements.yaml b/charts/loki-stack/requirements.yaml index 2232f1280e..09525e0961 100644 --- a/charts/loki-stack/requirements.yaml +++ b/charts/loki-stack/requirements.yaml @@ -17,7 +17,7 @@ dependencies: repository: "https://grafana.github.io/helm-charts" - name: "prometheus" condition: prometheus.enabled - version: "~15.5.3" + version: "~19.7.2" repository: "https://prometheus-community.github.io/helm-charts" - name: "filebeat" condition: filebeat.enabled From 1502d6f439afef7fa400c5a50707fec5820635ba Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 8 Jan 2024 10:58:22 +0200 Subject: [PATCH 13/17] Update Chart.yaml Signed-off-by: Xtigyro --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index dee06d33ca..ea1516b5d4 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.0.20 +version: 7.0.21 appVersion: 10.2.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From d76d1f7e4e6fc3edb6d666c86b9789c29b919e26 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 8 Jan 2024 10:55:59 +0200 Subject: [PATCH 14/17] Update Chart.yaml Signed-off-by: Xtigyro --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 0883c31961..cc69f6b562 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.0.20 +version: 7.0.21 appVersion: 10.2.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From f57eaf5cfd497bae529fc8382e3bd317f89e4ed9 Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Mon, 8 Jan 2024 16:07:08 +1100 Subject: [PATCH 15/17] Remove default CPU limit for rollout-operator pod Signed-off-by: Charles Korn --- charts/rollout-operator/Chart.yaml | 2 +- charts/rollout-operator/README.md | 3 +-- charts/rollout-operator/values.yaml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index 12891c9b79..e01f3da7cd 100644 --- a/charts/rollout-operator/Chart.yaml +++ b/charts/rollout-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: rollout-operator description: "Grafana rollout-operator" type: application -version: 0.10.0 +version: 0.11.0 appVersion: v0.9.0 home: https://github.com/grafana/rollout-operator kubeVersion: ^1.10.0-0 diff --git a/charts/rollout-operator/README.md b/charts/rollout-operator/README.md index 064819f556..bd23bf0147 100644 --- a/charts/rollout-operator/README.md +++ b/charts/rollout-operator/README.md @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r # rollout-operator -![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.0](https://img.shields.io/badge/AppVersion-v0.9.0-informational?style=flat-square) +![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.0](https://img.shields.io/badge/AppVersion-v0.9.0-informational?style=flat-square) Grafana rollout-operator @@ -53,7 +53,6 @@ It is not a highly available application and runs as a single pod. | podLabels | object | `{}` | Pod (extra) Labels | | podSecurityContext | object | `{}` | | | priorityClassName | string | `""` | | -| resources.limits.cpu | string | `"1"` | | | resources.limits.memory | string | `"200Mi"` | | | resources.requests.cpu | string | `"100m"` | | | resources.requests.memory | string | `"100Mi"` | | diff --git a/charts/rollout-operator/values.yaml b/charts/rollout-operator/values.yaml index 3cb558d507..66f9486b1a 100644 --- a/charts/rollout-operator/values.yaml +++ b/charts/rollout-operator/values.yaml @@ -47,7 +47,7 @@ securityContext: {} resources: limits: - cpu: "1" + # cpu: "1" memory: 200Mi requests: cpu: 100m From ea2eaf18a5b7a19f3e75ccbe8d7b57e3e4c86585 Mon Sep 17 00:00:00 2001 From: Heds Simons Date: Mon, 8 Jan 2024 18:03:49 -0800 Subject: [PATCH 16/17] [tempo-distributed]: Update gateway routes to include distributor HTTP URL. Signed-off-by: Heds Simons --- charts/tempo-distributed/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 2fb7193097..309db76bdf 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1050,6 +1050,7 @@ config: | default: url: http://{{ template "tempo.fullname" . }}-admin-api.{{ .Release.Namespace }}.svc:{{ include "tempo.serverHttpListenPort" . }} distributor: + url: http://{{ template "tempo.fullname" . }}-distributor.{{ .Release.Namespace }}.svc:{{ include "tempo.serverHttpListenPort" . }} otlp/grpc: url: h2c://{{ template "tempo.fullname" . }}-distributor.{{ .Release.Namespace }}.svc:4317 otlp/http: From ad17a3d85760730f396e1c267bf1b60dab951ffb Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Tue, 9 Jan 2024 10:51:09 -0500 Subject: [PATCH 17/17] [agent-operator] update links to CRDs (#2891) Signed-off-by: Robert Fratto --- charts/agent-operator/Chart.yaml | 2 +- charts/agent-operator/README.md | 4 ++-- charts/agent-operator/README.md.gotmpl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index d5804d26a1..d3b5ec1431 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.12 +version: 0.3.13 appVersion: "0.38.1" home: https://grafana.com/docs/agent/v0.38/ icon: https://raw.githubusercontent.com/grafana/agent/v0.38.0/docs/sources/assets/logo_and_name.png diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index d8cf46b82a..4e1efd1c46 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.12](https://img.shields.io/badge/Version-0.3.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.38.1](https://img.shields.io/badge/AppVersion-0.38.1-informational?style=flat-square) +![Version: 0.3.13](https://img.shields.io/badge/Version-0.3.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.38.1](https://img.shields.io/badge/AppVersion-0.38.1-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -16,7 +16,7 @@ To learn how to deploy these resources, please see Grafana's [Agent Operator get ## CRDs -The CRDs are synced into this chart manually (for now) from the Grafana Agent [GitHub repo](https://github.com/grafana/agent/tree/main/production/operator/crds). To learn more about how Helm manages CRDs, please see [Custom Resource Definitions](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) from the Helm docs. +The CRDs are synced into this chart manually (for now) from the Grafana Agent [GitHub repo](https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds). To learn more about how Helm manages CRDs, please see [Custom Resource Definitions](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) from the Helm docs. ## Get Repo Info diff --git a/charts/agent-operator/README.md.gotmpl b/charts/agent-operator/README.md.gotmpl index 5b08d32051..3dce97a945 100644 --- a/charts/agent-operator/README.md.gotmpl +++ b/charts/agent-operator/README.md.gotmpl @@ -16,7 +16,7 @@ To learn how to deploy these resources, please see Grafana's [Agent Operator get ## CRDs -The CRDs are synced into this chart manually (for now) from the Grafana Agent [GitHub repo](https://github.com/grafana/agent/tree/main/production/operator/crds). To learn more about how Helm manages CRDs, please see [Custom Resource Definitions](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) from the Helm docs. +The CRDs are synced into this chart manually (for now) from the Grafana Agent [GitHub repo](https://github.com/grafana/agent/tree/main/operations/agent-static-operator/crds). To learn more about how Helm manages CRDs, please see [Custom Resource Definitions](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) from the Helm docs. ## Get Repo Info