Skip to content

Commit c0baa90

Browse files
Merge branch 'main' into tempo-registry
2 parents 8a66516 + 023f523 commit c0baa90

File tree

11 files changed

+24
-7
lines changed

11 files changed

+24
-7
lines changed

charts/grafana/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: grafana
3-
version: 10.1.4
4-
appVersion: 12.2.1
3+
version: 10.1.5
4+
appVersion: 12.3.0
55
kubeVersion: "^1.8.0-0"
66
description: The leading tool for querying and visualizing time series and metrics.
77
home: https://grafana.com

charts/pdc-agent/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: pdc-agent
33
description: PDC agent is an agent for connecting to Grafana Private Data source Connect
44
type: application
55
appVersion: "0.0.45"
6-
version: 0.0.1
6+
version: 0.0.2
77
home: https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/
88
sources:
99
- https://github.com/grafana/pdc-agent

charts/pdc-agent/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pdc-agent
22

3-
![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.45](https://img.shields.io/badge/AppVersion-0.0.45-informational?style=flat-square)
3+
![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.45](https://img.shields.io/badge/AppVersion-0.0.45-informational?style=flat-square)
44

55
PDC agent is an agent for connecting to Grafana Private Data source Connect
66

@@ -38,6 +38,7 @@ PDC agent is an agent for connecting to Grafana Private Data source Connect
3838
| securityContext.allowPrivilegeEscalation | bool | `false` | |
3939
| securityContext.capabilities.drop[0] | string | `"ALL"` | |
4040
| securityContext.privileged | bool | `false` | |
41+
| securityContext.readOnlyRootFilesystem | bool | `false` | Enable running in a read-only root filesystem. |
4142
| securityContext.runAsNonRoot | bool | `true` | |
4243
| tokenSecretName | string | `""` | secretName Expects a secret with key `token` which contains the Access Policy token you generated |
4344
| tolerations | list | `[]` | not required, but left in as a choice |

charts/pdc-agent/templates/deployment.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,17 @@ spec:
7575
{{- range .Values.extraArgs }}
7676
- {{ . }}
7777
{{- end }}
78+
{{- if .Values.securityContext.readOnlyRootFilesystem }}
79+
volumeMounts:
80+
- mountPath: /home/pdc/
81+
name: ssh-cache
82+
{{- end }}
83+
{{- if .Values.securityContext.readOnlyRootFilesystem }}
84+
volumes:
85+
- name: ssh-cache
86+
emptyDir:
87+
sizeLimit: 50Mi
88+
{{- end }}
7889
{{- with .Values.nodeSelector }}
7990
nodeSelector:
8091
{{- toYaml . | nindent 8 }}

charts/pdc-agent/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ securityContext:
3535
runAsNonRoot: true
3636
privileged: false
3737
allowPrivilegeEscalation: false
38+
# -- Enable running in a read-only root filesystem.
39+
readOnlyRootFilesystem: false
3840

3941
resources:
4042
requests:

charts/tempo-distributed/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 1.56.0
5+
version: 1.56.2
66
appVersion: 2.9.0
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 1.56.0](https://img.shields.io/badge/Version-1.56.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
3+
![Version: 1.56.2](https://img.shields.io/badge/Version-1.56.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

charts/tempo-distributed/templates/enterprise-federation-frontend/hpa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
name: {{ include "tempo.resourceName" (dict "ctx" . "component" "enterprise-federation-frontend") }}
77
labels:
88
{{- include "tempo.labels" (dict "ctx" . "component" "enterprise-federation-frontend") | nindent 4 }}
9+
namespace: {{ .Release.Namespace }}
910
spec:
1011
scaleTargetRef:
1112
apiVersion: apps/v1

charts/tempo-distributed/templates/enterprise-federation-frontend/poddisruptionbudget-federation-frontend.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
name: {{ include "tempo.resourceName" $dict }}
88
labels:
99
{{- include "tempo.labels" $dict | nindent 4 }}
10+
namespace: {{ .Release.Namespace }}
1011
spec:
1112
selector:
1213
matchLabels:

charts/tempo-distributed/templates/metrics-generator/poddisruptionbudget-metrics-generator.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
name: {{ include "tempo.resourceName" $dict }}
88
labels:
99
{{- include "tempo.labels" $dict | nindent 4 }}
10+
namespace: {{ .Release.Namespace }}
1011
spec:
1112
selector:
1213
matchLabels:

0 commit comments

Comments
 (0)