Skip to content

Commit c047dd8

Browse files
parametalolparametalol
authored
sync: stage to production (#1729)
sync-branches: New code has just landed in stage, so let's bring production up to speed!
2 parents 57c0cd7 + 091db08 commit c047dd8

File tree

100 files changed

+1679
-1638
lines changed

Some content is hidden

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

100 files changed

+1679
-1638
lines changed

‎.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ config/
88
secrets/
99
stackrox/
1010
.pre-commit-config.yaml
11-
templates/
1211
.artifacts/
1312
.DS_Store

‎.openshift-ci/tests/e2e.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ source "${GITROOT}/dev/env/scripts/lib.sh"
1111

1212
export RUN_AUTH_E2E_DEFAULT="false"
1313
export RUN_CENTRAL_E2E_DEFAULT="true"
14-
export RHACS_GITOPS_ENABLED="true"
15-
export RHACS_TARGETED_OPERATOR_UPGRADES="true"
1614

1715
if [[ "${OPENSHIFT_CI:-}" == "true" ]]; then
1816
# We are running in an OpenShift CI context, configure accordingly.
@@ -201,6 +199,6 @@ port-forwarding stop db 5432 || true
201199
port-forwarding stop fleet-manager 8000 || true
202200

203201
log "Killing oc processes forcefully"
204-
pkill -9 oc || true
202+
pkill -9 '^oc$' || true
205203

206204
exit $FAIL

‎.secrets.baseline‎

Lines changed: 13 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -244,71 +244,6 @@
244244
"line_number": 1
245245
}
246246
],
247-
"dev/env/manifests/shared/03-configmap-config.yaml": [
248-
{
249-
"type": "Base64 High Entropy String",
250-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
251-
"hashed_secret": "13032f402fed753c2248419ea4f69f99931f6dbc",
252-
"is_verified": false,
253-
"line_number": 38
254-
},
255-
{
256-
"type": "Base64 High Entropy String",
257-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
258-
"hashed_secret": "30025f80f6e22cdafb85db387d50f90ea884576a",
259-
"is_verified": false,
260-
"line_number": 38
261-
},
262-
{
263-
"type": "Base64 High Entropy String",
264-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
265-
"hashed_secret": "355f24fd038bcaf85617abdcaa64af51ed19bbcf",
266-
"is_verified": false,
267-
"line_number": 38
268-
},
269-
{
270-
"type": "Base64 High Entropy String",
271-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
272-
"hashed_secret": "3d8a1dcd2c3c765ce35c9a9552d23273cc4ddace",
273-
"is_verified": false,
274-
"line_number": 38
275-
},
276-
{
277-
"type": "Base64 High Entropy String",
278-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
279-
"hashed_secret": "4ac7b0522761eba972467942cd5cd7499dd2c361",
280-
"is_verified": false,
281-
"line_number": 38
282-
},
283-
{
284-
"type": "Base64 High Entropy String",
285-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
286-
"hashed_secret": "7639ab2a6bcf2ea30a055a99468c9cd844d4c22a",
287-
"is_verified": false,
288-
"line_number": 38
289-
},
290-
{
291-
"type": "Base64 High Entropy String",
292-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
293-
"hashed_secret": "b56360daf4793d2a74991a972b34d95bc00fb2da",
294-
"is_verified": false,
295-
"line_number": 38
296-
},
297-
{
298-
"type": "Base64 High Entropy String",
299-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
300-
"hashed_secret": "c9a73ef9ee8ce9f38437227801c70bcc6740d1a1",
301-
"is_verified": false,
302-
"line_number": 38
303-
},
304-
{
305-
"type": "Base64 High Entropy String",
306-
"filename": "dev/env/manifests/shared/03-configmap-config.yaml",
307-
"hashed_secret": "14736999d9940728c5294277831a702f7882dece",
308-
"is_verified": false,
309-
"line_number": 75
310-
}
311-
],
312247
"dp-terraform/helm/rhacs-terraform/charts/observability/templates/01-operator-06-cr.yaml": [
313248
{
314249
"type": "Secret Keyword",
@@ -360,14 +295,14 @@
360295
"filename": "internal/dinosaur/pkg/services/dinosaurservice_moq.go",
361296
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
362297
"is_verified": false,
363-
"line_number": 982
298+
"line_number": 1056
364299
},
365300
{
366301
"type": "Secret Keyword",
367302
"filename": "internal/dinosaur/pkg/services/dinosaurservice_moq.go",
368303
"hashed_secret": "d035c0406b3e8286d3427e91db3497e0e17f0f83",
369304
"is_verified": false,
370-
"line_number": 983
305+
"line_number": 1057
371306
}
372307
],
373308
"pkg/client/fleetmanager/mocks/client_moq.go": [
@@ -411,85 +346,76 @@
411346
"line_number": 113
412347
}
413348
],
414-
"templates/envoy-config-configmap.yml": [
415-
{
416-
"type": "Secret Keyword",
417-
"filename": "templates/envoy-config-configmap.yml",
418-
"hashed_secret": "9d51dabe59aa776bef2909d3689374ebb93ab2be",
419-
"is_verified": false,
420-
"line_number": 10
421-
}
422-
],
423349
"templates/service-template.yml": [
424350
{
425351
"type": "Base64 High Entropy String",
426352
"filename": "templates/service-template.yml",
427353
"hashed_secret": "13032f402fed753c2248419ea4f69f99931f6dbc",
428354
"is_verified": false,
429-
"line_number": 512
355+
"line_number": 511
430356
},
431357
{
432358
"type": "Base64 High Entropy String",
433359
"filename": "templates/service-template.yml",
434360
"hashed_secret": "30025f80f6e22cdafb85db387d50f90ea884576a",
435361
"is_verified": false,
436-
"line_number": 512
362+
"line_number": 511
437363
},
438364
{
439365
"type": "Base64 High Entropy String",
440366
"filename": "templates/service-template.yml",
441367
"hashed_secret": "355f24fd038bcaf85617abdcaa64af51ed19bbcf",
442368
"is_verified": false,
443-
"line_number": 512
369+
"line_number": 511
444370
},
445371
{
446372
"type": "Base64 High Entropy String",
447373
"filename": "templates/service-template.yml",
448374
"hashed_secret": "3d8a1dcd2c3c765ce35c9a9552d23273cc4ddace",
449375
"is_verified": false,
450-
"line_number": 512
376+
"line_number": 511
451377
},
452378
{
453379
"type": "Base64 High Entropy String",
454380
"filename": "templates/service-template.yml",
455381
"hashed_secret": "4ac7b0522761eba972467942cd5cd7499dd2c361",
456382
"is_verified": false,
457-
"line_number": 512
383+
"line_number": 511
458384
},
459385
{
460386
"type": "Base64 High Entropy String",
461387
"filename": "templates/service-template.yml",
462388
"hashed_secret": "7639ab2a6bcf2ea30a055a99468c9cd844d4c22a",
463389
"is_verified": false,
464-
"line_number": 512
390+
"line_number": 511
465391
},
466392
{
467393
"type": "Base64 High Entropy String",
468394
"filename": "templates/service-template.yml",
469395
"hashed_secret": "b56360daf4793d2a74991a972b34d95bc00fb2da",
470396
"is_verified": false,
471-
"line_number": 512
397+
"line_number": 511
472398
},
473399
{
474400
"type": "Base64 High Entropy String",
475401
"filename": "templates/service-template.yml",
476402
"hashed_secret": "c9a73ef9ee8ce9f38437227801c70bcc6740d1a1",
477403
"is_verified": false,
478-
"line_number": 512
404+
"line_number": 511
479405
},
480406
{
481407
"type": "Base64 High Entropy String",
482408
"filename": "templates/service-template.yml",
483409
"hashed_secret": "14736999d9940728c5294277831a702f7882dece",
484410
"is_verified": false,
485-
"line_number": 549
411+
"line_number": 548
486412
},
487413
{
488414
"type": "Secret Keyword",
489415
"filename": "templates/service-template.yml",
490416
"hashed_secret": "4e199b4a1c40b497a95fcd1cd896351733849949",
491417
"is_verified": false,
492-
"line_number": 696,
418+
"line_number": 695,
493419
"is_secret": false
494420
}
495421
],
@@ -519,5 +445,5 @@
519445
}
520446
]
521447
},
522-
"generated_at": "2024-03-07T13:45:14Z"
448+
"generated_at": "2024-03-21T17:47:35Z"
523449
}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG TARGETARCH
1919

2020
RUN --mount=type=cache,target=/go/pkg/mod/ \
2121
--mount=type=cache,target=/go/.cache/ \
22-
make binary GOOS=linux GOARCH=${TARGETARCH}
22+
make fleet-manager fleetshard-sync GOOS=linux GOARCH=${TARGETARCH}
2323

2424
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 as standard
2525

0 commit comments

Comments
 (0)