Skip to content

Commit 57738be

Browse files
dlabrecqdlabrecq
committed
Merge remote-tracking branch 'origin/main' into prod-stable
2 parents 350f9a1 + c0c72ee commit 57738be

File tree

22 files changed

+1832
-1877
lines changed

22 files changed

+1832
-1877
lines changed

‎.archive/locales/en.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"navigation": {
6363
"aws": "Amazon Web Services",
6464
"azure": "Microsoft Azure",
65-
"gcp": "Google Cloud Platform",
65+
"gcp": "Google Cloud",
6666
"ibm": "IBM Cloud",
6767
"ocp": "OpenShift"
6868
},
@@ -472,8 +472,8 @@
472472
"aws_ocp": "Amazon Web Services filtered by OpenShift",
473473
"azure": "Microsoft Azure",
474474
"azure_ocp": "Microsoft Azure filtered by OpenShift",
475-
"gcp": "Google Cloud Platform",
476-
"gcp_ocp": "Google Cloud Platform filtered by OpenShift",
475+
"gcp": "Google Cloud",
476+
"gcp_ocp": "Google Cloud filtered by OpenShift",
477477
"ibm": "IBM Cloud",
478478
"ocp": "All OpenShift cost",
479479
"ocp_cloud": "All cloud filtered by OpenShift"
@@ -483,8 +483,8 @@
483483
"aws_ocp": "Amazon Web Services filtered by OpenShift - Top 5 Costliest",
484484
"azure": "Microsoft Azure - Top 5 Costliest",
485485
"azure_ocp": "Microsoft Azure filtered by OpenShift - Top 5 Costliest",
486-
"gcp": "Google Cloud Platform - Top 5 Costliest",
487-
"gcp_ocp": "Google Cloud Platform filtered by OpenShift - Top 5 Costliest",
486+
"gcp": "Google Cloud - Top 5 Costliest",
487+
"gcp_ocp": "Google Cloud filtered by OpenShift - Top 5 Costliest",
488488
"ibm": "IBM Cloud - Top 5 Costliest",
489489
"ocp": "All OpenShift cost - Top 5 Costliest",
490490
"ocp_cloud": "All cloud filtered by OpenShift - Top 5 Costliest"
@@ -606,15 +606,15 @@
606606
"for_date_plural": "{{value}} for $t(months.{{month}}) {{startDate}}-{{endDate}}",
607607
"gcp_dashboard": {
608608
"compute_title": "Compute instances usage",
609-
"cost_title": "Google Cloud Platform Services cost",
610-
"cost_trend_title": "Google Cloud Platform Services cumulative cost comparison ({{units}})",
611-
"daily_cost_trend_title": "Google Cloud Platform Services daily cost comparison ({{units}})"
609+
"cost_title": "Google Cloud Services cost",
610+
"cost_trend_title": "Google Cloud Services cumulative cost comparison ({{units}})",
611+
"daily_cost_trend_title": "Google Cloud Services daily cost comparison ({{units}})"
612612
},
613613
"gcp_ocp_dashboard": {
614614
"compute_title": "Compute instances usage",
615-
"cost_title": "Google Cloud Platform Services cost",
616-
"cost_trend_title": "Google Cloud Platform Services cumulative cost comparison ({{units}})",
617-
"daily_cost_trend_title": "Google Cloud Platform Services daily cost comparison ({{units}})"
615+
"cost_title": "Google Cloud Services cost",
616+
"cost_trend_title": "Google Cloud Services cumulative cost comparison ({{units}})",
617+
"daily_cost_trend_title": "Google Cloud Services daily cost comparison ({{units}})"
618618
},
619619
"group_by": {
620620
"all": "All $t(group_by.values.{{groupBy}}, { 'count': 5 })",
@@ -740,8 +740,8 @@
740740
"azure_details_breakdown": "Microsoft Azure Details Breakdown",
741741
"cost_models": "Cost models",
742742
"explorer": "Cost Explorer",
743-
"gcp_details": "Google Cloud Platform Details",
744-
"gcp_details_breakdown": "Google Cloud Platform Details Breakdown",
743+
"gcp_details": "Google Cloud Details",
744+
"gcp_details_breakdown": "Google Cloud Details Breakdown",
745745
"ibm_details": "IBM Cloud Details",
746746
"ibm_details_breakdown": "IBM Cloud Details Breakdown",
747747
"ocp_details": "OpenShift Details",
@@ -751,7 +751,7 @@
751751
"aws_service_name": "Amazon Web Services in $t(cost_management)",
752752
"azure_service_name": "Microsoft Azure in $t(cost_management)",
753753
"cost_models_service_name": "Cost Models in $t(cost_management)",
754-
"gcp_service_name": "Google Cloud Platform in $t(cost_management)",
754+
"gcp_service_name": "Google Cloud in $t(cost_management)",
755755
"ibm_service_name": "IBM Cloud in $t(cost_management)",
756756
"ocp_service_name": "OpenShift in $t(cost_management)"
757757
},
@@ -771,8 +771,8 @@
771771
"aws_title": "Track your Amazon Web Services spending!",
772772
"azure_desc": "Add a Microsoft Azure account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
773773
"azure_title": "Track your Microsoft Azure spending!",
774-
"gcp_desc": "Add a Google Cloud Platform account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
775-
"gcp_title": "Track your Google Cloud Platform spending!",
774+
"gcp_desc": "Add a Google Cloud account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
775+
"gcp_title": "Track your Google Cloud spending!",
776776
"get_started": "Get started with Sources",
777777
"ibm_desc": "Add an IBM Cloud account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
778778
"ibm_title": "Track your IBM Cloud spending!",
@@ -816,7 +816,7 @@
816816
"type_options": {
817817
"aws": "Amazon Web Services (AWS)",
818818
"azure": "Microsoft Azure",
819-
"gcp": "Google Cloud Platform",
819+
"gcp": "Google Cloud",
820820
"ocp": "Red Hat OpenShift Container Platform"
821821
}
822822
},
@@ -825,8 +825,8 @@
825825
"aws_desc": "Raw cost from Amazon Web Services infrastructure.",
826826
"azure": "Microsoft Azure",
827827
"azure_desc": "Raw cost from Azure infrastructure.",
828-
"gcp": "Google Cloud Platform",
829-
"gcp_desc": "Raw cost from Google Cloud Platform infrastructure.",
828+
"gcp": "Google Cloud",
829+
"gcp_desc": "Raw cost from Google Cloud infrastructure.",
830830
"ibm": "IBM Cloud",
831831
"ibm_desc": "Raw cost from IBM Cloud infrastructure.",
832832
"infrastructure": "Infrastructure",
@@ -839,8 +839,8 @@
839839
"aws_ocp": "Amazon Web Services filtered by OpenShift",
840840
"azure": "Microsoft Azure",
841841
"azure_ocp": "Microsoft Azure filtered by OpenShift",
842-
"gcp": "Google Cloud Platform",
843-
"gcp_ocp": "Google Cloud Platform filtered by OpenShift",
842+
"gcp": "Google Cloud",
843+
"gcp_ocp": "Google Cloud filtered by OpenShift",
844844
"ibm": "IBM Cloud",
845845
"label": "Perspective",
846846
"ocp_all": "All OpenShift",
@@ -892,7 +892,7 @@
892892
"type": {
893893
"AWS": "AWS",
894894
"AZURE": "Microsoft Azure",
895-
"GCP": "Google Cloud Platform",
895+
"GCP": "Google Cloud",
896896
"OCP": "Red Hat OpenShift"
897897
}
898898
},

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323

2424
- name: Setup Node.js
2525
uses: actions/setup-node@v4
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout code
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v5
5959

6060
- name: Setup Node.js
6161
uses: actions/setup-node@v4
@@ -98,7 +98,7 @@ jobs:
9898

9999
steps:
100100
- name: Checkout code
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v5
102102

103103
- name: Download coverage report
104104
uses: actions/download-artifact@v4
@@ -108,7 +108,7 @@ jobs:
108108

109109
- name: Upload coverage report
110110
if: ${{ success() }}
111-
uses: codecov/codecov-action@v4.2.0
111+
uses: codecov/codecov-action@v4.6.0
112112
env:
113113
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
114114
with:

‎.github/workflows/tag_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
tag_release:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111
with:
1212
ref: prod-stable
1313
- run: |

‎.tekton/koku-frontend-pull-request.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ spec:
168168
- name: name
169169
value: git-clone
170170
- name: bundle
171-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:20045cfa05edecc1a1c17d9cafb5371a1d6cd5a0a467653fe79917d4ea56cb9c
171+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:90d2d42d17e6276ef45505cbb5a78598e5f5186257d0ee2260b3d4835f1c2d6b
172172
- name: kind
173173
value: task
174174
resolver: bundles
@@ -193,7 +193,7 @@ spec:
193193
- name: name
194194
value: prefetch-dependencies
195195
- name: bundle
196-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:4e178d3f538bd20cb84d94a2542724fb2eed92eaebaf76275ce514ceca7a13b7
196+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:846a3b883ee729c45a6714ab3a3688f6044a4d352655546d057e43e34b10149e
197197
- name: kind
198198
value: task
199199
resolver: bundles
@@ -237,7 +237,7 @@ spec:
237237
- name: name
238238
value: buildah
239239
- name: bundle
240-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.5@sha256:9ac12870766a980e1f7ae7ddd0852f767da000d8a6d24f5b37e906eb14932355
240+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:e8648dff9859d89a0dbaedd120eec2e07afbffc850e706d16d0ac479a905efa0
241241
- name: kind
242242
value: task
243243
resolver: bundles
@@ -269,7 +269,7 @@ spec:
269269
- name: name
270270
value: build-image-index
271271
- name: bundle
272-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
272+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d94cad7f41be61074dd21c7dff26dab9217c3435a16f62813c1cb8382dd9aae6
273273
- name: kind
274274
value: task
275275
resolver: bundles
@@ -320,7 +320,7 @@ spec:
320320
- name: name
321321
value: sast-shell-check
322322
- name: bundle
323-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:4a63982791a1a68f560c486f524ef5b9fdbeee0c16fe079eee3181a2cfd1c1bf
323+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:cdfb0f552b30e7bb38a87c6b10ea3cd7f8dbf2e3b913fe27319cd9588c6d49e6
324324
- name: kind
325325
value: task
326326
resolver: bundles
@@ -345,7 +345,7 @@ spec:
345345
- name: name
346346
value: sast-unicode-check
347347
- name: bundle
348-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.3@sha256:bec18fa5e82e801c3f267f29bf94535a5024e72476f2b27cca7271d506abb5ad
348+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.3@sha256:23c7a716cf5596d5b09e57a13ad20572de2a13d47bf708b13141f5e341845133
349349
- name: kind
350350
value: task
351351
resolver: bundles
@@ -412,7 +412,7 @@ spec:
412412
- name: name
413413
value: ecosystem-cert-preflight-checks
414414
- name: bundle
415-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
415+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
416416
- name: kind
417417
value: task
418418
resolver: bundles

‎.tekton/koku-frontend-push.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ spec:
165165
- name: name
166166
value: git-clone
167167
- name: bundle
168-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:20045cfa05edecc1a1c17d9cafb5371a1d6cd5a0a467653fe79917d4ea56cb9c
168+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:90d2d42d17e6276ef45505cbb5a78598e5f5186257d0ee2260b3d4835f1c2d6b
169169
- name: kind
170170
value: task
171171
resolver: bundles
@@ -190,7 +190,7 @@ spec:
190190
- name: name
191191
value: prefetch-dependencies
192192
- name: bundle
193-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:4e178d3f538bd20cb84d94a2542724fb2eed92eaebaf76275ce514ceca7a13b7
193+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:846a3b883ee729c45a6714ab3a3688f6044a4d352655546d057e43e34b10149e
194194
- name: kind
195195
value: task
196196
resolver: bundles
@@ -234,7 +234,7 @@ spec:
234234
- name: name
235235
value: buildah
236236
- name: bundle
237-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.5@sha256:9ac12870766a980e1f7ae7ddd0852f767da000d8a6d24f5b37e906eb14932355
237+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:e8648dff9859d89a0dbaedd120eec2e07afbffc850e706d16d0ac479a905efa0
238238
- name: kind
239239
value: task
240240
resolver: bundles
@@ -266,7 +266,7 @@ spec:
266266
- name: name
267267
value: build-image-index
268268
- name: bundle
269-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
269+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d94cad7f41be61074dd21c7dff26dab9217c3435a16f62813c1cb8382dd9aae6
270270
- name: kind
271271
value: task
272272
resolver: bundles
@@ -317,7 +317,7 @@ spec:
317317
- name: name
318318
value: sast-shell-check
319319
- name: bundle
320-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:4a63982791a1a68f560c486f524ef5b9fdbeee0c16fe079eee3181a2cfd1c1bf
320+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:cdfb0f552b30e7bb38a87c6b10ea3cd7f8dbf2e3b913fe27319cd9588c6d49e6
321321
- name: kind
322322
value: task
323323
resolver: bundles
@@ -342,7 +342,7 @@ spec:
342342
- name: name
343343
value: sast-unicode-check
344344
- name: bundle
345-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.3@sha256:bec18fa5e82e801c3f267f29bf94535a5024e72476f2b27cca7271d506abb5ad
345+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.3@sha256:23c7a716cf5596d5b09e57a13ad20572de2a13d47bf708b13141f5e341845133
346346
- name: kind
347347
value: task
348348
resolver: bundles
@@ -409,7 +409,7 @@ spec:
409409
- name: name
410410
value: ecosystem-cert-preflight-checks
411411
- name: bundle
412-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
412+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
413413
- name: kind
414414
value: task
415415
resolver: bundles

‎deploy/frontend.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ objects:
7777
title: 'Amazon Web Services'
7878
href: '/openshift/cost-management/aws'
7979
- id: 'cost-management.gcp'
80-
title: 'Google Cloud Platform'
80+
title: 'Google Cloud'
8181
href: '/openshift/cost-management/gcp'
8282
- id: 'cost-management.azure'
8383
title: 'Microsoft Azure'

‎eslint.config.mjs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default [{
4949
'eslint:recommended', // Extended by eslint-config-redhat-cloud-services
5050
'plugin:@typescript-eslint/recommended',
5151
'plugin:react/recommended', // Extended by eslint-config-redhat-cloud-services
52-
'plugin:react-hooks/recommended-legacy',
52+
'plugin:react-hooks/recommended',
5353
)), {
5454
plugins: {
5555
'@typescript-eslint': fixupPluginRules(typescriptEslint),
@@ -174,6 +174,8 @@ export default [{
174174
'prettier/prettier': 'error',
175175
radix: ['error', 'as-needed'],
176176
'react-hooks/exhaustive-deps': 0,
177+
'react-hooks/preserve-manual-memoization': 0, // Temp workaround for 7.0.0
178+
'react-hooks/set-state-in-effect': 0, // Temp workaround for 7.0.0
177179
'react/display-name': 0,
178180
'react/no-is-mounted': 0,
179181
'react/no-unescaped-entities': ['error', {

0 commit comments

Comments
 (0)