Skip to content

Commit 9da8deb

Browse files
weave-gitops-botweave-gitops-botcasibbald
authored
Upgrade flux to 2.4.0 (#4232)
* [create-pull-request] automated change Signed-off-by: weave-gitops-bot <[email protected]> * Fixes for audit failures --------- Signed-off-by: weave-gitops-bot <[email protected]> Co-authored-by: weave-gitops-bot <[email protected]> Co-authored-by: Charles Sibbald <[email protected]>
1 parent 0513bc8 commit 9da8deb

File tree

3 files changed

+1907
-84
lines changed

3 files changed

+1907
-84
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BUILD_TIME?=$(shell date +'%Y-%m-%d_%T')
77
BRANCH?=$(shell which git > /dev/null && git rev-parse --abbrev-ref HEAD)
88
GIT_COMMIT?=$(shell which git > /dev/null && git log -n1 --pretty='%h')
99
VERSION?=$(shell which git > /dev/null && git describe --always --match "v*")
10-
FLUX_VERSION=2.3.0
10+
FLUX_VERSION=2.4.0
1111
CHART_VERSION=$(shell which yq > /dev/null && yq e '.version' charts/gitops-server/Chart.yaml)
1212
TIER=oss
1313

package.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"@material-ui/core": "^4.12.4",
5151
"@material-ui/icons": "^4.11.2",
5252
"@material-ui/lab": "^4.0.0-alpha.58",
53+
"cross-spawn": "^7.0.5",
5354
"d3": "^7.6.1",
5455
"d3-dag": "^0.11.5",
5556
"history": "^5.0.0",
@@ -73,7 +74,8 @@
7374
"react-toastify": "^9.1.2",
7475
"remark-gfm": "^3.0.1",
7576
"styled-components": "^5.3.0",
76-
"yaml": "^2.2.2"
77+
"yaml": "^2.2.2",
78+
"commander": "^11.0.0"
7779
},
7880
"jest": {
7981
"preset": "ts-jest",
@@ -87,6 +89,9 @@
8789
"testEnvironment": "jsdom"
8890
},
8991
"devDependencies": {
92+
"@babel/core": "^7.26.0",
93+
"@babel/preset-env": "^7.26.0",
94+
"@babel/preset-react": "^7.25.9",
9095
"@parcel/config-default": "^2.8.3",
9196
"@parcel/optimizer-data-url": "^2.8.3",
9297
"@parcel/transformer-inline-string": "^2.8.3",
@@ -121,6 +126,9 @@
121126
"yaml": "yaml/browser/dist/index.js"
122127
},
123128
"resolutions": {
124-
"htmlnano": "2.0.3"
129+
"htmlnano": "2.0.3",
130+
"eslint": "8.50.0",
131+
"jest": "^29.0.0",
132+
"cross-spawn": "^7.0.5"
125133
}
126134
}

0 commit comments

Comments
 (0)