Skip to content

Commit af55666

Browse files
johannes94johannes94
authored
sync: stage to production (#1600)
sync-branches: New code has just landed in stage, so let's bring production up to speed!
2 parents 3b26b56 + a3f37ec commit af55666

Some content is hidden

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

47 files changed

+2121
-672
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
GOPATH=$(go env GOPATH)
119119
export GOPATH
120120
export PATH=${PATH}:$GOPATH/bin
121-
make verify binary test test/integration
121+
make verify binary test
122122
timeout-minutes: 14
123123
build-push-images:
124124
name: "Build and push fleet* images to quay.io"

‎.secrets.baseline‎

Lines changed: 84 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
{
2121
"name": "CloudantDetector"
2222
},
23+
{
24+
"name": "DiscordBotTokenDetector"
25+
},
2326
{
2427
"name": "GitHubTokenDetector"
2528
},
@@ -122,8 +125,7 @@
122125
"filename": "config/jwks-file-static.json",
123126
"hashed_secret": "551c2aa179bc3c0e2e8176d4b458d077ed358e25",
124127
"is_verified": false,
125-
"line_number": 8,
126-
"is_secret": false
128+
"line_number": 8
127129
},
128130
{
129131
"type": "Base64 High Entropy String",
@@ -137,8 +139,7 @@
137139
"filename": "config/jwks-file-static.json",
138140
"hashed_secret": "f05bf8a9b8521955a5fa259abd1d5a6d269273ec",
139141
"is_verified": false,
140-
"line_number": 16,
141-
"is_secret": false
142+
"line_number": 16
142143
},
143144
{
144145
"type": "Base64 High Entropy String",
@@ -152,8 +153,7 @@
152153
"filename": "config/jwks-file-static.json",
153154
"hashed_secret": "e23d321e76d1144e48b7f1d05dfd0d5036031003",
154155
"is_verified": false,
155-
"line_number": 24,
156-
"is_secret": false
156+
"line_number": 24
157157
},
158158
{
159159
"type": "Base64 High Entropy String",
@@ -167,16 +167,14 @@
167167
"filename": "config/jwks-file-static.json",
168168
"hashed_secret": "9b87ab16703bb0ccd78aee2f69bd0e604f7a42dc",
169169
"is_verified": false,
170-
"line_number": 32,
171-
"is_secret": false
170+
"line_number": 32
172171
},
173172
{
174173
"type": "Base64 High Entropy String",
175174
"filename": "config/jwks-file-static.json",
176175
"hashed_secret": "3744e3d32aa35c3bb53d76d1832699b723f07812",
177176
"is_verified": false,
178-
"line_number": 41,
179-
"is_secret": false
177+
"line_number": 41
180178
}
181179
],
182180
"config/jwks-file.json": [
@@ -192,8 +190,7 @@
192190
"filename": "config/jwks-file.json",
193191
"hashed_secret": "551c2aa179bc3c0e2e8176d4b458d077ed358e25",
194192
"is_verified": false,
195-
"line_number": 8,
196-
"is_secret": false
193+
"line_number": 8
197194
},
198195
{
199196
"type": "Base64 High Entropy String",
@@ -207,8 +204,7 @@
207204
"filename": "config/jwks-file.json",
208205
"hashed_secret": "f05bf8a9b8521955a5fa259abd1d5a6d269273ec",
209206
"is_verified": false,
210-
"line_number": 16,
211-
"is_secret": false
207+
"line_number": 16
212208
},
213209
{
214210
"type": "Base64 High Entropy String",
@@ -222,8 +218,7 @@
222218
"filename": "config/jwks-file.json",
223219
"hashed_secret": "e23d321e76d1144e48b7f1d05dfd0d5036031003",
224220
"is_verified": false,
225-
"line_number": 24,
226-
"is_secret": false
221+
"line_number": 24
227222
},
228223
{
229224
"type": "Base64 High Entropy String",
@@ -237,8 +232,7 @@
237232
"filename": "config/jwks-file.json",
238233
"hashed_secret": "9b87ab16703bb0ccd78aee2f69bd0e604f7a42dc",
239234
"is_verified": false,
240-
"line_number": 32,
241-
"is_secret": false
235+
"line_number": 32
242236
}
243237
],
244238
"db_setup_docker.sql": [
@@ -247,8 +241,7 @@
247241
"filename": "db_setup_docker.sql",
248242
"hashed_secret": "afc848c316af1a89d49826c5ae9d00ed769415f3",
249243
"is_verified": false,
250-
"line_number": 1,
251-
"is_secret": false
244+
"line_number": 1
252245
}
253246
],
254247
"dev/env/manifests/shared/03-configmap-config.yaml": [
@@ -334,6 +327,15 @@
334327
"line_number": 7
335328
}
336329
],
330+
"e2e/e2e_test.go": [
331+
{
332+
"type": "Secret Keyword",
333+
"filename": "e2e/e2e_test.go",
334+
"hashed_secret": "7f38822bc2b03e97325ff310099f457f6f788daf",
335+
"is_verified": false,
336+
"line_number": 267
337+
}
338+
],
337339
"fleetshard/pkg/central/cloudprovider/dbclient_moq.go": [
338340
{
339341
"type": "Secret Keyword",
@@ -352,30 +354,66 @@
352354
"line_number": 1531
353355
}
354356
],
357+
"internal/dinosaur/pkg/services/dinosaurservice_moq.go": [
358+
{
359+
"type": "Secret Keyword",
360+
"filename": "internal/dinosaur/pkg/services/dinosaurservice_moq.go",
361+
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
362+
"is_verified": false,
363+
"line_number": 982
364+
},
365+
{
366+
"type": "Secret Keyword",
367+
"filename": "internal/dinosaur/pkg/services/dinosaurservice_moq.go",
368+
"hashed_secret": "d035c0406b3e8286d3427e91db3497e0e17f0f83",
369+
"is_verified": false,
370+
"line_number": 983
371+
}
372+
],
373+
"pkg/client/fleetmanager/api_moq.go": [
374+
{
375+
"type": "Secret Keyword",
376+
"filename": "pkg/client/fleetmanager/api_moq.go",
377+
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
378+
"is_verified": false,
379+
"line_number": 583
380+
},
381+
{
382+
"type": "Secret Keyword",
383+
"filename": "pkg/client/fleetmanager/api_moq.go",
384+
"hashed_secret": "0ff50155b4f57adeccae93f27dc23efe2a8b7824",
385+
"is_verified": false,
386+
"line_number": 584
387+
},
388+
{
389+
"type": "Secret Keyword",
390+
"filename": "pkg/client/fleetmanager/api_moq.go",
391+
"hashed_secret": "5ce1b8d4fb9dae5c02b2017e39e7267a21cea37f",
392+
"is_verified": false,
393+
"line_number": 593
394+
}
395+
],
355396
"pkg/client/iam/client_moq.go": [
356397
{
357398
"type": "Secret Keyword",
358399
"filename": "pkg/client/iam/client_moq.go",
359400
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
360401
"is_verified": false,
361-
"line_number": 649,
362-
"is_secret": false
402+
"line_number": 649
363403
},
364404
{
365405
"type": "Secret Keyword",
366406
"filename": "pkg/client/iam/client_moq.go",
367407
"hashed_secret": "4595e0fe3be13544e523e5f6c1145f15007f7b58",
368408
"is_verified": false,
369-
"line_number": 650,
370-
"is_secret": false
409+
"line_number": 650
371410
},
372411
{
373412
"type": "Secret Keyword",
374413
"filename": "pkg/client/iam/client_moq.go",
375414
"hashed_secret": "539fbe365f6c0db26d473d85a736d318c2f565e5",
376415
"is_verified": false,
377-
"line_number": 991,
378-
"is_secret": false
416+
"line_number": 991
379417
}
380418
],
381419
"pkg/client/iam/gocloak_moq.go": [
@@ -384,48 +422,42 @@
384422
"filename": "pkg/client/iam/gocloak_moq.go",
385423
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
386424
"is_verified": false,
387-
"line_number": 9711,
388-
"is_secret": false
425+
"line_number": 9711
389426
},
390427
{
391428
"type": "Secret Keyword",
392429
"filename": "pkg/client/iam/gocloak_moq.go",
393430
"hashed_secret": "7f0b58c8f07c09a5ed45a784a8e1ea4d3e983d59",
394431
"is_verified": false,
395-
"line_number": 9712,
396-
"is_secret": false
432+
"line_number": 9712
397433
},
398434
{
399435
"type": "Secret Keyword",
400436
"filename": "pkg/client/iam/gocloak_moq.go",
401437
"hashed_secret": "9b8b876c2782fa992fab14095267bb8757b9fabc",
402438
"is_verified": false,
403-
"line_number": 13092,
404-
"is_secret": false
439+
"line_number": 13092
405440
},
406441
{
407442
"type": "Secret Keyword",
408443
"filename": "pkg/client/iam/gocloak_moq.go",
409444
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
410445
"is_verified": false,
411-
"line_number": 13095,
412-
"is_secret": false
446+
"line_number": 13095
413447
},
414448
{
415449
"type": "Secret Keyword",
416450
"filename": "pkg/client/iam/gocloak_moq.go",
417451
"hashed_secret": "eb1b883e199141e362a143c51178ab8f09c87751",
418452
"is_verified": false,
419-
"line_number": 13716,
420-
"is_secret": false
453+
"line_number": 13716
421454
},
422455
{
423456
"type": "Secret Keyword",
424457
"filename": "pkg/client/iam/gocloak_moq.go",
425458
"hashed_secret": "1b46ecc8fb47b1b39a420f00f08dbd58e0313188",
426459
"is_verified": false,
427-
"line_number": 14023,
428-
"is_secret": false
460+
"line_number": 14023
429461
}
430462
],
431463
"pkg/client/redhatsso/api/api/openapi.yaml": [
@@ -443,8 +475,7 @@
443475
"filename": "pkg/shared/secrets/secrets_test.go",
444476
"hashed_secret": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
445477
"is_verified": false,
446-
"line_number": 113,
447-
"is_secret": false
478+
"line_number": 113
448479
}
449480
],
450481
"templates/envoy-config-configmap.yml": [
@@ -462,78 +493,71 @@
462493
"filename": "templates/service-template.yml",
463494
"hashed_secret": "13032f402fed753c2248419ea4f69f99931f6dbc",
464495
"is_verified": false,
465-
"line_number": 518
496+
"line_number": 522
466497
},
467498
{
468499
"type": "Base64 High Entropy String",
469500
"filename": "templates/service-template.yml",
470501
"hashed_secret": "30025f80f6e22cdafb85db387d50f90ea884576a",
471502
"is_verified": false,
472-
"line_number": 518
503+
"line_number": 522
473504
},
474505
{
475506
"type": "Base64 High Entropy String",
476507
"filename": "templates/service-template.yml",
477508
"hashed_secret": "355f24fd038bcaf85617abdcaa64af51ed19bbcf",
478509
"is_verified": false,
479-
"line_number": 518
510+
"line_number": 522
480511
},
481512
{
482513
"type": "Base64 High Entropy String",
483514
"filename": "templates/service-template.yml",
484515
"hashed_secret": "3d8a1dcd2c3c765ce35c9a9552d23273cc4ddace",
485516
"is_verified": false,
486-
"line_number": 518
517+
"line_number": 522
487518
},
488519
{
489520
"type": "Base64 High Entropy String",
490521
"filename": "templates/service-template.yml",
491522
"hashed_secret": "4ac7b0522761eba972467942cd5cd7499dd2c361",
492523
"is_verified": false,
493-
"line_number": 518
524+
"line_number": 522
494525
},
495526
{
496527
"type": "Base64 High Entropy String",
497528
"filename": "templates/service-template.yml",
498529
"hashed_secret": "7639ab2a6bcf2ea30a055a99468c9cd844d4c22a",
499530
"is_verified": false,
500-
"line_number": 518
531+
"line_number": 522
501532
},
502533
{
503534
"type": "Base64 High Entropy String",
504535
"filename": "templates/service-template.yml",
505536
"hashed_secret": "b56360daf4793d2a74991a972b34d95bc00fb2da",
506537
"is_verified": false,
507-
"line_number": 518
538+
"line_number": 522
508539
},
509540
{
510541
"type": "Base64 High Entropy String",
511542
"filename": "templates/service-template.yml",
512543
"hashed_secret": "c9a73ef9ee8ce9f38437227801c70bcc6740d1a1",
513544
"is_verified": false,
514-
"line_number": 518
545+
"line_number": 522
515546
},
516547
{
517548
"type": "Base64 High Entropy String",
518549
"filename": "templates/service-template.yml",
519550
"hashed_secret": "14736999d9940728c5294277831a702f7882dece",
520551
"is_verified": false,
521-
"line_number": 555
552+
"line_number": 559
522553
},
523554
{
524555
"type": "Secret Keyword",
525556
"filename": "templates/service-template.yml",
526557
"hashed_secret": "4e199b4a1c40b497a95fcd1cd896351733849949",
527558
"is_verified": false,
528-
"line_number": 702,
559+
"line_number": 706,
529560
"is_secret": false
530-
},
531-
{
532-
"type": "Secret Keyword",
533-
"filename": "templates/service-template.yml",
534-
"hashed_secret": "9d51dabe59aa776bef2909d3689374ebb93ab2be",
535-
"is_verified": false,
536-
"line_number": 745
537561
}
538562
],
539563
"test/support/certs.json": [
@@ -549,8 +573,7 @@
549573
"filename": "test/support/certs.json",
550574
"hashed_secret": "d59844c767c4c6c3840f8cabbc04b1e5ed2acc22",
551575
"is_verified": false,
552-
"line_number": 8,
553-
"is_secret": false
576+
"line_number": 8
554577
}
555578
],
556579
"test/support/jwt_private_key.pem": [
@@ -559,10 +582,9 @@
559582
"filename": "test/support/jwt_private_key.pem",
560583
"hashed_secret": "be4fc4886bd949b369d5e092eb87494f12e57e5b",
561584
"is_verified": false,
562-
"line_number": 1,
563-
"is_secret": false
585+
"line_number": 1
564586
}
565587
]
566588
},
567-
"generated_at": "2024-01-09T13:44:27Z"
589+
"generated_at": "2024-01-17T10:24:51Z"
568590
}

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,6 @@ deploy/secrets:
709709
-p CENTRAL_TLS_CERT="$(shell ([ -s './secrets/central-tls.crt' ] && [ -z '${CENTRAL_TLS_CERT}' ]) && cat ./secrets/central-tls.crt || echo '${CENTRAL_TLS_CERT}')" \
710710
-p CENTRAL_TLS_KEY="$(shell ([ -s './secrets/central-tls.key' ] && [ -z '${CENTRAL_TLS_KEY}' ]) && cat ./secrets/central-tls.key || echo '${CENTRAL_TLS_KEY}')" \
711711
-p OBSERVABILITY_CONFIG_ACCESS_TOKEN="$(shell ([ -s './secrets/observability-config-access.token' ] && [ -z '${OBSERVABILITY_CONFIG_ACCESS_TOKEN}' ]) && cat ./secrets/observability-config-access.token || echo '${OBSERVABILITY_CONFIG_ACCESS_TOKEN}')" \
712-
-p KUBE_CONFIG="${KUBE_CONFIG}" \
713712
-p OBSERVABILITY_RHSSO_LOGS_CLIENT_ID="$(shell ([ -s './secrets/rhsso-logs.clientId' ] && [ -z '${OBSERVABILITY_RHSSO_LOGS_CLIENT_ID}' ]) && cat ./secrets/rhsso-logs.clientId || echo '${OBSERVABILITY_RHSSO_LOGS_CLIENT_ID}')" \
714713
-p OBSERVABILITY_RHSSO_LOGS_SECRET="$(shell ([ -s './secrets/rhsso-logs.clientSecret' ] && [ -z '${OBSERVABILITY_RHSSO_LOGS_SECRET}' ]) && cat ./secrets/rhsso-logs.clientSecret || echo '${OBSERVABILITY_RHSSO_LOGS_SECRET}')" \
715714
-p OBSERVABILITY_RHSSO_METRICS_CLIENT_ID="$(shell ([ -s './secrets/rhsso-metrics.clientId' ] && [ -z '${OBSERVABILITY_RHSSO_METRICS_CLIENT_ID}' ]) && cat ./secrets/rhsso-metrics.clientId || echo '${OBSERVABILITY_RHSSO_METRICS_CLIENT_ID}')" \

0 commit comments

Comments
 (0)