Skip to content

Commit 997ff7b

Browse files
leiwingqueenleiwingqueen
committed
fix conflict
Signed-off-by: leiwingqueen <[email protected]>
2 parents b00ed22 + 6855dbc commit 997ff7b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+545
-52
lines changed

‎charts/grafana-mcp/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana-mcp
3-
version: 0.1.1
3+
version: 0.1.3
44
appVersion: latest
55
kubeVersion: "^1.8.0-0"
66
description: MCP server for Grafana.

‎charts/grafana-mcp/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ The command removes all the Kubernetes components associated with the chart and
105105
| service.sessionAffinity | string | `""` | Session affinity |
106106
| service.sessionAffinityConfig | object | `{}` | Session affinity config |
107107
| service.type | string | `"ClusterIP"` | Service type |
108-
| serviceAccount | object | `{"annotations":{},"automountServiceAccountToken":false,"enabled":true,"labels":{},"name":""}` | Service account Configuration |
108+
| serviceAccount | object | `{"annotations":{},"automountServiceAccountToken":false,"create":true,"labels":{},"name":""}` | Service account Configuration |
109109
| serviceAccount.annotations | object | `{}` | Annotations for the service account |
110110
| serviceAccount.automountServiceAccountToken | bool | `false` | Automount service account token |
111-
| serviceAccount.enabled | bool | `true` | Enable service account |
111+
| serviceAccount.create | bool | `true` | Enable service account |
112112
| serviceAccount.labels | object | `{}` | Labels for the service account |
113113
| serviceAccount.name | string | `""` | Name of the service account |
114114
| startupProbe | object | `{}` | MCP server Startup probe configuration |

‎charts/grafana-mcp/templates/deployment.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ spec:
101101
env:
102102
- name: GRAFANA_URL
103103
value: {{ .Values.grafana.url | quote }}
104-
- name: GRAFANA_API_KEY
104+
{{- if or .Values.grafana.apiKey .Values.grafana.apiKeySecret.name }}
105+
- name: GRAFANA_SERVICE_ACCOUNT_TOKEN
105106
valueFrom:
106107
secretKeyRef:
107108
{{- if .Values.grafana.apiKey }}
@@ -111,6 +112,7 @@ spec:
111112
name: {{ .Values.grafana.apiKeySecret.name }}
112113
key: {{ .Values.grafana.apiKeySecret.key }}
113114
{{- end }}
115+
{{- end }}
114116
{{- range $key, $value := .Values.env }}
115117
- name: {{ $key | quote }}
116118
value: {{ $value | quote }}

‎charts/grafana-mcp/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ startupProbe: {}
6666
# -- Service account Configuration
6767
serviceAccount:
6868
# -- Enable service account
69-
enabled: true
69+
create: true
7070
# -- Name of the service account
7171
name: ""
7272
# -- Annotations for the service account

‎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: 9.3.4
4-
appVersion: 12.1.0
3+
version: 9.4.5
4+
appVersion: 12.1.1
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/grafana/README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,15 @@ need to instead set `global.imageRegistry`.
168168
| `lifecycleHooks` | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers) | `{}` |
169169
| `sidecar.image.registry` | Sidecar image registry | `quay.io` |
170170
| `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` |
171-
| `sidecar.image.tag` | Sidecar image tag | `1.30.0` |
171+
| `sidecar.image.tag` | Sidecar image tag | `1.30.10` |
172172
| `sidecar.image.sha` | Sidecar image sha (optional) | `""` |
173173
| `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` |
174174
| `sidecar.resources` | Sidecar resources | `{}` |
175175
| `sidecar.securityContext` | Sidecar securityContext | `{}` |
176176
| `sidecar.enableUniqueFilenames` | Sets the kiwigrid/k8s-sidecar UNIQUE_FILENAMES environment variable. If set to `true` the sidecar will create unique filenames where duplicate data keys exist between ConfigMaps and/or Secrets within the same or multiple Namespaces. | `false` |
177177
| `sidecar.alerts.enabled` | Enables the cluster wide search for alerts and adds/updates/deletes them in grafana |`false` |
178+
| `sidecar.alerts.env` | Extra environment variables passed to pods | `{}` |
179+
| `sidecar.alerts.envValueFrom` | Environment variables from alternate sources. See the API docs on [EnvVarSource](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#envvarsource-v1-core) for format details. Can be templated | `{}` |
178180
| `sidecar.alerts.label` | Label that config maps with alerts should have to be added (can be templated) | `grafana_alert` |
179181
| `sidecar.alerts.labelValue` | Label value that config maps with alerts should have to be added (can be templated) | `""` |
180182
| `sidecar.alerts.searchNamespace` | Namespaces list. If specified, the sidecar will search for alerts config-maps inside these namespaces. Otherwise the namespace in which the sidecar is running will be used. It's also possible to specify ALL to search in all namespaces. | `nil` |
@@ -185,6 +187,8 @@ need to instead set `global.imageRegistry`.
185187
| `sidecar.alerts.initAlerts` | Set to true to deploy the alerts sidecar as an initContainer. This is needed if skipReload is true, to load any alerts defined at startup time. | `false` |
186188
| `sidecar.alerts.extraMounts` | Additional alerts sidecar volume mounts. | `[]` |
187189
| `sidecar.dashboards.enabled` | Enables the cluster wide search for dashboards and adds/updates/deletes them in grafana | `false` |
190+
| `sidecar.dashboards.env` | Extra environment variables passed to pods | `{}` |
191+
| `sidecar.dashboards.envValueFrom` | Environment variables from alternate sources. See the API docs on [EnvVarSource](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#envvarsource-v1-core) for format details. Can be templated | `{}` |
188192
| `sidecar.dashboards.SCProvider` | Enables creation of sidecar provider | `true` |
189193
| `sidecar.dashboards.provider.name` | Unique name of the grafana provider | `sidecarProvider` |
190194
| `sidecar.dashboards.provider.orgid` | Id of the organisation, to which the dashboards should be added | `1` |

‎charts/grafana/templates/_pod.tpl‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ initContainers:
151151
{{- end }}
152152
{{- with .Values.sidecar.alerts.searchNamespace }}
153153
- name: NAMESPACE
154-
value: {{ . | join "," | quote }}
154+
value: "{{ tpl (. | join ",") $root }}"
155155
{{- end }}
156156
{{- with .Values.sidecar.alerts.skipTlsVerify }}
157157
- name: SKIP_TLS_VERIFY
@@ -352,6 +352,11 @@ containers:
352352
- name: "{{ $key }}"
353353
value: "{{ $value }}"
354354
{{- end }}
355+
{{- range $key, $value := .Values.sidecar.alerts.envValueFrom }}
356+
- name: {{ $key | quote }}
357+
valueFrom:
358+
{{- tpl (toYaml $value) $ | nindent 10 }}
359+
{{- end }}
355360
{{- if .Values.sidecar.alerts.ignoreAlreadyProcessed }}
356361
- name: IGNORE_ALREADY_PROCESSED
357362
value: "true"
@@ -382,7 +387,7 @@ containers:
382387
{{- end }}
383388
{{- with .Values.sidecar.alerts.searchNamespace }}
384389
- name: NAMESPACE
385-
value: {{ . | join "," | quote }}
390+
value: "{{ tpl (. | join ",") $root }}"
386391
{{- end }}
387392
{{- with .Values.sidecar.alerts.skipTlsVerify }}
388393
- name: SKIP_TLS_VERIFY
@@ -1191,6 +1196,13 @@ containers:
11911196
value: {{ (get .Values "grafana.ini").paths.plugins }}
11921197
- name: GF_PATHS_PROVISIONING
11931198
value: {{ (get .Values "grafana.ini").paths.provisioning }}
1199+
{{- if (.Values.resources.limits).memory }}
1200+
- name: GOMEMLIMIT
1201+
valueFrom:
1202+
resourceFieldRef:
1203+
divisor: "1"
1204+
resource: limits.memory
1205+
{{- end }}
11941206
{{- range $key, $value := .Values.envValueFrom }}
11951207
- name: {{ $key | quote }}
11961208
valueFrom:
@@ -1439,4 +1451,4 @@ volumes:
14391451
{{- with .Values.extraContainerVolumes }}
14401452
{{- tpl (toYaml .) $root | nindent 2 }}
14411453
{{- end }}
1442-
{{- end }}
1454+
{{- end }}

‎charts/grafana/templates/statefulset.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ spec:
4444
metadata:
4545
name: storage
4646
spec:
47-
accessModes: {{ .Values.persistence.accessModes }}
47+
accessModes:
48+
{{- range .Values.persistence.accessModes }}
49+
- {{ . | quote }}
50+
{{- end }}
4851
storageClassName: {{ .Values.persistence.storageClassName }}
4952
{{- with .Values.persistence.volumeName }}
5053
volumeName: {{ . | quote }}

‎charts/grafana/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ envFromSecrets: []
569569
## prefix: prefix
570570
## optional: true
571571

572-
## The names of conifgmaps in the same kubernetes namespace which contain values to be added to the environment
572+
## The names of configmaps in the same kubernetes namespace which contain values to be added to the environment
573573
## Each entry should contain a name key, and can optionally specify whether the configmap must be defined with an optional key.
574574
## Name is templated.
575575
## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapenvsource-v1-core
@@ -959,7 +959,7 @@ sidecar:
959959
# -- The Docker registry
960960
registry: quay.io
961961
repository: kiwigrid/k8s-sidecar
962-
tag: 1.30.3
962+
tag: 1.30.10
963963
sha: ""
964964
imagePullPolicy: IfNotPresent
965965
resources: {}

‎charts/rollout-operator/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: rollout-operator
33
description: "Grafana rollout-operator"
44
type: application
5-
version: 0.31.0
6-
appVersion: v0.28.0
5+
version: 0.33.0
6+
appVersion: v0.29.0
77
home: https://github.com/grafana/rollout-operator
88
kubeVersion: ^1.10.0-0

0 commit comments

Comments
 (0)