From 28dba98cd972f4080b9faac82d7c5a362f0c5864 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Tue, 16 Jul 2019 09:39:55 +0200 Subject: [PATCH] #45 Add test to check for imagePullSecrets propagation --- pkg/controller/jenkins/groovy/groovy.go | 3 +-- test/e2e/configuration_test.go | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/controller/jenkins/groovy/groovy.go b/pkg/controller/jenkins/groovy/groovy.go index 675392ed..5284f176 100644 --- a/pkg/controller/jenkins/groovy/groovy.go +++ b/pkg/controller/jenkins/groovy/groovy.go @@ -187,9 +187,8 @@ func AddSecretsLoaderToGroovyScript(secretsPath string) func(groovyScript string break } } - asdf := strings.Join(lines[:importIndex], "\n") + "\n\n" + fmt.Sprintf(secretsLoaderGroovyScriptFmt, secretsPath) + "\n\n" + strings.Join(lines[importIndex:], "\n") - return asdf + return strings.Join(lines[:importIndex], "\n") + "\n\n" + fmt.Sprintf(secretsLoaderGroovyScriptFmt, secretsPath) + "\n\n" + strings.Join(lines[importIndex:], "\n") } } diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index a3d06361..a6ae0590 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -171,6 +171,8 @@ func verifyJenkinsMasterPodAttributes(t *testing.T, jenkins *v1alpha2.Jenkins) { assert.Equal(t, jenkins.Spec.Master.SecurityContext, jenkinsPod.Spec.SecurityContext) assert.Equal(t, jenkins.Spec.Master.Containers[0].Command, jenkinsPod.Spec.Containers[0].Command) + assert.Equal(t, jenkins.Spec.Master.ImagePullSecrets, jenkinsPod.Spec.ImagePullSecrets) + for _, actualContainer := range jenkinsPod.Spec.Containers { if actualContainer.Name == resources.JenkinsMasterContainerName { verifyContainer(t, resources.NewJenkinsMasterContainer(jenkins), actualContainer)