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

Rename plugin package

This commit is contained in:
Tomasz Sęk 2019-01-16 22:45:09 +01:00
parent cb2dfdd28a
commit 1f1947a80b
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/jenkins/configuration/base/reconcile.go
View File

@ -11,7 +11,7 @@ import (
"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources"
"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/jenkins/groovy" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/groovy"
"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugin" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
"github.com/VirtusLab/jenkins-operator/pkg/log" "github.com/VirtusLab/jenkins-operator/pkg/log"
"github.com/bndr/gojenkins" "github.com/bndr/gojenkins"
@ -148,14 +148,14 @@ func (r *ReconcileJenkinsBaseConfiguration) verifyBasePlugins(jenkinsClient jenk
var installedPlugins []string var installedPlugins []string
for _, jenkinsPlugin := range allPluginsInJenkins.Raw.Plugins { for _, jenkinsPlugin := range allPluginsInJenkins.Raw.Plugins {
if !jenkinsPlugin.Deleted { if !jenkinsPlugin.Deleted {
installedPlugins = append(installedPlugins, plugin.Plugin{Name: jenkinsPlugin.ShortName, Version: jenkinsPlugin.Version}.String()) installedPlugins = append(installedPlugins, plugins.Plugin{Name: jenkinsPlugin.ShortName, Version: jenkinsPlugin.Version}.String())
} }
} }
r.logger.V(log.VDebug).Info(fmt.Sprintf("Installed plugins '%+v'", installedPlugins)) r.logger.V(log.VDebug).Info(fmt.Sprintf("Installed plugins '%+v'", installedPlugins))
status := true status := true
for rootPluginName, p := range plugin.BasePluginsMap { for rootPluginName, p := range plugins.BasePluginsMap {
rootPlugin, _ := plugin.New(rootPluginName) rootPlugin, _ := plugins.New(rootPluginName)
if found, ok := isPluginInstalled(allPluginsInJenkins, *rootPlugin); !ok { if found, ok := isPluginInstalled(allPluginsInJenkins, *rootPlugin); !ok {
r.logger.V(log.VWarn).Info(fmt.Sprintf("Missing plugin '%s', actual '%+v'", rootPlugin, found)) r.logger.V(log.VWarn).Info(fmt.Sprintf("Missing plugin '%s', actual '%+v'", rootPlugin, found))
status = false status = false
@ -171,7 +171,7 @@ func (r *ReconcileJenkinsBaseConfiguration) verifyBasePlugins(jenkinsClient jenk
return status, nil return status, nil
} }
func isPluginInstalled(plugins *gojenkins.Plugins, requiredPlugin plugin.Plugin) (gojenkins.Plugin, bool) { func isPluginInstalled(plugins *gojenkins.Plugins, requiredPlugin plugins.Plugin) (gojenkins.Plugin, bool) {
p := plugins.Contains(requiredPlugin.Name) p := plugins.Contains(requiredPlugin.Name)
if p == nil { if p == nil {
return gojenkins.Plugin{}, false return gojenkins.Plugin{}, false

16
pkg/controller/jenkins/configuration/base/validate.go
View File

@ -7,7 +7,7 @@ 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/configuration/base/resources" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources"
"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugin" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
"github.com/VirtusLab/jenkins-operator/pkg/log" "github.com/VirtusLab/jenkins-operator/pkg/log"
docker "github.com/docker/distribution/reference" docker "github.com/docker/distribution/reference"
@ -49,19 +49,19 @@ func (r *ReconcileJenkinsBaseConfiguration) Validate(jenkins *virtuslabv1alpha1.
return true, nil return true, nil
} }
func (r *ReconcileJenkinsBaseConfiguration) validatePlugins(plugins map[string][]string) bool { func (r *ReconcileJenkinsBaseConfiguration) validatePlugins(pluginsWithVersions map[string][]string) bool {
valid := true valid := true
allPlugins := map[string][]plugin.Plugin{} allPlugins := map[string][]plugins.Plugin{}
for rootPluginName, dependentPluginNames := range plugins { for rootPluginName, dependentPluginNames := range pluginsWithVersions {
if _, err := plugin.New(rootPluginName); err != nil { if _, err := plugins.New(rootPluginName); err != nil {
r.logger.V(log.VWarn).Info(fmt.Sprintf("Invalid root plugin name '%s'", rootPluginName)) r.logger.V(log.VWarn).Info(fmt.Sprintf("Invalid root plugin name '%s'", rootPluginName))
valid = false valid = false
} }
dependentPlugins := []plugin.Plugin{} dependentPlugins := []plugins.Plugin{}
for _, pluginName := range dependentPluginNames { for _, pluginName := range dependentPluginNames {
if p, err := plugin.New(pluginName); err != nil { if p, err := plugins.New(pluginName); err != nil {
r.logger.V(log.VWarn).Info(fmt.Sprintf("Invalid dependent plugin name '%s' in root plugin '%s'", pluginName, rootPluginName)) r.logger.V(log.VWarn).Info(fmt.Sprintf("Invalid dependent plugin name '%s' in root plugin '%s'", pluginName, rootPluginName))
valid = false valid = false
} else { } else {
@ -73,7 +73,7 @@ func (r *ReconcileJenkinsBaseConfiguration) validatePlugins(plugins map[string][
} }
if valid { if valid {
return plugin.VerifyDependencies(allPlugins) return plugins.VerifyDependencies(allPlugins)
} }
return valid return valid

4
pkg/controller/jenkins/jenkins_controller.go
View File

@ -8,7 +8,7 @@ import (
"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base"
"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/user" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/user"
"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/jenkins/plugin" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
"github.com/VirtusLab/jenkins-operator/pkg/log" "github.com/VirtusLab/jenkins-operator/pkg/log"
"github.com/go-logr/logr" "github.com/go-logr/logr"
@ -207,7 +207,7 @@ func (r *ReconcileJenkins) setDefaults(jenkins *virtuslabv1alpha1.Jenkins, logge
if len(jenkins.Spec.Master.Plugins) == 0 { if len(jenkins.Spec.Master.Plugins) == 0 {
logger.Info("Setting default base plugins") logger.Info("Setting default base plugins")
changed = true changed = true
jenkins.Spec.Master.Plugins = plugin.BasePlugins() jenkins.Spec.Master.Plugins = plugins.BasePlugins()
} }
_, requestCPUSet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceCPU] _, requestCPUSet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceCPU]
_, requestMemporySet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceMemory] _, requestMemporySet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceMemory]

2
pkg/controller/jenkins/plugin/base_plugins.go → pkg/controller/jenkins/plugins/base_plugins.go
View File

@ -1,4 +1,4 @@
package plugin package plugins
// BasePlugins returns map of plugins to install by operator // BasePlugins returns map of plugins to install by operator
func BasePlugins() (plugins map[string][]string) { func BasePlugins() (plugins map[string][]string) {

2
pkg/controller/jenkins/plugin/plugin.go → pkg/controller/jenkins/plugins/plugin.go
View File

@ -1,4 +1,4 @@
package plugin package plugins
import ( import (
"fmt" "fmt"

2
pkg/controller/jenkins/plugin/plugin_test.go → pkg/controller/jenkins/plugins/plugin_test.go
View File

@ -1,4 +1,4 @@
package plugin package plugins
import ( import (
"fmt" "fmt"

8
test/e2e/base_configuration_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
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/plugin" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
"github.com/bndr/gojenkins" "github.com/bndr/gojenkins"
framework "github.com/operator-framework/operator-sdk/pkg/test" framework "github.com/operator-framework/operator-sdk/pkg/test"
@ -86,8 +86,8 @@ func verifyBasePlugins(t *testing.T, jenkinsClient *gojenkins.Jenkins) {
t.Fatal(err) t.Fatal(err)
} }
for rootPluginName, p := range plugin.BasePluginsMap { for rootPluginName, p := range plugins.BasePluginsMap {
rootPlugin, err := plugin.New(rootPluginName) rootPlugin, err := plugins.New(rootPluginName)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -104,7 +104,7 @@ func verifyBasePlugins(t *testing.T, jenkinsClient *gojenkins.Jenkins) {
t.Log("Base plugins have been installed") t.Log("Base plugins have been installed")
} }
func isPluginValid(plugins *gojenkins.Plugins, requiredPlugin plugin.Plugin) (*gojenkins.Plugin, bool) { func isPluginValid(plugins *gojenkins.Plugins, requiredPlugin plugins.Plugin) (*gojenkins.Plugin, bool) {
p := plugins.Contains(requiredPlugin.Name) p := plugins.Contains(requiredPlugin.Name)
if p == nil { if p == nil {
return p, false return p, false