Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[UI] Show pooler DNS when success creating pooler #2202

Merged
merged 1 commit into from
Feb 2, 2023
Merged

[UI] Show pooler DNS when success creating pooler #2202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 17 additions & 3 deletions ui/app/src/postgresql.tag.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ postgresql
.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.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
help-general(config='{ opts.config }')
Expand All @@ -110,6 +110,7 @@ postgresql

this.progress = {}
this.progress.requestStatus = 'OK'
this.progress.pooler = false

this.pollProgressTimer = false

Expand All @@ -126,7 +127,6 @@ postgresql
jQuery.get(
'./postgresqls/' + this.cluster_path,
).done(data => {
this.progress.pooler = false
this.progress.postgresql = true
this.progress.postgresqlManifest = data
// copy status as we delete later for edit
Expand Down Expand Up @@ -169,8 +169,22 @@ postgresql
}

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": ""}
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()
})
}
Expand Down