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

Adds APP_URL as base tag href to enable loading via ui via ingress routes (#2195)

This commit is contained in:
Simon Morris 2023-02-15 06:49:23 -08:00 committed by GitHub
parent 42e005f041
commit 8356ebf097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/postgres-operator-ui/templates/deployment.yaml
View File

@ -46,7 +46,7 @@ spec:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
env: env:
- name: "APP_URL" - name: "APP_URL"
value: "http://localhost:8081" value: {{ .Values.envs.appUrl }}
- name: "OPERATOR_API_URL" - name: "OPERATOR_API_URL"
value: {{ .Values.envs.operatorApiUrl | quote }} value: {{ .Values.envs.operatorApiUrl | quote }}
- name: "OPERATOR_CLUSTER_NAME_LABEL" - name: "OPERATOR_CLUSTER_NAME_LABEL"

1
charts/postgres-operator-ui/values.yaml
View File

@ -41,6 +41,7 @@ resources:
envs: envs:
# IMPORTANT: While operator chart and UI chart are independent, this is the interface between # IMPORTANT: While operator chart and UI chart are independent, this is the interface between
# UI and operator API. Insert the service name of the operator API here! # UI and operator API. Insert the service name of the operator API here!
appUrl: "http://localhost:8081"
operatorApiUrl: "http://postgres-operator:8080" operatorApiUrl: "http://postgres-operator:8080"
operatorClusterNameLabel: "cluster-name" operatorClusterNameLabel: "cluster-name"
resourcesVisible: "False" resourcesVisible: "False"

2
ui/operator_ui/main.py
View File

@ -311,7 +311,7 @@ def send_js(path):
@app.route('/') @app.route('/')
@authorize @authorize
def index(): def index():
return render_template('index.html', google_analytics=GOOGLE_ANALYTICS) return render_template('index.html', google_analytics=GOOGLE_ANALYTICS, app_url=APP_URL)
DEFAULT_UI_CONFIG = { DEFAULT_UI_CONFIG = {

1
ui/operator_ui/templates/index.html
View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<base href="{{app_url}}">
<title>PostgreSQL Operator UI</title> <title>PostgreSQL Operator UI</title>