Skip to content

Commit

Permalink
Merge pull request #4018 from project-koku/release_prod-stable.6105
Browse files Browse the repository at this point in the history
Deployment commit for prod-stable
  • Loading branch information
dlabrecq authored Sep 12, 2024
2 parents 8626925 + 2041529 commit c7fd2b2
Show file tree
Hide file tree
Showing 22 changed files with 323 additions and 260 deletions.
2 changes: 1 addition & 1 deletion .tekton/koku-frontend-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ spec:
- name: name
value: prefetch-dependencies
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:058a59f72997c9cf1be20978eb6a145d8d4d436c6098f2460bd96766bb363b20
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:fd1fda0dcf53938860ae6fcba37f5572ae25ae02dba44c15754fb7ba7549fb5c
- name: kind
value: task
resolver: bundles
Expand Down
2 changes: 1 addition & 1 deletion .tekton/koku-frontend-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ spec:
- name: name
value: prefetch-dependencies
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:058a59f72997c9cf1be20978eb6a145d8d4d436c6098f2460bd96766bb363b20
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:fd1fda0dcf53938860ae6fcba37f5572ae25ae02dba44c15754fb7ba7549fb5c
- name: kind
value: task
resolver: bundles
Expand Down
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default [{
radix: ['error', 'as-needed'],
'react-hooks/exhaustive-deps': 0,
'react/display-name': 0,

'react/no-is-mounted': 0,
'react/no-unescaped-entities': ['error', {
forbid: ['>', '}'],
}],
Expand Down
10 changes: 9 additions & 1 deletion locales/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -3103,6 +3103,14 @@
}
]
},
"usage": {
"value": [
{
"type": 0,
"value": "Usage"
}
]
},
"vcpu": {
"value": [
{
Expand Down Expand Up @@ -3744,7 +3752,7 @@
"distributeWorker": [
{
"type": 0,
"value": "Worker unallowcated (unused and non-reserved resources)"
"value": "Worker unallocated (unused and non-reserved resources)"
}
],
"distributionModelDesc": [
Expand Down
4 changes: 2 additions & 2 deletions locales/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
"detailsEmptyState": "Processing data to generate a list of all services that sums to a total cost...",
"detailsMore": "{value} more...",
"detailsMoreClusters": ", {value} more...",
"detailsResourceNames": "{value, select, account {Account names} aws_category {Cost category names} cluster {Cluster names} gcp_project {GCP project names} group {Group} instance {Instance names} instance_type {Instance type} memory {Memory} name {Name} node {Node names} org_unit_id {Organizational unit names} os {OS} operating_system {Operating system} payer_tenant_id {Account names} product_service {Service names} project {Project names} region {Region names} resource_location {Region names} service {Service names} service_name {Service names} status {Status} subscription_guid {Account names} source_type {Integration} tag {Tag names} tags {Tags} tag_key {Tag keys} vcpu {vCPU} other {}}",
"detailsResourceNames": "{value, select, account {Account names} aws_category {Cost category names} cluster {Cluster names} gcp_project {GCP project names} group {Group} instance {Instance names} instance_type {Instance type} memory {Memory} name {Name} node {Node names} org_unit_id {Organizational unit names} os {OS} operating_system {Operating system} payer_tenant_id {Account names} product_service {Service names} project {Project names} region {Region names} resource_location {Region names} service {Service names} service_name {Service names} status {Status} subscription_guid {Account names} source_type {Integration} tag {Tag names} tags {Tags} tag_key {Tag keys} usage {Usage} vcpu {vCPU} other {}}",
"detailsSummaryModalTitle": "{groupBy, select, account {{name} accounts} aws_category {{name} cost categories} cluster {{name} clusters} gcp_project {{name} GCP projects} node {{name} nodes} org_unit_id {{name} organizational units} payer_tenant_id {{name} accounts} product_service {{name} services} project {{name} projects} region {{name} regions} resource_location {{name} regions} service {{name} services} service_name {{name} services} subscription_guid {{name} accounts} tag {{name} tags} other {}}",
"detailsUnusedCapacityLabel": "Unused capacity",
"detailsUnusedRequestsLabel": "Unused requests",
Expand All @@ -253,7 +253,7 @@
"distributePlatformCosts": "{value, select, true {Distribute platform costs}false {Do not distribute platform costs}other {}}",
"distributeStorage": "Storage",
"distributeUnallocatedCapacity": "{value, select, true {Distribute worker unallocated capacity}false {Do not distribute worker unallocated capacity}other {}}",
"distributeWorker": "Worker unallowcated (unused and non-reserved resources)",
"distributeWorker": "Worker unallocated (unused and non-reserved resources)",
"distributionModelDesc": "Choose how your raw costs are distributed at the project level.",
"distributionType": "Distribution type",
"distributionTypeDesc": "{type, select, cpu {Distribute costs based on CPU usage}memory {Distribute costs based on memory usage}other {}}",
Expand Down
Loading

0 comments on commit c7fd2b2

Please sign in to comment.