[UI] revert index.html base url and provide USE_AWS_INSTANCE_PROFILE …

…example (#2403) * revert index.html base url and provide USE_AWS_INSTANCE_PROFILE example
zalando · Sep 4, 2023 · eb0d55e · eb0d55e
1 parent 28c27ef
commit eb0d55e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/charts/postgres-operator-ui/templates/ingress.yaml b/charts/postgres-operator-ui/templates/ingress.yaml
@@ -44,7 +44,7 @@ spec:
         {{- range .paths }}
           - path: {{ . }}
             {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
-            pathType: ImplementationSpecific
+            pathType: Prefix
             backend:
               service:
                 name: {{ $fullName }}

diff --git a/charts/postgres-operator-ui/values.yaml b/charts/postgres-operator-ui/values.yaml
@@ -82,6 +82,8 @@ extraEnvs:
   #       key: AWS_DEFAULT_REGION
   # - name: SPILO_S3_BACKUP_BUCKET
   #   value: <s3 bucket used by the operator>
+  # - name: "USE_AWS_INSTANCE_PROFILE"
+  #   value: "true"
 
 # configure UI service
 service:
@@ -103,7 +105,7 @@ ingress:
   ingressClassName: ""
   hosts:
     - host: ui.example.org
-      paths: [""]
+      paths: ["/"]
   tls: []
   #  - secretName: ui-tls
   #    hosts:

diff --git a/ui/manifests/deployment.yaml b/ui/manifests/deployment.yaml
@@ -101,3 +101,5 @@ spec:
             #       key: AWS_DEFAULT_REGION
             # - name: SPILO_S3_BACKUP_BUCKET
             #   value: <s3 bucket used by the operator>
+            # - name: "USE_AWS_INSTANCE_PROFILE"
+            #   value: "true"
diff --git a/ui/manifests/ingress.yaml b/ui/manifests/ingress.yaml
@@ -12,7 +12,7 @@ spec:
       http:
         paths:
           - path: /
-            pathType: ImplementationSpecific
+            pathType: Prefix
             backend:
               service:
                 name: "postgres-operator-ui"

diff --git a/ui/operator_ui/main.py b/ui/operator_ui/main.py
@@ -311,7 +311,7 @@ def send_js(path):
 @app.route('/')
 @authorize
 def index():
-    return render_template('index.html', google_analytics=GOOGLE_ANALYTICS, app_url=APP_URL)
+    return render_template('index.html', google_analytics=GOOGLE_ANALYTICS)
 
 
 DEFAULT_UI_CONFIG = {

diff --git a/ui/operator_ui/templates/index.html b/ui/operator_ui/templates/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <base href="{{app_url}}">
     <title>PostgreSQL Operator UI</title>