Add 'env' field to runner resource

This commit is contained in:
Moto Ishizawa
2020-02-06 22:09:07 +09:00
parent c66916a4ee
commit 829a167303
4 changed files with 127 additions and 15 deletions

View File

@@ -334,6 +334,22 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
runnerImage = r.RunnerImage
}
env := []corev1.EnvVar{
{
Name: "RUNNER_NAME",
Value: runner.Name,
},
{
Name: "RUNNER_REPO",
Value: runner.Spec.Repository,
},
{
Name: "RUNNER_TOKEN",
Value: runner.Status.Registration.Token,
},
}
env = append(env, runner.Spec.Env...)
pod := corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: runner.Name,
@@ -346,20 +362,7 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
Name: containerName,
Image: runnerImage,
ImagePullPolicy: "Always",
Env: []corev1.EnvVar{
{
Name: "RUNNER_NAME",
Value: runner.Name,
},
{
Name: "RUNNER_REPO",
Value: runner.Spec.Repository,
},
{
Name: "RUNNER_TOKEN",
Value: runner.Status.Registration.Token,
},
},
Env: env,
VolumeMounts: []corev1.VolumeMount{
{
Name: "docker",