Skip to content

Commit 1113c99

Browse files
committed
Refactor OpentofuWorker Environment Variables
1 parent 5021cc4 commit 1113c99

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

app/models/opentofu_worker.rb

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,31 +71,33 @@ def enable_systemd_unit
7171
create_podman_secret
7272
end
7373

74+
def environment_variables
75+
super.merge(
76+
"PORT" => container_port,
77+
"LOG4JS_LEVEL" => ::Settings.log.level_embedded_terraform,
78+
"TF_OFFLINE" => worker_settings[:opentofu_offline]
79+
)
80+
end
81+
7482
def unit_environment_variables
7583
{
7684
"DATABASE_HOSTNAME" => database_configuration[:host],
7785
"DATABASE_NAME" => database_configuration[:database],
7886
"DATABASE_USERNAME" => database_configuration[:username],
7987
"MEMCACHE_SERVERS" => ::Settings.session.memcache_server,
80-
"PORT" => container_port,
81-
"OPENTOFU_RUNNER_IMAGE" => container_image,
82-
"LOG4JS_LEVEL" => ::Settings.log.level_embedded_terraform,
83-
"TF_OFFLINE" => worker_settings[:opentofu_offline]
88+
"OPENTOFU_RUNNER_IMAGE" => container_image
8489
}
8590
end
8691

92+
def container_environment_variables
93+
super.merge("HOME" => "/home/node")
94+
end
95+
8796
def configure_service_worker_deployment(definition)
8897
super
8998
# overwriting container port to be same as opentofu-runner service port i.e. in this case 6000
9099
definition[:spec][:template][:spec][:containers].first[:ports] = [{:containerPort => container_port}]
91100

92-
# ovewriting home directory to terraform home dir
93-
env_var_array = definition[:spec][:template][:spec][:containers][0][:env]
94-
env_var_array.detect { |env| env[:name] == "HOME" }&.[]=(:value, "/home/node")
95-
96-
definition[:spec][:template][:spec][:containers][0][:env] << {:name => "LOG4JS_LEVEL", :value => Settings.log.level_embedded_terraform}
97-
definition[:spec][:template][:spec][:containers][0][:env] << {:name => "TF_OFFLINE", :value => worker_settings[:opentofu_offline].to_s}
98-
99101
# these volume mounts are require by terraform runner to create the stack, mentioned it as {} so that it can be writable
100102
definition[:spec][:template][:spec][:containers].first[:volumeMounts] << {:name => "terraform-bin-empty", :mountPath => "/home/node/terraform/bin"}
101103
definition[:spec][:template][:spec][:volumes] << {:name => "stacks-empty", :emptyDir => {}}

0 commit comments

Comments
 (0)