Skip to content

Commit 76ae944

Browse files
authored
fix: always encrypt EBS volumes if the KMS key is given (#1248)
## Description The EBS volume encryption was activated only, if the fleeting plugin is activated. It seems that we can always activate the encryption as the docker-machine parameters are not tied to the fleeting plugin. Fixes #1242
1 parent 696ebbe commit 76ae944

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

template/runner-docker-machine-config.tftpl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@
2727
"amazonec2-volume-type=${runners_volume_type}",
2828
"amazonec2-userdata=%{~ if runners_userdata != "" ~}/etc/gitlab-runner/runners_userdata.sh%{~ endif ~}",
2929
"amazonec2-ami=${runners_ami}"
30+
%{~ if runners_volume_kms_key != "" ~}
31+
,"amazonec2-volume-encrypted=true",
32+
"amazonec2-volume-kms-key=${runners_volume_kms_key}"
33+
%{~ endif ~}
3034
%{~ if use_fleet == true ~}
3135
,"amazonec2-ssh-keypath=/root/.ssh/id_rsa",
3236
"amazonec2-use-fleet=${use_fleet}",
33-
"amazonec2-launch-template=${launch_template}",
34-
"amazonec2-volume-encrypted=true",
35-
"amazonec2-volume-kms-key=${runners_volume_kms_key}"
37+
"amazonec2-launch-template=${launch_template}"
3638
%{~ endif ~}
3739
${docker_machine_options}
3840
]

0 commit comments

Comments
 (0)