Skip to content

Commit 9374095

Browse files
authored
Move/cleanup/standardize staging MPC secrets for stone-prod-p02 (#8656)
* Delete IBM api key, not use with static VMs * Use secrets moved in infra vault folder * Standardize the names, they will be the same on all clusters For ppc64le, the ssh key is taken from the generated secret from Terraform, i.e. production/platform/terraform/generated/stone-prod-p02/ibm-ppc64le-ssh-key. For now leave it there as all secrets generated from Terraform will be moved in infrastructure folder as another change. KFLUXINFRA-2419 Signed-off-by: Hugo Ares <[email protected]>
1 parent 6be964c commit 9374095

File tree

2 files changed

+21
-44
lines changed

2 files changed

+21
-44
lines changed

components/multi-platform-controller/production-downstream/stone-prod-p02/external-secrets.yaml

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
dataFrom:
1313
- extract:
14-
key: production/build/multi-platform-controller/internal-prod-aws-account
14+
key: production/infrastructure/multi-platform-controller/stone-prod-p02/aws-account
1515
refreshInterval: 1h
1616
secretStoreRef:
1717
kind: ClusterSecretStore
@@ -34,7 +34,7 @@ metadata:
3434
spec:
3535
dataFrom:
3636
- extract:
37-
key: production/build/multi-platform-controller/internal-prod-ssh-key
37+
key: production/infrastructure/multi-platform-controller/stone-prod-p02/aws-ssh-key
3838
refreshInterval: 1h
3939
secretStoreRef:
4040
kind: ClusterSecretStore
@@ -46,29 +46,6 @@ spec:
4646
---
4747
apiVersion: external-secrets.io/v1beta1
4848
kind: ExternalSecret
49-
metadata:
50-
name: internal-prod-ibm-api-key
51-
namespace: multi-platform-controller
52-
labels:
53-
build.appstudio.redhat.com/multi-platform-secret: "true"
54-
annotations:
55-
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
56-
argocd.argoproj.io/sync-wave: "-1"
57-
spec:
58-
dataFrom:
59-
- extract:
60-
key: production/build/multi-platform-controller/internal-prod-ibm-api-key
61-
refreshInterval: 1h
62-
secretStoreRef:
63-
kind: ClusterSecretStore
64-
name: appsre-stonesoup-vault
65-
target:
66-
creationPolicy: Owner
67-
deletionPolicy: Delete
68-
name: internal-prod-ibm-api-key
69-
---
70-
apiVersion: external-secrets.io/v1beta1
71-
kind: ExternalSecret
7249
metadata:
7350
name: ibm-ppc64le-ssh-key
7451
namespace: multi-platform-controller
@@ -93,7 +70,7 @@ spec:
9370
apiVersion: external-secrets.io/v1beta1
9471
kind: ExternalSecret
9572
metadata:
96-
name: ibm-s390x-static-ssh-key
73+
name: ibm-s390x-ssh-key
9774
namespace: multi-platform-controller
9875
labels:
9976
build.appstudio.redhat.com/multi-platform-secret: "true"
@@ -103,12 +80,12 @@ metadata:
10380
spec:
10481
dataFrom:
10582
- extract:
106-
key: production/build/multi-platform-controller/stone-prod-p02-ibm-s390x-static-ssh-key
83+
key: production/infrastructure/multi-platform-controller/stone-prod-p02/ibm-s390x-ssh-key
10784
refreshInterval: 1h
10885
secretStoreRef:
10986
kind: ClusterSecretStore
11087
name: appsre-stonesoup-vault
11188
target:
11289
creationPolicy: Owner
11390
deletionPolicy: Delete
114-
name: ibm-s390x-static-ssh-key
91+
name: ibm-s390x-ssh-key

components/multi-platform-controller/production-downstream/stone-prod-p02/host-values.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -297,110 +297,110 @@ staticHosts:
297297
address: 10.130.79.4
298298
concurrency: '4'
299299
platform: linux/s390x
300-
secret: ibm-s390x-static-ssh-key
300+
secret: ibm-s390x-ssh-key
301301
user: root
302302

303303
s390x-static-2:
304304
address: 10.130.79.5
305305
concurrency: '4'
306306
platform: linux/s390x
307-
secret: ibm-s390x-static-ssh-key
307+
secret: ibm-s390x-ssh-key
308308
user: root
309309

310310
s390x-static-3:
311311
address: 10.130.79.6
312312
concurrency: '4'
313313
platform: linux/s390x
314-
secret: ibm-s390x-static-ssh-key
314+
secret: ibm-s390x-ssh-key
315315
user: root
316316

317317
s390x-static-4:
318318
address: 10.130.79.37
319319
concurrency: '4'
320320
platform: linux/s390x
321-
secret: ibm-s390x-static-ssh-key
321+
secret: ibm-s390x-ssh-key
322322
user: root
323323

324324
s390x-static-5:
325325
address: 10.130.79.36
326326
concurrency: '4'
327327
platform: linux/s390x
328-
secret: ibm-s390x-static-ssh-key
328+
secret: ibm-s390x-ssh-key
329329
user: root
330330

331331
s390x-static-6:
332332
address: 10.130.79.68
333333
concurrency: '4'
334334
platform: linux/s390x
335-
secret: ibm-s390x-static-ssh-key
335+
secret: ibm-s390x-ssh-key
336336
user: root
337337

338338
s390x-static-7:
339339
address: 10.130.79.69
340340
concurrency: '4'
341341
platform: linux/s390x
342-
secret: ibm-s390x-static-ssh-key
342+
secret: ibm-s390x-ssh-key
343343
user: root
344344

345345
s390x-static-8:
346346
address: 10.130.79.70
347347
concurrency: '4'
348348
platform: linux/s390x
349-
secret: ibm-s390x-static-ssh-key
349+
secret: ibm-s390x-ssh-key
350350
user: root
351351

352352
s390x-static-9:
353353
address: 10.130.79.71
354354
concurrency: '4'
355355
platform: linux/s390x
356-
secret: ibm-s390x-static-ssh-key
356+
secret: ibm-s390x-ssh-key
357357
user: root
358358

359359
s390x-static-10:
360360
address: 10.130.79.72
361361
concurrency: '4'
362362
platform: linux/s390x
363-
secret: ibm-s390x-static-ssh-key
363+
secret: ibm-s390x-ssh-key
364364
user: root
365365

366366
s390x-static-11:
367367
address: 10.130.79.7
368368
concurrency: '4'
369369
platform: linux/s390x
370-
secret: ibm-s390x-static-ssh-key
370+
secret: ibm-s390x-ssh-key
371371
user: root
372372

373373
s390x-static-12:
374374
address: 10.130.79.8
375375
concurrency: '4'
376376
platform: linux/s390x
377-
secret: ibm-s390x-static-ssh-key
377+
secret: ibm-s390x-ssh-key
378378
user: root
379379

380380
s390x-static-13:
381381
address: 10.130.79.9
382382
concurrency: '4'
383383
platform: linux/s390x
384-
secret: ibm-s390x-static-ssh-key
384+
secret: ibm-s390x-ssh-key
385385
user: root
386386

387387
s390x-static-14:
388388
address: 10.130.79.10
389389
concurrency: '4'
390390
platform: linux/s390x
391-
secret: ibm-s390x-static-ssh-key
391+
secret: ibm-s390x-ssh-key
392392
user: root
393393

394394
s390x-static-15:
395395
address: 10.130.79.38
396396
concurrency: '4'
397397
platform: linux/s390x
398-
secret: ibm-s390x-static-ssh-key
398+
secret: ibm-s390x-ssh-key
399399
user: root
400400

401401
s390x-static-16:
402402
address: 10.130.79.39
403403
concurrency: '4'
404404
platform: linux/s390x
405-
secret: ibm-s390x-static-ssh-key
405+
secret: ibm-s390x-ssh-key
406406
user: root

0 commit comments

Comments
 (0)