Merge branch 'dev' into staging

bunkerity · Jul 22, 2024 · eddab39 · eddab39
2 parents 0a4f65f + de5f37b
commit eddab39
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 16 deletions.
diff --git a/docs/integrations.md b/docs/integrations.md
@@ -714,6 +714,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: sa-bunkerweb
+  namespace: default
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -745,6 +746,7 @@ spec:
       annotations:
         bunkerweb.io/INSTANCE: "yes"
     spec:
+      serviceAccountName: sa-bunkerweb
       containers:
         # using bunkerweb as name is mandatory
         - name: bunkerweb

diff --git a/docs/web-ui.md b/docs/web-ui.md
@@ -418,10 +418,21 @@ Review your final BunkerWeb UI URL and then click on the `Setup` button. Once th
         resources: ["ingresses"]
         verbs: ["get", "watch", "list"]
     ---
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: Role
+    metadata:
+      namespace: default
+      name: role-bunkerweb-logs
+    rules:
+      - apiGroups: [""]
+        resources: ["pods/log"]
+        verbs: ["get"]
+    ---
     apiVersion: v1
     kind: ServiceAccount
     metadata:
       name: sa-bunkerweb
+      namespace: default
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
@@ -437,6 +448,20 @@ Review your final BunkerWeb UI URL and then click on the `Setup` button. Once th
       name: cr-bunkerweb
       apiGroup: rbac.authorization.k8s.io
     ---
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: RoleBinding
+    metadata:
+      name: rolebinding-bunkerweb-logs
+      namespace: default
+    subjects:
+      - kind: ServiceAccount
+        name: sa-bunkerweb
+        namespace: default
+    roleRef:
+      kind: Role
+      name: role-bunkerweb-logs
+      apiGroup: rbac.authorization.k8s.io
+    ---
     apiVersion: apps/v1
     kind: DaemonSet
     metadata:
@@ -453,6 +478,7 @@ Review your final BunkerWeb UI URL and then click on the `Setup` button. Once th
           annotations:
             bunkerweb.io/INSTANCE: "yes"
         spec:
+          serviceAccountName: sa-bunkerweb
           containers:
             # using bunkerweb as name is mandatory
             - name: bunkerweb
@@ -534,7 +560,7 @@ Review your final BunkerWeb UI URL and then click on the `Setup` button. Once th
               env:
                 - name: KUBERNETES_MODE
                   value: "yes"
-                - name: "DATABASE_URI"
+                - name: DATABASE_URI
                   value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
     ---
     apiVersion: apps/v1
@@ -561,7 +587,7 @@ Review your final BunkerWeb UI URL and then click on the `Setup` button. Once th
               env:
                 - name: KUBERNETES_MODE
                   value: "yes"
-                - name: "DATABASE_URI"
+                - name: DATABASE_URI
                   value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
     ---
     apiVersion: apps/v1
@@ -608,14 +634,14 @@ Review your final BunkerWeb UI URL and then click on the `Setup` button. Once th
               env:
                 - name: MYSQL_RANDOM_ROOT_PASSWORD
                   value: "yes"
-                - name: "MYSQL_DATABASE"
+                - name: MYSQL_DATABASE
                   value: "db"
-                - name: "MYSQL_USER"
+                - name: MYSQL_USER
                   value: "bunkerweb"
-                - name: "MYSQL_PASSWORD"
+                - name: MYSQL_PASSWORD
                   value: "changeme"
               volumeMounts:
-                - mountPath: "/var/lib/mysql"
+                - mountPath: /var/lib/mysql
                   name: vol-db
           volumes:
             - name: vol-db
@@ -646,7 +672,7 @@ Review your final BunkerWeb UI URL and then click on the `Setup` button. Once th
               env:
                 - name: KUBERNETES_MODE
                   value: "YES"
-                - name: "DATABASE_URI"
+                - name: DATABASE_URI
                   value: "mariadb+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
     ---
     apiVersion: v1
@@ -1264,10 +1290,21 @@ After a successful login/password combination, you will be prompted to enter you
         resources: ["ingresses"]
         verbs: ["get", "watch", "list"]
     ---
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: Role
+    metadata:
+      namespace: default
+      name: role-bunkerweb-logs
+    rules:
+      - apiGroups: [""]
+        resources: ["pods/log"]
+        verbs: ["get"]
+    ---
     apiVersion: v1
     kind: ServiceAccount
     metadata:
       name: sa-bunkerweb
+      namespace: default
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
@@ -1283,6 +1320,20 @@ After a successful login/password combination, you will be prompted to enter you
       name: cr-bunkerweb
       apiGroup: rbac.authorization.k8s.io
     ---
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: RoleBinding
+    metadata:
+      name: rolebinding-bunkerweb-logs
+      namespace: default
+    subjects:
+      - kind: ServiceAccount
+        name: sa-bunkerweb
+        namespace: default
+    roleRef:
+      kind: Role
+      name: role-bunkerweb-logs
+      apiGroup: rbac.authorization.k8s.io
+    ---
     apiVersion: apps/v1
     kind: DaemonSet
     metadata:
@@ -1299,6 +1350,7 @@ After a successful login/password combination, you will be prompted to enter you
           annotations:
             bunkerweb.io/INSTANCE: "yes"
         spec:
+          serviceAccountName: sa-bunkerweb
           containers:
             # using bunkerweb as name is mandatory
             - name: bunkerweb
@@ -1377,7 +1429,7 @@ After a successful login/password combination, you will be prompted to enter you
               env:
                 - name: KUBERNETES_MODE
                   value: "yes"
-                - name: "DATABASE_URI"
+                - name: DATABASE_URI
                   value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
     ---
     apiVersion: apps/v1
@@ -1404,7 +1456,7 @@ After a successful login/password combination, you will be prompted to enter you
               env:
                 - name: KUBERNETES_MODE
                   value: "yes"
-                - name: "DATABASE_URI"
+                - name: DATABASE_URI
                   value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
     ---
     apiVersion: apps/v1
@@ -1451,14 +1503,14 @@ After a successful login/password combination, you will be prompted to enter you
               env:
                 - name: MYSQL_RANDOM_ROOT_PASSWORD
                   value: "yes"
-                - name: "MYSQL_DATABASE"
+                - name: MYSQL_DATABASE
                   value: "db"
-                - name: "MYSQL_USER"
+                - name: MYSQL_USER
                   value: "bunkerweb"
-                - name: "MYSQL_PASSWORD"
+                - name: MYSQL_PASSWORD
                   value: "changeme"
               volumeMounts:
-                - mountPath: "/var/lib/mysql"
+                - mountPath: /var/lib/mysql
                   name: vol-db
           volumes:
             - name: vol-db
@@ -1493,7 +1545,7 @@ After a successful login/password combination, you will be prompted to enter you
                   value: "changeme"
                 - name: KUBERNETES_MODE
                   value: "YES"
-                - name: "DATABASE_URI"
+                - name: DATABASE_URI
                   value: "mariadb+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
     ---
     apiVersion: v1
@@ -1564,6 +1616,9 @@ After a successful login/password combination, you will be prompted to enter you
     metadata:
       name: ingress
       annotations:
+        bunkerweb.io/www.example.com_SERVE_FILES: "no"
+        bunkerweb.io/www.example.com_USE_CLIENT_CACHE: "yes"
+        bunkerweb.io/www.example.com_USE_GZIP: "yes"
         bunkerweb.io/www.example.com_USE_UI: "yes"
         bunkerweb.io/www.example.com_INTERCEPTED_ERROR_CODES: '400 404 405 413 429 500 501 502 503 504'
         bunkerweb.io/www.example.com_MAX_CLIENT_SIZE: '50m'

diff --git a/src/ui/main.py b/src/ui/main.py
@@ -2022,7 +2022,7 @@ def logs_container(container_id):
 
     logs = []
     tmp_logs = []
-    if docker_client:
+    if INTEGRATION in ("Docker", "Swarm", "Autoconf"):
         try:
             if INTEGRATION != "Swarm":
                 docker_logs = docker_client.containers.get(container_id).logs(  # type: ignore
@@ -2041,6 +2041,7 @@ def logs_container(container_id):
 
             tmp_logs = docker_logs.decode("utf-8", errors="replace").split("\n")[0:-1]
         except docker_NotFound:
+            app.logger.exception(f"Could not get logs for container {container_id}")
             return (
                 jsonify(
                     {
@@ -2050,7 +2051,7 @@ def logs_container(container_id):
                 ),
                 404,
             )
-    elif kubernetes_client:
+    elif INTEGRATION == "Kubernetes":
         try:
             kubernetes_logs = kubernetes_client.read_namespaced_pod_log(
                 container_id,
@@ -2060,6 +2061,7 @@ def logs_container(container_id):
             )
             tmp_logs = kubernetes_logs.split("\n")[0:-1]
         except kube_ApiException:
+            app.logger.exception(f"Could not get logs for pod {container_id}")
             return (
                 jsonify(
                     {