Skip to content

Commit 3ee5555

Browse files
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts into grafana_template
2 parents db123d5 + c8dc0d5 commit 3ee5555

File tree

4 files changed

+31
-7
lines changed

4 files changed

+31
-7
lines changed

.github/workflows/update-helm-repo.yaml

+28-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,15 @@ on:
2424
required: false
2525
type: string
2626
secrets:
27+
github_app_id:
28+
description: Github App ID to authenticate with
29+
required: false
30+
github_app_pem:
31+
description: GitHub APP pem to authenticate with
32+
required: false
2733
helm_repo_token:
2834
description: GitHub api token to use against the helm-charts repository
29-
required: true
35+
required: false
3036

3137
env:
3238
CR_CONFIGFILE: "${{ github.workspace }}/source/${{ inputs.cr_configfile }}"
@@ -87,8 +93,26 @@ jobs:
8793
release:
8894
needs: [ setup ]
8995
runs-on: ubuntu-latest
96+
env:
97+
github_app_id: ${{ secrets.github_app_id }}
9098
if: needs.setup.outputs.changed == 'true'
9199
steps:
100+
- name: Create a GitHub App installation access token
101+
if: env.github_app_id != ''
102+
uses: tibdex/github-app-token@v2
103+
id: app-token
104+
with:
105+
app_id: ${{ secrets.github_app_id }}
106+
private_key: ${{ secrets.github_app_pem }}
107+
108+
- name: Set the correct token (Github App or PAT)
109+
run: |
110+
if [[ "${{ env.github_app_id }}" == '' ]]; then
111+
echo "AUTHTOKEN=${{ secrets.helm_repo_token }}" >> $GITHUB_ENV
112+
else
113+
echo "AUTHTOKEN=${{ steps.app-token.outputs.token }}" >> $GITHUB_ENV
114+
fi
115+
92116
- name: Checkout
93117
uses: actions/checkout@v2
94118
with:
@@ -108,7 +132,7 @@ jobs:
108132
fetch-depth: 0
109133
repository: grafana/helm-charts
110134
path: helm-charts
111-
token: ${{ secrets.helm_repo_token }}
135+
token: ${{ env.AUTHTOKEN }}
112136

113137
- name: Configure Git for helm-charts
114138
run: |
@@ -188,7 +212,7 @@ jobs:
188212
${{ env.CR_PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz.prov
189213
repository: grafana/helm-charts
190214
tag_name: ${{ steps.parse-chart.outputs.tagname }}
191-
token: ${{ secrets.helm_repo_token }}
215+
token: ${{ env.AUTHTOKEN }}
192216

193217
- name: Push release tag on origin
194218
run: |
@@ -199,4 +223,4 @@ jobs:
199223
- name: Update helm repo index.yaml
200224
run: |
201225
cd helm-charts
202-
"${CR_TOOL_PATH}/cr" index --config "${CR_CONFIGFILE}" --token "${{ secrets.helm_repo_token }}" --index-path "${CR_INDEX_PATH}" --package-path "${CR_PACKAGE_PATH}" --push
226+
"${CR_TOOL_PATH}/cr" index --config "${CR_CONFIGFILE}" --token "${{ env.AUTHTOKEN }}" --index-path "${CR_INDEX_PATH}" --package-path "${CR_PACKAGE_PATH}" --push

charts/tempo-distributed/Chart.yaml

+1-1
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.6.12
5+
version: 1.6.13
66
appVersion: 2.2.3
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

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

55
Grafana Tempo in MicroService mode
66

charts/tempo-distributed/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1788,7 +1788,7 @@ gateway:
17881788
proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:9411/spans;
17891789
}
17901790
1791-
location = /otlp/v1/traces {
1791+
location = /v1/traces {
17921792
proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces;
17931793
}
17941794

0 commit comments

Comments
 (0)