From 0e4ae1550608b365e8231ef4a56401bc7d0577da Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Wed, 17 Jul 2019 16:01:34 +0200 Subject: [PATCH 1/3] #28 Enable groovy scripts secret loader --- .../jenkins/configuration/user/reconcile.go | 5 +---- test/e2e/configuration_test.go | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkg/controller/jenkins/configuration/user/reconcile.go b/pkg/controller/jenkins/configuration/user/reconcile.go index 13525a62..0bdb4c6b 100644 --- a/pkg/controller/jenkins/configuration/user/reconcile.go +++ b/pkg/controller/jenkins/configuration/user/reconcile.go @@ -112,10 +112,7 @@ func (r *ReconcileUserConfiguration) ensureUserConfiguration(jenkinsClient jenki } requeue, err = groovyClient.Ensure(func(name string) bool { return strings.HasSuffix(name, ".groovy") - }, func(groovyScript string) string { - // TODO load secrets to variables - return groovyScript - }) + }, groovy.AddSecretsLoaderToGroovyScript(resources.GroovyScriptsSecretVolumePath)) if err != nil { return reconcile.Result{}, err } diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index a6ae0590..f75cb178 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -3,15 +3,15 @@ package e2e import ( "context" "fmt" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" "testing" + "github.com/bndr/gojenkins" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" - - "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" @@ -73,7 +73,6 @@ func TestConfiguration(t *testing.T) { createDefaultLimitsForContainersInNamespace(t, namespace) createKubernetesCredentialsProviderSecret(t, namespace, mySeedJob) waitForJenkinsBaseConfigurationToComplete(t, jenkins) - verifyJenkinsMasterPodAttributes(t, jenkins) client := verifyJenkinsAPIConnection(t, jenkins) verifyPlugins(t, client, jenkins) @@ -92,6 +91,7 @@ func createUserConfigurationSecret(t *testing.T, namespace string, systemMessage }, StringData: map[string]string{ systemMessageEnvName: systemMessage, + "numberOfExecutors": "3", }, } @@ -275,6 +275,15 @@ if (!new Integer(%d).equals(Jenkins.instance.numExecutors)) { logs, err := jenkinsClient.ExecuteScript(checkConfigurationViaGroovyScript) assert.NoError(t, err, logs) + checkSecretLoaderViaGroovyScript := fmt.Sprintf(` +if (new Integer(%d).equals(secrets['numberOfExecutors'])) { + throw new Exception("Falied") +}`, amountOfExecutors) + + loader := groovy.AddSecretsLoaderToGroovyScript("/var/jenkins/groovy-scripts-secrets") + logs, err = jenkinsClient.ExecuteScript(loader(checkSecretLoaderViaGroovyScript)) + assert.NoError(t, err, logs) + checkConfigurationAsCode := fmt.Sprintf(` if (!"%s".equals(Jenkins.instance.systemMessage)) { throw new Exception("Configuration as code failed") From 6a357e28e33348cfcec9b19da17fe622388469d7 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Thu, 18 Jul 2019 10:18:51 +0200 Subject: [PATCH 2/3] #28 Improve e2e tests --- test/e2e/configuration_test.go | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index f75cb178..8389ca87 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -3,20 +3,21 @@ package e2e import ( "context" "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" "testing" - "github.com/bndr/gojenkins" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/bndr/gojenkins" + "k8s.io/apimachinery/pkg/api/resource" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/stretchr/testify/assert" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestConfiguration(t *testing.T) { @@ -27,6 +28,7 @@ func TestConfiguration(t *testing.T) { jenkinsCRName := "e2e" numberOfExecutors := 6 + numberOfExecutorsEnvName := "NUMBER_OF_EXECUTORS" systemMessage := "Configuration as Code integration works!!!" systemMessageEnvName := "SYSTEM_MESSAGE" mySeedJob := seedJobConfig{ @@ -66,8 +68,12 @@ func TestConfiguration(t *testing.T) { }, } + stringData := make(map[string]string) + stringData[systemMessageEnvName] = systemMessage + stringData[numberOfExecutorsEnvName] = fmt.Sprintf("%d", numberOfExecutors) + // base - createUserConfigurationSecret(t, namespace, systemMessageEnvName, systemMessage) + createUserConfigurationSecret(t, namespace, stringData) createUserConfigurationConfigMap(t, namespace, numberOfExecutors, fmt.Sprintf("${%s}", systemMessageEnvName)) jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &[]v1alpha2.SeedJob{mySeedJob.SeedJob}, groovyScripts, casc) createDefaultLimitsForContainersInNamespace(t, namespace) @@ -83,16 +89,13 @@ func TestConfiguration(t *testing.T) { verifyJenkinsSeedJobs(t, client, []seedJobConfig{mySeedJob}) } -func createUserConfigurationSecret(t *testing.T, namespace string, systemMessageEnvName, systemMessage string) { +func createUserConfigurationSecret(t *testing.T, namespace string, stringData map[string]string) { userConfiguration := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ Name: userConfigurationSecretName, Namespace: namespace, }, - StringData: map[string]string{ - systemMessageEnvName: systemMessage, - "numberOfExecutors": "3", - }, + StringData: stringData, } t.Logf("User configuration secret %+v", *userConfiguration) @@ -276,8 +279,8 @@ if (!new Integer(%d).equals(Jenkins.instance.numExecutors)) { assert.NoError(t, err, logs) checkSecretLoaderViaGroovyScript := fmt.Sprintf(` -if (new Integer(%d).equals(secrets['numberOfExecutors'])) { - throw new Exception("Falied") +if (!new Integer(%d).equals(new Integer(secrets['NUMBER_OF_EXECUTORS']))) { + throw new Exception("Falied to check secrets by groovy secret loader") }`, amountOfExecutors) loader := groovy.AddSecretsLoaderToGroovyScript("/var/jenkins/groovy-scripts-secrets") From 52cd17e97f3f62874d88477d56f955061234ee65 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Thu, 18 Jul 2019 11:43:28 +0200 Subject: [PATCH 3/3] #28 Improve TestConfiguration e2e test --- test/e2e/configuration_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 8389ca87..7e0af964 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -74,7 +74,7 @@ func TestConfiguration(t *testing.T) { // base createUserConfigurationSecret(t, namespace, stringData) - createUserConfigurationConfigMap(t, namespace, numberOfExecutors, fmt.Sprintf("${%s}", systemMessageEnvName)) + createUserConfigurationConfigMap(t, namespace, numberOfExecutorsEnvName, fmt.Sprintf("${%s}", systemMessageEnvName)) jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &[]v1alpha2.SeedJob{mySeedJob.SeedJob}, groovyScripts, casc) createDefaultLimitsForContainersInNamespace(t, namespace) createKubernetesCredentialsProviderSecret(t, namespace, mySeedJob) @@ -104,7 +104,7 @@ func createUserConfigurationSecret(t *testing.T, namespace string, stringData ma } } -func createUserConfigurationConfigMap(t *testing.T, namespace string, numberOfExecutors int, systemMessage string) { +func createUserConfigurationConfigMap(t *testing.T, namespace string, numberOfExecutorsSecretKeyName string, systemMessage string) { userConfiguration := &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: userConfigurationConfigMapName, @@ -114,8 +114,8 @@ func createUserConfigurationConfigMap(t *testing.T, namespace string, numberOfEx "1-set-executors.groovy": fmt.Sprintf(` import jenkins.model.Jenkins -Jenkins.instance.setNumExecutors(%d) -Jenkins.instance.save()`, numberOfExecutors), +Jenkins.instance.setNumExecutors(new Integer(secrets['%s'])) +Jenkins.instance.save()`, numberOfExecutorsSecretKeyName), "1-casc.yaml": fmt.Sprintf(` jenkins: systemMessage: "%s"`, systemMessage), @@ -280,7 +280,7 @@ if (!new Integer(%d).equals(Jenkins.instance.numExecutors)) { checkSecretLoaderViaGroovyScript := fmt.Sprintf(` if (!new Integer(%d).equals(new Integer(secrets['NUMBER_OF_EXECUTORS']))) { - throw new Exception("Falied to check secrets by groovy secret loader") + throw new Exception("Secret not found by given key: NUMBER_OF_EXECUTORS") }`, amountOfExecutors) loader := groovy.AddSecretsLoaderToGroovyScript("/var/jenkins/groovy-scripts-secrets")