public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-17 21:35:38 +02:00
Code Issues Releases Wiki Activity

#12 Allow configure Jenkins and Jenkins slave services

Browse Source
This commit is contained in:
Tomasz Sęk
2019-03-08 17:06:53 +01:00
parent 75c403b941
commit 90c6f25610
11 changed files with 168 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/jenkins.go
+1 -1
View File
@@ -46,7 +46,7 @@ func createJenkinsAPIClient(jenkins *v1alpha1.Jenkins) (jenkinsclient.Jenkins, e
return nil, err
}
jenkinsAPIURL, err := jenkinsclient.BuildJenkinsAPIUrl(jenkins.ObjectMeta.Namespace, resources.GetResourceName(jenkins), resources.HTTPPortInt, true, true)
jenkinsAPIURL, err := jenkinsclient.BuildJenkinsAPIUrl(jenkins.ObjectMeta.Namespace, resources.GetJenkinsHTTPServiceName(jenkins), resources.HTTPPortInt, true, true)
if err != nil {
return nil, err
}
test/e2e/wait.go
+7 -3
View File
@@ -14,6 +14,7 @@ import (
framework "github.com/operator-framework/operator-sdk/pkg/test"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
@@ -35,10 +36,13 @@ func waitForJenkinsBaseConfigurationToComplete(t *testing.T, jenkins *v1alpha1.J
t.Logf("Current Jenkins status '%+v'", jenkins.Status)
return jenkins.Status.BaseConfigurationCompletedTime != nil
})
if err != nil {
t.Fatal(err)
}
assert.NoError(t, err)
t.Log("Jenkins pod is running")
// update jenkins CR because Operator sets default values
namespacedName := types.NamespacedName{Namespace: jenkins.Namespace, Name: jenkins.Name}
err = framework.Global.Client.Get(goctx.TODO(), namespacedName, jenkins)
assert.NoError(t, err)
}
func waitForRecreateJenkinsMasterPod(t *testing.T, jenkins *v1alpha1.Jenkins) {