Skip to content

Apply Global Hub Konflux config and CVE fixes to release-1.7 #190

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.

Sign up for GitHub

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

Merged
clyang82 merged 17 commits into from
Jan 27, 2026
Merged

Apply Global Hub Konflux config and CVE fixes to release-1.7 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8480938
Replace ACM Konflux config with Global Hub Konflux config
yanmxa Jan 23, 2026
1d66f58
Upgrade golang to 1.25.3
clyang82 Dec 9, 2025
0fefad4
Fix CVE-2025-64756 and CVE-2025-66031: Upgrade glob and node-forge (#…
clyang82 Dec 13, 2025
642326c
Fix CVE-2024-25621: Upgrade containerd to v1.7.29 (#181)
clyang82 Dec 13, 2025
df41156
Revert glob/node-forge CVE changes to fix yarn.lock sync
yanmxa Jan 23, 2026
bc569e1
Fix Containerfile.konflux for release-1.7 codebase
yanmxa Jan 23, 2026
0ae221e
Simplify Containerfile.konflux for hermetic build
yanmxa Jan 23, 2026
bfc515b
Fix Containerfile.konflux build: apply patches and use build.go
yanmxa Jan 26, 2026
e958ae1
Fix CVE-2025-68156: Upgrade expr-lang/expr to v1.17.7
yanmxa Jan 26, 2026
31925a4
Fix Konflux build: add workspace modules to prefetch-input
yanmxa Jan 26, 2026
b74cc34
Upgrade Go version to 1.25.3 in sub-modules
yanmxa Jan 27, 2026
9b4de6c
Fix flaky TestAlertRuleRetry test timeout
yanmxa Jan 27, 2026
94c852d
Remove workflows requiring unavailable runners
yanmxa Jan 27, 2026
9a35d67
Remove more workflows requiring large runners
yanmxa Jan 27, 2026
c6e0230
Add JavaScript build stage to Containerfile.konflux
yanmxa Jan 27, 2026
aa73fbf
yarn install & yarn build to generate runnable resources for Grafana 12
yanmxa Jan 27, 2026
1de2314
Update go.work.sum with complete dependency checksums
yanmxa Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .citools/src/cog/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cog

go 1.24.5
go 1.25.3

tool github.com/grafana/cog/cmd/cli

Expand All @@ -10,7 +10,7 @@ require (
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/proto v1.13.2 // indirect
github.com/expr-lang/expr v1.17.0 // indirect
github.com/expr-lang/expr v1.17.7 // indirect
github.com/getkin/kin-openapi v0.132.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions .citools/src/cog/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emicklei/proto v1.13.2 h1:z/etSFO3uyXeuEsVPzfl56WNgzcvIr42aQazXaQmFZY=
github.com/emicklei/proto v1.13.2/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
github.com/expr-lang/expr v1.17.0 h1:+vpszOyzKLQXC9VF+wA8cVA0tlA984/Wabc/1hF9Whg=
github.com/expr-lang/expr v1.17.0/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/expr-lang/expr v1.17.7 h1:Q0xY/e/2aCIp8g9s/LGvMDCC5PxYlvHgDZRQ4y16JX8=
github.com/expr-lang/expr v1.17.7/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/getkin/kin-openapi v0.132.0 h1:3ISeLMsQzcb5v26yeJrBcdTCEQTag36ZjaGk7MIRUwk=
github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58=
github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
Expand Down Expand Up @@ -89,8 +89,8 @@ golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
Expand Down
148 changes: 0 additions & 148 deletions .github/workflows/backend-unit-tests.yml
View file
Open in desktop

This file was deleted.

Loading
Loading