#96 Fix casc secret configuration bug
This commit is contained in:
		
							parent
							
								
									f5c8d936d6
								
							
						
					
					
						commit
						8c70c0774f
					
				|  | @ -155,7 +155,7 @@ func getGroovyScriptsSecretVolumeName(jenkins *v1alpha2.Jenkins) string { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func getConfigurationAsCodeSecretVolumeName(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
 | // GetJenkinsMasterContainerBaseVolumeMounts returns Jenkins master pod volume mounts required by operator
 | ||||||
|  |  | ||||||
|  | @ -0,0 +1,54 @@ | ||||||
|  | package resources | ||||||
|  | 
 | ||||||
|  | import ( | ||||||
|  | 	"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" | ||||||
|  | 	"github.com/stretchr/testify/assert" | ||||||
|  | 	"testing" | ||||||
|  | ) | ||||||
|  | 
 | ||||||
|  | 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 := false | ||||||
|  | 		cascExists := false | ||||||
|  | 
 | ||||||
|  | 		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 | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 		assert.True(t, groovyExists && cascExists) | ||||||
|  | 	}) | ||||||
|  | } | ||||||
		Loading…
	
		Reference in New Issue