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

Refactoring

This commit is contained in:
Tomasz Sęk 2019-01-11 11:02:54 +01:00
parent 1104df0b88
commit aff974b466
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go
View File

@ -6,7 +6,6 @@ import (
"text/template" "text/template"
virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1"
"github.com/VirtusLab/jenkins-operator/pkg/controller/render"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -42,7 +41,7 @@ func buildCreateJenkinsOperatorUserGroovyScript() (*string, error) {
OperatorPasswordFile: OperatorCredentialsSecretPasswordKey, OperatorPasswordFile: OperatorCredentialsSecretPasswordKey,
} }
output, err := render.Render(createOperatorUserGroovyFmtTemplate, data) output, err := render(createOperatorUserGroovyFmtTemplate, data)
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
pkg/controller/render/render.go → pkg/controller/jenkins/configuration/base/resources/render.go
View File

@ -1,12 +1,12 @@
package render package resources
import ( import (
"bytes" "bytes"
"text/template" "text/template"
) )
// Render executes a parsed template (go-template) with configuration from data // render executes a parsed template (go-template) with configuration from data
func Render(template *template.Template, data interface{}) (string, error) { func render(template *template.Template, data interface{}) (string, error) {
var buffer bytes.Buffer var buffer bytes.Buffer
if err := template.Execute(&buffer, data); err != nil { if err := template.Execute(&buffer, data); err != nil {
return "", err return "", err

3
pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go
View File

@ -7,7 +7,6 @@ import (
virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1"
"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants"
"github.com/VirtusLab/jenkins-operator/pkg/controller/render"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )
@ -287,7 +286,7 @@ func buildInitBashScript(pluginsToInstall map[string][]string) (*string, error)
JenkinsScriptsVolumePath: jenkinsScriptsVolumePath, JenkinsScriptsVolumePath: jenkinsScriptsVolumePath,
} }
output, err := render.Render(initBashTemplate, data) output, err := render(initBashTemplate, data)
if err != nil { if err != nil {
return nil, err return nil, err
} }