summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--roles/collabora/code/defaults/main.yml3
-rw-r--r--roles/collabora/code/tasks/main.yml14
-rw-r--r--roles/collabora/code/templates/pod.yml.j25
3 files changed, 0 insertions, 22 deletions
diff --git a/roles/collabora/code/defaults/main.yml b/roles/collabora/code/defaults/main.yml
index b5082941..af5a9e34 100644
--- a/roles/collabora/code/defaults/main.yml
+++ b/roles/collabora/code/defaults/main.yml
@@ -1,7 +1,4 @@
---
-collabora_code_app_uid: "940"
-collabora_code_app_gid: "940"
-
# collabora_code_instances:
# example:
# version: 4.0.6.1
diff --git a/roles/collabora/code/tasks/main.yml b/roles/collabora/code/tasks/main.yml
index 8bc19bfd..8682be98 100644
--- a/roles/collabora/code/tasks/main.yml
+++ b/roles/collabora/code/tasks/main.yml
@@ -1,17 +1,4 @@
---
-- name: add group for collabora-code app
- group:
- name: code-app
- gid: "{{ collabora_code_app_gid }}"
-
-- name: add user for collabora-code app
- user:
- name: code-app
- uid: "{{ collabora_code_app_uid }}"
- group: nc-app
- password: "!"
-
-
- name: generate pod manifests
loop: "{{ collabora_code_instances | dict2items }}"
loop_control:
@@ -21,7 +8,6 @@
dest: "/etc/kubernetes/manifests/collabora-code-{{ item.key }}.yml"
mode: 0600
-
- name: configure nginx vhost
loop: "{{ collabora_code_instances | dict2items }}"
include_role:
diff --git a/roles/collabora/code/templates/pod.yml.j2 b/roles/collabora/code/templates/pod.yml.j2
index 05158ebf..1efc57e7 100644
--- a/roles/collabora/code/templates/pod.yml.j2
+++ b/roles/collabora/code/templates/pod.yml.j2
@@ -3,14 +3,9 @@ kind: Pod
metadata:
name: "collabora-code-{{ item.key }}"
spec:
- securityContext:
- allowPrivilegeEscalation: false
containers:
- name: collabora-code
image: "collabora/code:{{ item.value.version }}"
- # securityContext:
- # runAsUser: {{ collabora_code_app_uid }}
- # runAsGroup: {{ collabora_code_app_gid }}
resources:
limits:
memory: "4Gi"