Skip to content

Commit d5251c5

Browse files
authored
Update UI library dependencies (#2191)
* Update UI library dependencies * change to node v14 * update js-yaml load and dump function
1 parent c9cada6 commit d5251c5

File tree

7 files changed

+36
-37
lines changed

7 files changed

+36
-37
lines changed

ui/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ test:
2121
tox
2222

2323
appjs:
24-
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:10.1.0-alpine npm install
25-
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:10.1.0-alpine npm run build
24+
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:14.21.2-alpine npm install
25+
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:14.21.2-alpine npm run build
2626

2727
docker: appjs
2828
echo `(env)`

ui/app/package.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,28 @@
2626
},
2727
"homepage": "https://github.com/zalando/postgres-operator.git#readme",
2828
"dependencies": {
29-
"@babel/core": "^7.0.0-beta.46",
30-
"@babel/polyfill": "^7.0.0-beta.46",
31-
"@babel/runtime": "^7.0.0-beta.46",
32-
"pixi.js": "^4.7.3"
29+
"@babel/core": "^7.20.12",
30+
"@babel/polyfill": "^7.12.1",
31+
"@babel/runtime": "^7.20.13",
32+
"pixi.js": "^7.1.1"
3333
},
3434
"devDependencies": {
35-
"@babel/plugin-transform-runtime": "^7.0.0-beta.46",
36-
"@babel/preset-env": "^7.0.0-beta.46",
37-
"babel-loader": "^8.0.0-beta.2",
38-
"brfs": "^1.6.1",
35+
"@babel/plugin-transform-runtime": "^7.19.6",
36+
"@babel/preset-env": "^7.20.2",
37+
"babel-loader": "^8.2.5",
38+
"brfs": "^2.0.2",
3939
"dedent-js": "1.0.1",
40-
"eslint": "^4.19.1",
41-
"eslint-loader": "^1.6.1",
42-
"js-yaml": "3.13.1",
43-
"pug": "^2.0.3",
44-
"rimraf": "^2.5.4",
45-
"riot": "^3.9.5",
40+
"eslint": "^8.32.0",
41+
"js-yaml": "4.1.0",
42+
"pug": "^3.0.2",
43+
"rimraf": "^4.1.2",
44+
"riot": "^3.13.2",
4645
"riot-hot-reload": "1.0.0",
47-
"riot-route": "^3.1.3",
48-
"riot-tag-loader": "2.0.2",
46+
"riot-route": "^3.1.4",
47+
"riot-tag-loader": "2.1.0",
4948
"sort-by": "^1.2.0",
50-
"transform-loader": "^0.2.3",
51-
"webpack": "^4.28.2",
52-
"webpack-cli": "^3.1.2"
49+
"transform-loader": "^0.2.4",
50+
"webpack": "^4.46.0",
51+
"webpack-cli": "^4.10.0"
5352
}
5453
}

ui/app/src/edit.tag.pug

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ edit
7171

7272
this.updateEditable = e => {
7373
if (this.refs.changedProperties.value) {
74-
this.editablePropertiesPreview = yamlParser.safeDump(
75-
yamlParser.safeLoad(
74+
this.editablePropertiesPreview = yamlParser.dump(
75+
yamlParser.load(
7676
this.refs.changedProperties.value,
7777
),
7878
)
@@ -85,7 +85,7 @@ edit
8585
this.saveMessage = ''
8686

8787
jsonPayload = JSON.stringify(
88-
yamlParser.safeLoad(
88+
yamlParser.load(
8989
this.refs.changedProperties.value,
9090
),
9191
)
@@ -129,7 +129,7 @@ edit
129129
if (i.metadata.managedFields) { delete i.metadata.managedFields }
130130

131131
this.update()
132-
this.refs.yamlNice.innerHTML = yamlParser.safeDump(i.postgresql, {sortKeys: true})
132+
this.refs.yamlNice.innerHTML = yamlParser.dump(i.postgresql, {sortKeys: true})
133133

134134
// Output data:
135135
const o = this.editableProperties = { spec: {} }
@@ -192,7 +192,7 @@ edit
192192

193193
this.editablePropertiesText = (
194194
yamlParser
195-
.safeDump(this.editableProperties)
195+
.dump(this.editableProperties)
196196
.slice(0, -1)
197197
)
198198
this.editablePropertiesPreview = this.editablePropertiesText

ui/app/src/new.tag.pug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ new
793793
}
794794

795795
this.requestCreate = e => {
796-
jsonPayload = JSON.stringify(yamlParser.safeLoad(this.getYAML()))
796+
jsonPayload = JSON.stringify(yamlParser.load(this.getYAML()))
797797

798798
this.creating = true
799799
this.update()

ui/app/src/postgresql.tag.pug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ postgresql
220220
delete manifest.status
221221

222222
if (this.refs.yamlNice) {
223-
this.refs.yamlNice.innerHTML = yamlParser.safeDump(
223+
this.refs.yamlNice.innerHTML = yamlParser.dump(
224224
this.progress.postgresqlManifest,
225225
{
226226
sortKeys: true,

ui/operator_ui/cluster_discovery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def __init__(self, api_server_urls: list):
7373
cluster = Cluster(generate_cluster_id(DEFAULT_CLUSTERS), DEFAULT_CLUSTERS)
7474
else:
7575
logger.info("in cluster configuration failed")
76-
config = kubernetes.client.configuration
76+
config = kubernetes.client.Configuration()
7777
cluster = Cluster(
7878
generate_cluster_id(config.host),
7979
config.host,

ui/requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Flask-OAuthlib==0.9.6
2-
Flask==2.2.1
3-
backoff==2.1.2
4-
boto3==1.24.46
2+
Flask==2.2.2
3+
backoff==2.2.1
4+
boto3==1.26.51
55
boto==2.49.0
66
click==8.1.3
77
furl==2.1.3
8-
gevent==21.12.0
9-
jq==1.2.2
8+
gevent==22.10.2
9+
jq==1.4.0
1010
json_delta>=2.0.2
11-
kubernetes==3.0.0
12-
requests==2.28.1
11+
kubernetes==11.0.0
12+
requests==2.28.2
1313
stups-tokens>=1.1.19
1414
wal_e==1.1.1
15-
werkzeug==2.2.1
15+
werkzeug==2.2.2

0 commit comments

Comments
 (0)