Skip to content

Commit

Permalink
Upgrade flux to 2.4.0 (#4232)
Browse files Browse the repository at this point in the history
* [create-pull-request] automated change

Signed-off-by: weave-gitops-bot <weave-gitops-bot@weave.works>

* Fixes for audit failures

---------

Signed-off-by: weave-gitops-bot <weave-gitops-bot@weave.works>
Co-authored-by: weave-gitops-bot <weave-gitops-bot@weave.works>
Co-authored-by: Charles Sibbald <casibbald@gmail.com>
  • Loading branch information
3 people authored Dec 3, 2024
1 parent 0513bc8 commit 9da8deb
Show file tree
Hide file tree
Showing 3 changed files with 1,907 additions and 84 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BUILD_TIME?=$(shell date +'%Y-%m-%d_%T')
BRANCH?=$(shell which git > /dev/null && git rev-parse --abbrev-ref HEAD)
GIT_COMMIT?=$(shell which git > /dev/null && git log -n1 --pretty='%h')
VERSION?=$(shell which git > /dev/null && git describe --always --match "v*")
FLUX_VERSION=2.3.0
FLUX_VERSION=2.4.0
CHART_VERSION=$(shell which yq > /dev/null && yq e '.version' charts/gitops-server/Chart.yaml)
TIER=oss

Expand Down
12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"cross-spawn": "^7.0.5",
"d3": "^7.6.1",
"d3-dag": "^0.11.5",
"history": "^5.0.0",
Expand All @@ -73,7 +74,8 @@
"react-toastify": "^9.1.2",
"remark-gfm": "^3.0.1",
"styled-components": "^5.3.0",
"yaml": "^2.2.2"
"yaml": "^2.2.2",
"commander": "^11.0.0"
},
"jest": {
"preset": "ts-jest",
Expand All @@ -87,6 +89,9 @@
"testEnvironment": "jsdom"
},
"devDependencies": {
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.25.9",
"@parcel/config-default": "^2.8.3",
"@parcel/optimizer-data-url": "^2.8.3",
"@parcel/transformer-inline-string": "^2.8.3",
Expand Down Expand Up @@ -121,6 +126,9 @@
"yaml": "yaml/browser/dist/index.js"
},
"resolutions": {
"htmlnano": "2.0.3"
"htmlnano": "2.0.3",
"eslint": "8.50.0",
"jest": "^29.0.0",
"cross-spawn": "^7.0.5"
}
}
Loading

0 comments on commit 9da8deb

Please sign in to comment.