public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #99 from jakalkhalili/secret-configuration-fix 

#96 Fix casc secret configuration bug
This commit is contained in:
Tomasz Sęk 2019-09-12 15:59:17 +02:00 committed by GitHub
parent bd45b0b277 9763ea5899
commit 5d6f5a2fc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 159 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/jenkins/configuration/base/resources/pod.go
View File

@ -155,7 +155,7 @@ func getGroovyScriptsSecretVolumeName(jenkins *v1alpha2.Jenkins) string {
}
func getConfigurationAsCodeSecretVolumeName(jenkins *v1alpha2.Jenkins) string {
return "casc-" + jenkins.Spec.GroovyScripts.Secret.Name
return "casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name
}
// GetJenkinsMasterContainerBaseVolumeMounts returns Jenkins master pod volume mounts required by operator

158
pkg/controller/jenkins/configuration/base/resources/pod_test.go Normal file
View File

@ -0,0 +1,158 @@
package resources
import (
"testing"
"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2"
"github.com/stretchr/testify/assert"
)
func TestGetJenkinsMasterPodBaseVolumes(t *testing.T) {
t.Run("casc and groovy script with different configMap names", func(t *testing.T) {
configMapName := "config-map"
jenkins := &v1alpha2.Jenkins{
Spec: v1alpha2.JenkinsSpec{
ConfigurationAsCode: v1alpha2.ConfigurationAsCode{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: configMapName,
},
},
Secret: v1alpha2.SecretRef{
Name: "casc-script",
},
},
},
GroovyScripts: v1alpha2.GroovyScripts{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: configMapName,
},
},
Secret: v1alpha2.SecretRef{
Name: "groovy-script",
},
},
},
},
}
groovyExists, cascExists := checkSecretVolumesPresence(jenkins)
assert.True(t, groovyExists)
assert.True(t, cascExists)
})
t.Run("groovy script without secret name", func(t *testing.T) {
jenkins := &v1alpha2.Jenkins{
Spec: v1alpha2.JenkinsSpec{
ConfigurationAsCode: v1alpha2.ConfigurationAsCode{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: "casc-scripts",
},
},
Secret: v1alpha2.SecretRef{
Name: "jenkins-secret",
},
},
},
GroovyScripts: v1alpha2.GroovyScripts{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: "groovy-scripts",
},
},
},
},
},
}
groovyExists, cascExists := checkSecretVolumesPresence(jenkins)
assert.True(t, cascExists)
assert.False(t, groovyExists)
})
t.Run("casc without secret name", func(t *testing.T) {
jenkins := &v1alpha2.Jenkins{
Spec: v1alpha2.JenkinsSpec{
ConfigurationAsCode: v1alpha2.ConfigurationAsCode{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: "casc-scripts",
},
},
},
},
GroovyScripts: v1alpha2.GroovyScripts{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: "groovy-scripts",
},
},
Secret: v1alpha2.SecretRef{
Name: "jenkins-secret",
},
},
},
},
}
groovyExists, cascExists := checkSecretVolumesPresence(jenkins)
assert.True(t, groovyExists)
assert.False(t, cascExists)
})
t.Run("casc and groovy script shared secret name", func(t *testing.T) {
jenkins := &v1alpha2.Jenkins{
Spec: v1alpha2.JenkinsSpec{
ConfigurationAsCode: v1alpha2.ConfigurationAsCode{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: "casc-scripts",
},
},
Secret: v1alpha2.SecretRef{
Name: "jenkins-secret",
},
},
},
GroovyScripts: v1alpha2.GroovyScripts{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: "groovy-scripts",
},
},
Secret: v1alpha2.SecretRef{
Name: "jenkins-secret",
},
},
},
},
}
groovyExists, cascExists := checkSecretVolumesPresence(jenkins)
assert.True(t, groovyExists)
assert.True(t, cascExists)
})
}
func checkSecretVolumesPresence(jenkins *v1alpha2.Jenkins) (groovyExists bool, cascExists bool) {
for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) {
if volume.Name == ("gs-" + jenkins.Spec.GroovyScripts.Secret.Name) {
groovyExists = true
} else if volume.Name == ("casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name) {
cascExists = true
}
}
return groovyExists, cascExists
}