From e9542affff98255421c9cb76bd61172e134c9d50 Mon Sep 17 00:00:00 2001 From: Steve McMaster Date: Sun, 11 Dec 2022 18:01:07 -0500 Subject: [PATCH] update --- base.tf.jinja | 8 +++++--- splunk.tf.jinja | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/base.tf.jinja b/base.tf.jinja index 39b3527..16ed18b 100644 --- a/base.tf.jinja +++ b/base.tf.jinja @@ -121,15 +121,17 @@ resource "kubernetes_pod" "main" { } spec { security_context { - run_as_user = "1000" - fs_group = "1000" + run_as_user = "{{ coder_user_uid|default("1000", true) }}" + fs_group = "{{ coder_user_gid|default("1000", true) }}" } container { name = "dev" image = "{{image}}" + {% block kubernetes_pod_main_command %} command = ["bash", "-c", coder_agent.main.init_script] + {% endblock %} security_context { - run_as_user = "1000" + run_as_user = "{{ coder_user_uid|default("1000", true) }}" } {% block kubernetes_pod_main_env %} env { diff --git a/splunk.tf.jinja b/splunk.tf.jinja index b6007b2..73ef688 100644 --- a/splunk.tf.jinja +++ b/splunk.tf.jinja @@ -1,5 +1,8 @@ {% extends "base.tf.jinja" %} +{% set coder_user_uid = 41812 %} +{% set coder_user_gid = 41812 %} + {% block coder_apps %} resource "coder_app" "splunk" { agent_id = coder_agent.main.id @@ -17,6 +20,10 @@ resource "coder_app" "splunk" { } {% endblock %} +{% block kubernetes_pod_main_command %} + command = ["/sbin/entrypoint.sh", "/usr/bin/bash", "-c", coder_agent.main.init_script] +{% endblock %} + {% block kubernetes_pod_main_env %} env { name = "SPLUNK_START_ARGS"