Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment commit for prod-stable #1250

Merged
merged 36 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
679300d
Remove Konflux pipeline test
dlabrecq Aug 23, 2024
57324e1
Merge pull request #1216 from dlabrecq/test4
dlabrecq Aug 23, 2024
2ebfcfd
chore(deps): update konflux references
red-hat-konflux[bot] Aug 28, 2024
303448c
Remove deprecated sbom-json-check
samdoran Aug 28, 2024
b9ca388
Merge pull request #1220 from RedHatInsights/konflux/references/main
dlabrecq Aug 28, 2024
6c91992
Dependency updates
dlabrecq Aug 30, 2024
6335319
Merge pull request #1221 from dlabrecq/deps
dlabrecq Aug 30, 2024
6b427c9
Bump webpack from 5.92.0 to 5.94.0
dependabot[bot] Aug 30, 2024
fb8b879
Merge pull request #1222 from RedHatInsights/dependabot/npm_and_yarn/…
dlabrecq Aug 30, 2024
1ecd5f3
Dependency updates
dlabrecq Aug 30, 2024
723921a
Merge pull request #1226 from dlabrecq/deps
dlabrecq Aug 30, 2024
31ef578
(chore): Bump axios in the ci-dependencies group across 1 directory
dependabot[bot] Sep 2, 2024
5de9bba
chore(deps): update konflux references to a523f60
red-hat-konflux[bot] Sep 3, 2024
5ab02d0
Merge pull request #1229 from RedHatInsights/konflux/references/main
dlabrecq Sep 3, 2024
841efc1
Merge pull request #1228 from RedHatInsights/dependabot_npm_and_yarn_…
dlabrecq Sep 3, 2024
eb20df8
(chore): Bump the lint-dependencies group with 2 updates
dependabot[bot] Sep 3, 2024
c8f8711
Merge pull request #1231 from RedHatInsights/dependabot_npm_and_yarn_…
dlabrecq Sep 4, 2024
9e09297
Dependency updates
dlabrecq Sep 4, 2024
2c9d296
Merge pull request #1233 from dlabrecq/deps
dlabrecq Sep 4, 2024
3d3f548
(chore): Bump @eslint/js in the lint-dependencies group
dependabot[bot] Sep 9, 2024
b28fd52
chore(deps): update konflux references to fd1fda0
red-hat-konflux[bot] Sep 10, 2024
808f8a4
Merge pull request #1239 from RedHatInsights/konflux/references/main
dlabrecq Sep 10, 2024
569ad98
Merge pull request #1237 from RedHatInsights/dependabot_npm_and_yarn_…
dlabrecq Sep 10, 2024
14ba42a
Replace require with import
dlabrecq Sep 10, 2024
df20e4a
Merge pull request #1240 from dlabrecq/import
dlabrecq Sep 10, 2024
d1486d0
Add support for direct and indirect sources of spend
dlabrecq Sep 11, 2024
e11028d
Merge pull request #1241 from dlabrecq/source-of-spend
dlabrecq Sep 11, 2024
b60ceab
Omit unsupported sourceOfSpend query param
dlabrecq Sep 11, 2024
f83fc3a
Merge pull request #1242 from dlabrecq/source-of-spend2
dlabrecq Sep 11, 2024
61104dd
Dependency updates
dlabrecq Sep 12, 2024
84a46a6
Merge pull request #1243 from dlabrecq/deps
dlabrecq Sep 12, 2024
2b75b9e
Bump express from 4.19.2 to 4.21.0
dependabot[bot] Sep 12, 2024
9f39e78
Merge pull request #1247 from RedHatInsights/dependabot/npm_and_yarn/…
dlabrecq Sep 12, 2024
3d3bec8
Clean up source of spend options code
dlabrecq Sep 12, 2024
2aa9148
Merge pull request #1249 from dlabrecq/source-of-spend
dlabrecq Sep 12, 2024
74363fa
Merge remote-tracking branch 'origin/main' into prod-stable
dlabrecq Sep 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 9 additions & 31 deletions .tekton/hcs-frontend-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && ( target_branch == "main" || target_branch == "prod-stable" )
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && ( target_branch == "main" || target_branch == "prod-stable" )
creationTimestamp: null
labels:
appstudio.openshift.io/application: hcs-frontend
Expand Down Expand Up @@ -193,7 +193,7 @@ spec:
- name: name
value: prefetch-dependencies
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:2bbeb1fa9eaa1b02c56524ff5ccd137a28d59626b7eedc1d3e714b69e4e17ac7
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:fd1fda0dcf53938860ae6fcba37f5572ae25ae02dba44c15754fb7ba7549fb5c
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -298,7 +298,7 @@ spec:
- name: name
value: buildah
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:5d052102d97150345e854abfa4e5e753b6a770f82807f3df2e1a15cfa668e690
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:a523f60203d90e149f96ec776b47ce85a7acfd6d634ddfc18f4a03f14e08ea0e
- name: kind
value: task
resolver: bundles
Expand All @@ -321,7 +321,7 @@ spec:
- name: name
value: source-build
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.1@sha256:1cb3423593145e899b784000f6ae90e121763ce98c26f6fc049f5dee2310f805
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.1@sha256:21cb5ebaff7a9216903cf78933dc4ec4dd6283a52636b16590a5f52ceb278269
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -392,7 +392,7 @@ spec:
- name: name
value: ecosystem-cert-preflight-checks
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.1@sha256:a4dc853e50a31272d45aef8e8bdc7dac0f0f92212fc7bf8bab67ba5917c03405
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.1@sha256:5131cce0f93d0b728c7bcc0d6cee4c61d4c9f67c6d619c627e41e3c9775b497d
- name: kind
value: task
resolver: bundles
Expand All @@ -414,7 +414,7 @@ spec:
- name: name
value: sast-snyk-check
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.1@sha256:f15181d70187fe31489d474d790dfb09f8faedd93b88a36cb467a2c4c79159e0
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:82c42d27c9c59db6cf6c235e89f7b37f5cdfc75d0d361ca0ee91ae703ba72301
- name: kind
value: task
resolver: bundles
Expand All @@ -439,29 +439,7 @@ spec:
- name: name
value: clamav-scan
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:ea69f63ce7b25ebc39b817a5dd3f11e408518ac21e38baa54bd576a2e2f34b46
- name: kind
value: task
resolver: bundles
when:
- input: $(params.skip-checks)
operator: in
values:
- "false"
- name: sbom-json-check
params:
- name: IMAGE_URL
value: $(tasks.build-container.results.IMAGE_URL)
- name: IMAGE_DIGEST
value: $(tasks.build-container.results.IMAGE_DIGEST)
runAfter:
- build-container
taskRef:
params:
- name: name
value: sbom-json-check
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.1@sha256:89b375e21613aa48a48bec8d61a166e07155e1282456c17dd794cd59933cdeaa
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:7bb17b937c9342f305468e8a6d0a22493e3ecde58977bd2ffc8b50e2fa234d58
- name: kind
value: task
resolver: bundles
Expand All @@ -481,7 +459,7 @@ spec:
- name: name
value: apply-tags
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:8a8c1342bfa0b263361cbbc28036750ebc3d7c2460230b14d641170b812dddcc
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:e6beb161ed59d7be26317da03e172137b31b26648d3e139558e9a457bc56caff
- name: kind
value: task
resolver: bundles
Expand All @@ -502,7 +480,7 @@ spec:
- name: name
value: push-dockerfile
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:e4abc7c7671e4455465e48f96831cfafdb4de368cbcb9f27a8e5b9b0553ac35e
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:92d63edd09636f97961ca18fac14b67935179d2c14b4a4d5f8087c614e8c2bd9
- name: kind
value: task
resolver: bundles
Expand Down
38 changes: 8 additions & 30 deletions .tekton/hcs-frontend-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ spec:
- name: name
value: prefetch-dependencies
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:2bbeb1fa9eaa1b02c56524ff5ccd137a28d59626b7eedc1d3e714b69e4e17ac7
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:fd1fda0dcf53938860ae6fcba37f5572ae25ae02dba44c15754fb7ba7549fb5c
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -295,7 +295,7 @@ spec:
- name: name
value: buildah
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:5d052102d97150345e854abfa4e5e753b6a770f82807f3df2e1a15cfa668e690
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:a523f60203d90e149f96ec776b47ce85a7acfd6d634ddfc18f4a03f14e08ea0e
- name: kind
value: task
resolver: bundles
Expand All @@ -318,7 +318,7 @@ spec:
- name: name
value: source-build
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.1@sha256:1cb3423593145e899b784000f6ae90e121763ce98c26f6fc049f5dee2310f805
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.1@sha256:21cb5ebaff7a9216903cf78933dc4ec4dd6283a52636b16590a5f52ceb278269
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -389,7 +389,7 @@ spec:
- name: name
value: ecosystem-cert-preflight-checks
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.1@sha256:a4dc853e50a31272d45aef8e8bdc7dac0f0f92212fc7bf8bab67ba5917c03405
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.1@sha256:5131cce0f93d0b728c7bcc0d6cee4c61d4c9f67c6d619c627e41e3c9775b497d
- name: kind
value: task
resolver: bundles
Expand All @@ -411,7 +411,7 @@ spec:
- name: name
value: sast-snyk-check
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.1@sha256:f15181d70187fe31489d474d790dfb09f8faedd93b88a36cb467a2c4c79159e0
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:82c42d27c9c59db6cf6c235e89f7b37f5cdfc75d0d361ca0ee91ae703ba72301
- name: kind
value: task
resolver: bundles
Expand All @@ -436,29 +436,7 @@ spec:
- name: name
value: clamav-scan
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:ea69f63ce7b25ebc39b817a5dd3f11e408518ac21e38baa54bd576a2e2f34b46
- name: kind
value: task
resolver: bundles
when:
- input: $(params.skip-checks)
operator: in
values:
- "false"
- name: sbom-json-check
params:
- name: IMAGE_URL
value: $(tasks.build-container.results.IMAGE_URL)
- name: IMAGE_DIGEST
value: $(tasks.build-container.results.IMAGE_DIGEST)
runAfter:
- build-container
taskRef:
params:
- name: name
value: sbom-json-check
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.1@sha256:89b375e21613aa48a48bec8d61a166e07155e1282456c17dd794cd59933cdeaa
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:7bb17b937c9342f305468e8a6d0a22493e3ecde58977bd2ffc8b50e2fa234d58
- name: kind
value: task
resolver: bundles
Expand All @@ -478,7 +456,7 @@ spec:
- name: name
value: apply-tags
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:8a8c1342bfa0b263361cbbc28036750ebc3d7c2460230b14d641170b812dddcc
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:e6beb161ed59d7be26317da03e172137b31b26648d3e139558e9a457bc56caff
- name: kind
value: task
resolver: bundles
Expand All @@ -499,7 +477,7 @@ spec:
- name: name
value: push-dockerfile
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:e4abc7c7671e4455465e48f96831cfafdb4de368cbcb9f27a8e5b9b0553ac35e
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:92d63edd09636f97961ca18fac14b67935179d2c14b4a4d5f8087c614e8c2bd9
- name: kind
value: task
resolver: bundles
Expand Down
16 changes: 16 additions & 0 deletions locales/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,14 @@
}
]
},
"direct": {
"value": [
{
"type": 0,
"value": "Direct"
}
]
},
"embedded": {
"value": [
{
Expand All @@ -1303,6 +1311,14 @@
}
]
},
"indirect": {
"value": [
{
"type": 0,
"value": "Indirect"
}
]
},
"miscellaneous": {
"value": [
{
Expand Down
2 changes: 1 addition & 1 deletion locales/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"percent": "{value} %",
"secondaryGroupByLabel": "Secondary group by",
"sourceOfSpendLabel": "View",
"sourceOfSpendValues": "{value, select, all {All sources of spend} aws {Amazon Web Services} azure {Azure} ccsp {CCSP} consulting {Consulting} embedded {Embedded} gcp {Google Cloud Platform} miscellaneous {Miscellaneous} oci {Oracle Cloud Infrastructure} oem {OEM} on_demand {On-demand subscriptions} svp {SVP} training {Training} yearly_subscriptions {Yearly subscriptions} other {}}",
"sourceOfSpendValues": "{value, select, all {All sources of spend} aws {Amazon Web Services} azure {Azure} ccsp {CCSP} consulting {Consulting} direct {Direct} embedded {Embedded} gcp {Google Cloud Platform} indirect {Indirect} miscellaneous {Miscellaneous} oci {Oracle Cloud Infrastructure} oem {OEM} on_demand {On-demand subscriptions} svp {SVP} training {Training} yearly_subscriptions {Yearly subscriptions} other {}}",
"suggestions": "Suggestions",
"viewDetails": "View details"
}
Loading