Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions ui/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ test:
tox

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

docker: appjs
echo `(env)`
Expand Down
37 changes: 18 additions & 19 deletions ui/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,28 @@
},
"homepage": "https://github.com/zalando/postgres-operator.git#readme",
"dependencies": {
"@babel/core": "^7.0.0-beta.46",
"@babel/polyfill": "^7.0.0-beta.46",
"@babel/runtime": "^7.0.0-beta.46",
"pixi.js": "^4.7.3"
"@babel/core": "^7.20.12",
"@babel/polyfill": "^7.12.1",
"@babel/runtime": "^7.20.13",
"pixi.js": "^7.1.1"
},
"devDependencies": {
"@babel/plugin-transform-runtime": "^7.0.0-beta.46",
"@babel/preset-env": "^7.0.0-beta.46",
"babel-loader": "^8.0.0-beta.2",
"brfs": "^1.6.1",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/preset-env": "^7.20.2",
"babel-loader": "^8.2.5",
"brfs": "^2.0.2",
"dedent-js": "1.0.1",
"eslint": "^4.19.1",
"eslint-loader": "^1.6.1",
"js-yaml": "3.13.1",
"pug": "^2.0.3",
"rimraf": "^2.5.4",
"riot": "^3.9.5",
"eslint": "^8.32.0",
"js-yaml": "4.1.0",
"pug": "^3.0.2",
"rimraf": "^4.1.2",
"riot": "^3.13.2",
"riot-hot-reload": "1.0.0",
"riot-route": "^3.1.3",
"riot-tag-loader": "2.0.2",
"riot-route": "^3.1.4",
"riot-tag-loader": "2.1.0",
"sort-by": "^1.2.0",
"transform-loader": "^0.2.3",
"webpack": "^4.28.2",
"webpack-cli": "^3.1.2"
"transform-loader": "^0.2.4",
"webpack": "^4.46.0",
"webpack-cli": "^4.10.0"
}
}
10 changes: 5 additions & 5 deletions ui/app/src/edit.tag.pug
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ edit

this.updateEditable = e => {
if (this.refs.changedProperties.value) {
this.editablePropertiesPreview = yamlParser.safeDump(
yamlParser.safeLoad(
this.editablePropertiesPreview = yamlParser.dump(
yamlParser.load(
this.refs.changedProperties.value,
),
)
Expand All @@ -85,7 +85,7 @@ edit
this.saveMessage = ''

jsonPayload = JSON.stringify(
yamlParser.safeLoad(
yamlParser.load(
this.refs.changedProperties.value,
),
)
Expand Down Expand Up @@ -129,7 +129,7 @@ edit
if (i.metadata.managedFields) { delete i.metadata.managedFields }

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

// Output data:
const o = this.editableProperties = { spec: {} }
Expand Down Expand Up @@ -192,7 +192,7 @@ edit

this.editablePropertiesText = (
yamlParser
.safeDump(this.editableProperties)
.dump(this.editableProperties)
.slice(0, -1)
)
this.editablePropertiesPreview = this.editablePropertiesText
Expand Down
2 changes: 1 addition & 1 deletion ui/app/src/new.tag.pug
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ new
}

this.requestCreate = e => {
jsonPayload = JSON.stringify(yamlParser.safeLoad(this.getYAML()))
jsonPayload = JSON.stringify(yamlParser.load(this.getYAML()))

this.creating = true
this.update()
Expand Down
2 changes: 1 addition & 1 deletion ui/app/src/postgresql.tag.pug
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ postgresql
delete manifest.status

if (this.refs.yamlNice) {
this.refs.yamlNice.innerHTML = yamlParser.safeDump(
this.refs.yamlNice.innerHTML = yamlParser.dump(
this.progress.postgresqlManifest,
{
sortKeys: true,
Expand Down
2 changes: 1 addition & 1 deletion ui/operator_ui/cluster_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def __init__(self, api_server_urls: list):
cluster = Cluster(generate_cluster_id(DEFAULT_CLUSTERS), DEFAULT_CLUSTERS)
else:
logger.info("in cluster configuration failed")
config = kubernetes.client.configuration
config = kubernetes.client.Configuration()
cluster = Cluster(
generate_cluster_id(config.host),
config.host,
Expand Down
16 changes: 8 additions & 8 deletions ui/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Flask-OAuthlib==0.9.6
Flask==2.2.1
backoff==2.1.2
boto3==1.24.46
Flask==2.2.2
backoff==2.2.1
boto3==1.26.51
boto==2.49.0
click==8.1.3
furl==2.1.3
gevent==21.12.0
jq==1.2.2
gevent==22.10.2
jq==1.4.0
json_delta>=2.0.2
kubernetes==3.0.0
requests==2.28.1
kubernetes==11.0.0
requests==2.28.2
stups-tokens>=1.1.19
wal_e==1.1.1
werkzeug==2.2.1
werkzeug==2.2.2