public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

show pooler dns when success creating pooler (#2202)

This commit is contained in:
idanovinda 2023-02-02 16:46:45 +01:00 committed by GitHub
parent 30b612489a
commit 933b45aba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/app/src/postgresql.tag.pug
View File

@ -94,7 +94,7 @@ postgresql
.alert.alert-success(if='{ progress.masterLabel }') PostgreSQL master available, label is attached .alert.alert-success(if='{ progress.masterLabel }') PostgreSQL master available, label is attached
.alert.alert-success(if='{ progress.masterLabel && progress.dnsName }') PostgreSQL ready: <strong>{ progress.dnsName }</strong> .alert.alert-success(if='{ progress.masterLabel && progress.dnsName }') PostgreSQL ready: <strong>{ progress.dnsName }</strong>
.alert.alert-success(if='{ progress.pooler }') Connection pooler deployment created .alert.alert-success(if='{ progress.pooler && this.progress.postgresqlManifest.spec.enableConnectionPooler }') Pooler ready: <strong>{ progress.poolerDnsName }</strong>
.col-lg-3 .col-lg-3
help-general(config='{ opts.config }') help-general(config='{ opts.config }')
@ -110,6 +110,7 @@ postgresql
this.progress = {} this.progress = {}
this.progress.requestStatus = 'OK' this.progress.requestStatus = 'OK'
this.progress.pooler = false
this.pollProgressTimer = false this.pollProgressTimer = false
@ -126,7 +127,6 @@ postgresql
jQuery.get( jQuery.get(
'./postgresqls/' + this.cluster_path, './postgresqls/' + this.cluster_path,
).done(data => { ).done(data => {
this.progress.pooler = false
this.progress.postgresql = true this.progress.postgresql = true
this.progress.postgresqlManifest = data this.progress.postgresqlManifest = data
// copy status as we delete later for edit // copy status as we delete later for edit
@ -169,8 +169,22 @@ postgresql
} }
if (this.progress.poolerEnabled == true) { if (this.progress.poolerEnabled == true) {
jQuery.get('./pooler/' + this.cluster_path).done(data => { jQuery.get(
'./pooler/' + this.cluster_path,
).done(data => {
this.progress.pooler = {"url": ""} this.progress.pooler = {"url": ""}
jQuery.get(
'./services/' + this.cluster_path + "-pooler",
).done(data => {
if (data.metadata && data.metadata.annotations && 'zalando.org/dnsname' in data.metadata.annotations) {
this.progress.poolerDnsName = data.metadata.annotations['zalando.org/dnsname']
} else if (data.metadata && data.metadata.annotations && 'external-dns.alpha.kubernetes.io/hostname' in data.metadata.annotations) {
this.progress.poolerDnsName = data.metadata.annotations['external-dns.alpha.kubernetes.io/hostname']
} else {
this.progress.poolerDnsName = data.metadata.name + '.' + data.metadata.namespace
}
this.update()
})
this.update() this.update()
}) })
} }