Skip to content

Commit 6cedd55

Browse files
committed
ci: Remove unused Redpanda License secret
There was unexpected secret removal from AWS Secret Manager which causes our pipeline to suddenly fail on all front. The secret was restored only for one week. This commit needs to be backported to all release branches and rebased on any outstanding PRs (feature branches). (cherry picked from commit d333027) # Conflicts: # .buildkite/testsuite.yml
1 parent e38690d commit 6cedd55

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

.buildkite/testsuite.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ steps:
3939
json-to-env:
4040
- secret-id: sdlc/prod/buildkite/github_api_token
4141
- secret-id: sdlc/prod/buildkite/redpanda_sample_license
42-
- secret-id: sdlc/prod/buildkite/redpanda_second_sample_license
4342
- secret-id: sdlc/prod/buildkite/slack_vbot_token
4443
- https://$GITHUB_API_TOKEN@github.com/redpanda-data/step-slack-notify-buildkite-plugin.git#main:
4544
channel_name: kubernetes-tests
@@ -81,7 +80,6 @@ steps:
8180
json-to-env:
8281
- secret-id: sdlc/prod/buildkite/github_api_token
8382
- secret-id: sdlc/prod/buildkite/redpanda_sample_license
84-
- secret-id: sdlc/prod/buildkite/redpanda_second_sample_license
8583
- secret-id: sdlc/prod/buildkite/slack_vbot_token
8684
- https://$GITHUB_API_TOKEN@github.com/redpanda-data/step-slack-notify-buildkite-plugin.git#main:
8785
channel_name: kubernetes-tests
@@ -126,7 +124,6 @@ steps:
126124
json-to-env:
127125
- secret-id: sdlc/prod/buildkite/github_api_token
128126
- secret-id: sdlc/prod/buildkite/redpanda_sample_license
129-
- secret-id: sdlc/prod/buildkite/redpanda_second_sample_license
130127
- secret-id: sdlc/prod/buildkite/slack_vbot_token
131128
- https://$GITHUB_API_TOKEN@github.com/redpanda-data/step-slack-notify-buildkite-plugin.git#main:
132129
channel_name: kubernetes-tests
@@ -171,7 +168,6 @@ steps:
171168
json-to-env:
172169
- secret-id: sdlc/prod/buildkite/github_api_token
173170
- secret-id: sdlc/prod/buildkite/redpanda_sample_license
174-
- secret-id: sdlc/prod/buildkite/redpanda_second_sample_license
175171
- secret-id: sdlc/prod/buildkite/slack_vbot_token
176172
- https://$GITHUB_API_TOKEN@github.com/redpanda-data/step-slack-notify-buildkite-plugin.git#main:
177173
channel_name: kubernetes-tests
@@ -213,7 +209,6 @@ steps:
213209
json-to-env:
214210
- secret-id: sdlc/prod/buildkite/github_api_token
215211
- secret-id: sdlc/prod/buildkite/redpanda_sample_license
216-
- secret-id: sdlc/prod/buildkite/redpanda_second_sample_license
217212
- secret-id: sdlc/prod/buildkite/slack_vbot_token
218213
- https://$GITHUB_API_TOKEN@github.com/redpanda-data/step-slack-notify-buildkite-plugin.git#main:
219214
channel_name: kubernetes-tests

gen/pipeline/helpers.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ func (suite *TestSuite) ToStep() pipeline.Step {
9191
secretEnvVars(
9292
GITHUB_API_TOKEN, // Required to clone private GH repos (Flux Shims, buildkite slack).
9393
REDPANDA_SAMPLE_LICENSE,
94-
REDPANDA_SECOND_SAMPLE_LICENSE,
9594
SLACK_VBOT_TOKEN, // Used to notify us of build failures in slack.
9695
),
9796
// Inform us about failures on main.

gen/pipeline/pipeline.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ import (
1717
var (
1818
// Known/Permitted environment variables pulled from AWS secret store.
1919

20-
GITHUB_API_TOKEN = secretEnvVar{SecretID: "sdlc/prod/buildkite/github_api_token"}
21-
REDPANDA_SAMPLE_LICENSE = secretEnvVar{SecretID: "sdlc/prod/buildkite/redpanda_sample_license"}
22-
REDPANDA_SECOND_SAMPLE_LICENSE = secretEnvVar{SecretID: "sdlc/prod/buildkite/redpanda_second_sample_license"}
23-
SLACK_VBOT_TOKEN = secretEnvVar{SecretID: "sdlc/prod/buildkite/slack_vbot_token"}
20+
GITHUB_API_TOKEN = secretEnvVar{SecretID: "sdlc/prod/buildkite/github_api_token"}
21+
REDPANDA_SAMPLE_LICENSE = secretEnvVar{SecretID: "sdlc/prod/buildkite/redpanda_sample_license"}
22+
SLACK_VBOT_TOKEN = secretEnvVar{SecretID: "sdlc/prod/buildkite/slack_vbot_token"}
2423

2524
// Known/Permitted Agent Pools
2625

0 commit comments

Comments
 (0)