use proper path to get tempo secrets (grafana#4199)

knylander-grafana · Oct 16, 2024 · 280128f · 280128f
1 parent a5b4d76
commit 280128f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -44,9 +44,9 @@ local docker_config_json_secret = secret('dockerconfigjson', 'secret/data/common
 
 // secret needed for dep-tools
 local gh_token_secret = secret('gh_token', 'infra/data/ci/github/grafanabot', 'pat');
-local tempo_app_id_secret = secret('tempo_app_id_secret', 'ci/data/repo/grafana/tempo/github-app', 'app-id');
-local tempo_app_installation_id_secret = secret('tempo_app_installation_id_secret', 'ci/data/repo/grafana/tempo/github-app', 'app-installation-id');
-local tempo_app_private_key_secret = secret('tempo_app_private_key_secret', 'ci/data/repo/grafana/tempo/github-app', 'app-private-key');
+local tempo_app_id_secret = secret('tempo_app_id_secret', 'infra/data/ci/tempo/github-app', 'app-id');
+local tempo_app_installation_id_secret = secret('tempo_app_installation_id_secret', 'infra/data/ci/tempo/github-app', 'app-installation-id');
+local tempo_app_private_key_secret = secret('tempo_app_private_key_secret', 'infra/data/ci/tempo/github-app', 'app-private-key');
 
 // secret to sign linux packages
 local gpg_passphrase = secret('gpg_passphrase', 'infra/data/ci/packages-publish/gpg', 'passphrase');
@@ -362,7 +362,7 @@ local deploy_to_dev() = {
         name: 'Generate GitHub token',
         image: 'us.gcr.io/kubernetes-dev/github-app-secret-writer:latest',
         environment: {
-          GITHUB_APP_ID: { from_secret:  tempo_app_id_secret.name},
+          GITHUB_APP_ID: { from_secret:  tempo_app_id_secret.name },
           GITHUB_APP_INSTALLATION_ID: { from_secret:  tempo_app_installation_id_secret.name },
           GITHUB_APP_PRIVATE_KEY: { from_secret: tempo_app_private_key_secret.name },
         },

diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -538,19 +538,19 @@ name: gh_token
 ---
 get:
   name: app-id
-  path: ci/data/repo/grafana/tempo/github-app
+  path: infra/data/ci/tempo/github-app
 kind: secret
 name: tempo_app_id_secret
 ---
 get:
   name: app-installation-id
-  path: ci/data/repo/grafana/tempo/github-app
+  path: infra/data/ci/tempo/github-app
 kind: secret
 name: tempo_app_installation_id_secret
 ---
 get:
   name: app-private-key
-  path: ci/data/repo/grafana/tempo/github-app
+  path: infra/data/ci/tempo/github-app
 kind: secret
 name: tempo_app_private_key_secret
 ---
@@ -597,6 +597,6 @@ kind: secret
 name: gpg_passphrase
 ---
 kind: signature
-hmac: 123492f41e48b294e4a5f98c3d253da393da808d6ea4193189b5308d5fabf1f6
+hmac: 0265cd585d8c7fc444bebc8aa1164ec6aa7893c2aa16f3beb61503102b00a798
 
 ...