diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 44cd915a..4e669c2f 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -12,11 +12,11 @@ import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications" - e "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications" + e "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" "github.com/jenkinsci/kubernetes-operator/pkg/event" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/jenkinsci/kubernetes-operator/version" diff --git a/go.mod b/go.mod index 5e95b57c..cb297196 100644 --- a/go.mod +++ b/go.mod @@ -34,6 +34,7 @@ require ( k8s.io/code-generator v0.17.4 k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a + k8s.io/utils v0.0.0-20190801114015-581e00157fb1 sigs.k8s.io/controller-runtime v0.5.2 sigs.k8s.io/controller-tools v0.2.8 ) diff --git a/pkg/controller/jenkins/client/doc.go b/pkg/client/doc.go similarity index 100% rename from pkg/controller/jenkins/client/doc.go rename to pkg/client/doc.go diff --git a/pkg/controller/jenkins/client/jenkins.go b/pkg/client/jenkins.go similarity index 100% rename from pkg/controller/jenkins/client/jenkins.go rename to pkg/client/jenkins.go diff --git a/pkg/controller/jenkins/client/job.go b/pkg/client/job.go similarity index 100% rename from pkg/controller/jenkins/client/job.go rename to pkg/client/job.go diff --git a/pkg/controller/jenkins/client/mockgen.go b/pkg/client/mockgen.go similarity index 100% rename from pkg/controller/jenkins/client/mockgen.go rename to pkg/client/mockgen.go diff --git a/pkg/controller/jenkins/client/script.go b/pkg/client/script.go similarity index 100% rename from pkg/controller/jenkins/client/script.go rename to pkg/client/script.go diff --git a/pkg/controller/jenkins/client/script_test.go b/pkg/client/script_test.go similarity index 100% rename from pkg/controller/jenkins/client/script_test.go rename to pkg/client/script_test.go diff --git a/pkg/controller/jenkins/client/token.go b/pkg/client/token.go similarity index 100% rename from pkg/controller/jenkins/client/token.go rename to pkg/client/token.go diff --git a/pkg/controller/jenkins/configuration/backuprestore/backuprestore.go b/pkg/configuration/backuprestore/backuprestore.go similarity index 97% rename from pkg/controller/jenkins/configuration/backuprestore/backuprestore.go rename to pkg/configuration/backuprestore/backuprestore.go index 27a200f2..d3d25ba3 100644 --- a/pkg/controller/jenkins/configuration/backuprestore/backuprestore.go +++ b/pkg/configuration/backuprestore/backuprestore.go @@ -6,9 +6,9 @@ import ( "time" "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" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/go-logr/logr" diff --git a/pkg/controller/jenkins/configuration/backuprestore/doc.go b/pkg/configuration/backuprestore/doc.go similarity index 100% rename from pkg/controller/jenkins/configuration/backuprestore/doc.go rename to pkg/configuration/backuprestore/doc.go diff --git a/pkg/controller/jenkins/configuration/base/configmap.go b/pkg/configuration/base/configmap.go similarity index 91% rename from pkg/controller/jenkins/configuration/base/configmap.go rename to pkg/configuration/base/configmap.go index 2c9487f8..1ed97a2d 100644 --- a/pkg/controller/jenkins/configuration/base/configmap.go +++ b/pkg/configuration/base/configmap.go @@ -1,7 +1,7 @@ package base import ( - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" stackerr "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/container.go b/pkg/configuration/base/container.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/container.go rename to pkg/configuration/base/container.go diff --git a/pkg/controller/jenkins/configuration/base/deployment.go b/pkg/configuration/base/deployment.go similarity index 86% rename from pkg/controller/jenkins/configuration/base/deployment.go rename to pkg/configuration/base/deployment.go index 5875b125..0e63e1a1 100644 --- a/pkg/controller/jenkins/configuration/base/deployment.go +++ b/pkg/configuration/base/deployment.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/jenkinsci/kubernetes-operator/version" stackerr "github.com/pkg/errors" diff --git a/pkg/controller/jenkins/configuration/base/doc.go b/pkg/configuration/base/doc.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/doc.go rename to pkg/configuration/base/doc.go diff --git a/pkg/controller/jenkins/configuration/base/label.go b/pkg/configuration/base/label.go similarity index 95% rename from pkg/controller/jenkins/configuration/base/label.go rename to pkg/configuration/base/label.go index 5a37fc04..2f92a641 100644 --- a/pkg/controller/jenkins/configuration/base/label.go +++ b/pkg/configuration/base/label.go @@ -4,7 +4,7 @@ import ( "context" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" stackerr "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/plugin.go b/pkg/configuration/base/plugin.go similarity index 92% rename from pkg/controller/jenkins/configuration/base/plugin.go rename to pkg/configuration/base/plugin.go index 7d530b2a..f8a80a3d 100644 --- a/pkg/controller/jenkins/configuration/base/plugin.go +++ b/pkg/configuration/base/plugin.go @@ -4,8 +4,8 @@ import ( "fmt" "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/plugins" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/plugins" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/bndr/gojenkins" diff --git a/pkg/controller/jenkins/configuration/base/pod.go b/pkg/configuration/base/pod.go similarity index 96% rename from pkg/controller/jenkins/configuration/base/pod.go rename to pkg/configuration/base/pod.go index b00d89c0..9c1c0d40 100644 --- a/pkg/controller/jenkins/configuration/base/pod.go +++ b/pkg/configuration/base/pod.go @@ -6,10 +6,10 @@ import ( "reflect" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/backuprestore" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/backuprestore" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/jenkinsci/kubernetes-operator/version" diff --git a/pkg/controller/jenkins/configuration/base/rbac.go b/pkg/configuration/base/rbac.go similarity index 96% rename from pkg/controller/jenkins/configuration/base/rbac.go rename to pkg/configuration/base/rbac.go index 1207793a..e7525118 100644 --- a/pkg/controller/jenkins/configuration/base/rbac.go +++ b/pkg/configuration/base/rbac.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" stackerr "github.com/pkg/errors" rbacv1 "k8s.io/api/rbac/v1" diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/configuration/base/reconcile.go similarity index 97% rename from pkg/controller/jenkins/configuration/base/reconcile.go rename to pkg/configuration/base/reconcile.go index 69e84028..020ffa72 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/configuration/base/reconcile.go @@ -10,11 +10,11 @@ import ( "time" "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" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/groovy" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/go-logr/logr" diff --git a/pkg/controller/jenkins/configuration/base/reconcile_test.go b/pkg/configuration/base/reconcile_test.go similarity index 99% rename from pkg/controller/jenkins/configuration/base/reconcile_test.go rename to pkg/configuration/base/reconcile_test.go index 2bc4fe8f..fbf53341 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile_test.go +++ b/pkg/configuration/base/reconcile_test.go @@ -7,9 +7,9 @@ import ( "github.com/bndr/gojenkins" "github.com/golang/mock/gomock" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go b/pkg/configuration/base/resources/base_configuration_configmap.go similarity index 98% rename from pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go rename to pkg/configuration/base/resources/base_configuration_configmap.go index b5ab9f9d..d1366b30 100644 --- a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go +++ b/pkg/configuration/base/resources/base_configuration_configmap.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/deployment.go b/pkg/configuration/base/resources/deployment.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/resources/deployment.go rename to pkg/configuration/base/resources/deployment.go diff --git a/pkg/controller/jenkins/configuration/base/resources/doc.go b/pkg/configuration/base/resources/doc.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/resources/doc.go rename to pkg/configuration/base/resources/doc.go diff --git a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go b/pkg/configuration/base/resources/init_configuration_configmap.go similarity index 97% rename from pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go rename to pkg/configuration/base/resources/init_configuration_configmap.go index bddad1cb..9a3f4db6 100644 --- a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go +++ b/pkg/configuration/base/resources/init_configuration_configmap.go @@ -6,7 +6,7 @@ import ( "github.com/jenkinsci/kubernetes-operator/internal/render" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/meta.go b/pkg/configuration/base/resources/meta.go similarity index 95% rename from pkg/controller/jenkins/configuration/base/resources/meta.go rename to pkg/configuration/base/resources/meta.go index 94ed39c6..91b3d9e4 100644 --- a/pkg/controller/jenkins/configuration/base/resources/meta.go +++ b/pkg/configuration/base/resources/meta.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go b/pkg/configuration/base/resources/operator_credentials_secret.go similarity index 96% rename from pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go rename to pkg/configuration/base/resources/operator_credentials_secret.go index 179d421c..34ea194d 100644 --- a/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go +++ b/pkg/configuration/base/resources/operator_credentials_secret.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/pod.go b/pkg/configuration/base/resources/pod.go similarity index 99% rename from pkg/controller/jenkins/configuration/base/resources/pod.go rename to pkg/configuration/base/resources/pod.go index ae8d8ab7..25c1be68 100644 --- a/pkg/controller/jenkins/configuration/base/resources/pod.go +++ b/pkg/configuration/base/resources/pod.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/pod_test.go b/pkg/configuration/base/resources/pod_test.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/resources/pod_test.go rename to pkg/configuration/base/resources/pod_test.go diff --git a/pkg/controller/jenkins/configuration/base/resources/random.go b/pkg/configuration/base/resources/random.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/resources/random.go rename to pkg/configuration/base/resources/random.go diff --git a/pkg/controller/jenkins/configuration/base/resources/rbac.go b/pkg/configuration/base/resources/rbac.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/resources/rbac.go rename to pkg/configuration/base/resources/rbac.go diff --git a/pkg/controller/jenkins/configuration/base/resources/route.go b/pkg/configuration/base/resources/route.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/resources/route.go rename to pkg/configuration/base/resources/route.go diff --git a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go b/pkg/configuration/base/resources/scripts_configmap.go similarity index 99% rename from pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go rename to pkg/configuration/base/resources/scripts_configmap.go index ac52e7ba..14e0b36f 100644 --- a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go +++ b/pkg/configuration/base/resources/scripts_configmap.go @@ -6,7 +6,7 @@ import ( "github.com/jenkinsci/kubernetes-operator/internal/render" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/service.go b/pkg/configuration/base/resources/service.go similarity index 97% rename from pkg/controller/jenkins/configuration/base/resources/service.go rename to pkg/configuration/base/resources/service.go index 6cd7667f..6e9cdc67 100644 --- a/pkg/controller/jenkins/configuration/base/resources/service.go +++ b/pkg/configuration/base/resources/service.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" "github.com/operator-framework/operator-sdk/pkg/k8sutil" stackerr "github.com/pkg/errors" diff --git a/pkg/controller/jenkins/configuration/base/resources/service_account.go b/pkg/configuration/base/resources/service_account.go similarity index 100% rename from pkg/controller/jenkins/configuration/base/resources/service_account.go rename to pkg/configuration/base/resources/service_account.go diff --git a/pkg/controller/jenkins/configuration/base/route.go b/pkg/configuration/base/route.go similarity index 94% rename from pkg/controller/jenkins/configuration/base/route.go rename to pkg/configuration/base/route.go index f3d5f344..baf467ef 100644 --- a/pkg/controller/jenkins/configuration/base/route.go +++ b/pkg/configuration/base/route.go @@ -7,7 +7,7 @@ import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" routev1 "github.com/openshift/api/route/v1" stackerr "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/jenkins/configuration/base/service.go b/pkg/configuration/base/service.go similarity index 92% rename from pkg/controller/jenkins/configuration/base/service.go rename to pkg/configuration/base/service.go index ecbb24cd..524c6a3b 100644 --- a/pkg/controller/jenkins/configuration/base/service.go +++ b/pkg/configuration/base/service.go @@ -4,7 +4,7 @@ import ( "context" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" stackerr "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/serviceaccount.go b/pkg/configuration/base/serviceaccount.go similarity index 93% rename from pkg/controller/jenkins/configuration/base/serviceaccount.go rename to pkg/configuration/base/serviceaccount.go index 40cc9200..2002a766 100644 --- a/pkg/controller/jenkins/configuration/base/serviceaccount.go +++ b/pkg/configuration/base/serviceaccount.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/log" stackerr "github.com/pkg/errors" diff --git a/pkg/controller/jenkins/configuration/base/validate.go b/pkg/configuration/base/validate.go similarity index 98% rename from pkg/controller/jenkins/configuration/base/validate.go rename to pkg/configuration/base/validate.go index 02e1e93e..85911d79 100644 --- a/pkg/controller/jenkins/configuration/base/validate.go +++ b/pkg/configuration/base/validate.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/plugins" docker "github.com/docker/distribution/reference" stackerr "github.com/pkg/errors" diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/configuration/base/validate_test.go similarity index 98% rename from pkg/controller/jenkins/configuration/base/validate_test.go rename to pkg/configuration/base/validate_test.go index c08b3836..4735934b 100644 --- a/pkg/controller/jenkins/configuration/base/validate_test.go +++ b/pkg/configuration/base/validate_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" + "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/plugins" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/stretchr/testify/assert" diff --git a/pkg/controller/jenkins/configuration/configuration.go b/pkg/configuration/configuration.go similarity index 96% rename from pkg/controller/jenkins/configuration/configuration.go rename to pkg/configuration/configuration.go index 0cdd7e58..264a3463 100644 --- a/pkg/controller/jenkins/configuration/configuration.go +++ b/pkg/configuration/configuration.go @@ -7,10 +7,10 @@ import ( "time" "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/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" stackerr "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/controller/jenkins/configuration/configuration_test.go b/pkg/configuration/configuration_test.go similarity index 100% rename from pkg/controller/jenkins/configuration/configuration_test.go rename to pkg/configuration/configuration_test.go diff --git a/pkg/controller/jenkins/configuration/user/casc/casc.go b/pkg/configuration/user/casc/casc.go similarity index 91% rename from pkg/controller/jenkins/configuration/user/casc/casc.go rename to pkg/configuration/user/casc/casc.go index d92cf31f..db5b3e96 100644 --- a/pkg/controller/jenkins/configuration/user/casc/casc.go +++ b/pkg/configuration/user/casc/casc.go @@ -5,9 +5,9 @@ import ( "strings" "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/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/groovy" k8s "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/controller/jenkins/configuration/user/casc/casc_test.go b/pkg/configuration/user/casc/casc_test.go similarity index 100% rename from pkg/controller/jenkins/configuration/user/casc/casc_test.go rename to pkg/configuration/user/casc/casc_test.go diff --git a/pkg/controller/jenkins/configuration/user/casc/doc.go b/pkg/configuration/user/casc/doc.go similarity index 100% rename from pkg/controller/jenkins/configuration/user/casc/doc.go rename to pkg/configuration/user/casc/doc.go diff --git a/pkg/controller/jenkins/configuration/user/doc.go b/pkg/configuration/user/doc.go similarity index 100% rename from pkg/controller/jenkins/configuration/user/doc.go rename to pkg/configuration/user/doc.go diff --git a/pkg/controller/jenkins/configuration/user/reconcile.go b/pkg/configuration/user/reconcile.go similarity index 84% rename from pkg/controller/jenkins/configuration/user/reconcile.go rename to pkg/configuration/user/reconcile.go index c52b914b..cb9710f8 100644 --- a/pkg/controller/jenkins/configuration/user/reconcile.go +++ b/pkg/configuration/user/reconcile.go @@ -6,13 +6,13 @@ import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" "github.com/go-logr/logr" - jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/backuprestore" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user/casc" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user/seedjobs" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/backuprestore" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/user/casc" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/user/seedjobs" + "github.com/jenkinsci/kubernetes-operator/pkg/groovy" "github.com/jenkinsci/kubernetes-operator/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/doc.go b/pkg/configuration/user/seedjobs/doc.go similarity index 100% rename from pkg/controller/jenkins/configuration/user/seedjobs/doc.go rename to pkg/configuration/user/seedjobs/doc.go diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/configuration/user/seedjobs/seedjobs.go similarity index 97% rename from pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go rename to pkg/configuration/user/seedjobs/seedjobs.go index 6e9d2fa8..24328e9a 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go +++ b/pkg/configuration/user/seedjobs/seedjobs.go @@ -11,12 +11,12 @@ import ( "github.com/go-logr/logr" "github.com/jenkinsci/kubernetes-operator/internal/render" "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" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/groovy" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/jenkinsci/kubernetes-operator/pkg/log" stackerr "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go b/pkg/configuration/user/seedjobs/seedjobs_test.go similarity index 96% rename from pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go rename to pkg/configuration/user/seedjobs/seedjobs_test.go index 03f3aafb..d0fb3776 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go +++ b/pkg/configuration/user/seedjobs/seedjobs_test.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "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" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" "github.com/bndr/gojenkins" "github.com/golang/mock/gomock" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/validate.go b/pkg/configuration/user/seedjobs/validate.go similarity index 100% rename from pkg/controller/jenkins/configuration/user/seedjobs/validate.go rename to pkg/configuration/user/seedjobs/validate.go diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/validate_test.go b/pkg/configuration/user/seedjobs/validate_test.go similarity index 99% rename from pkg/controller/jenkins/configuration/user/seedjobs/validate_test.go rename to pkg/configuration/user/seedjobs/validate_test.go index 7e8ecf46..02bfbbe9 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/validate_test.go +++ b/pkg/configuration/user/seedjobs/validate_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/user/validate.go b/pkg/configuration/user/validate.go similarity index 71% rename from pkg/controller/jenkins/configuration/user/validate.go rename to pkg/configuration/user/validate.go index 5039ac04..af0b61ff 100644 --- a/pkg/controller/jenkins/configuration/user/validate.go +++ b/pkg/configuration/user/validate.go @@ -2,8 +2,8 @@ package user import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/backuprestore" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user/seedjobs" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/backuprestore" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/user/seedjobs" ) // Validate validates Jenkins CR Spec section diff --git a/pkg/controller/jenkins/constants/constants.go b/pkg/constants/constants.go similarity index 100% rename from pkg/controller/jenkins/constants/constants.go rename to pkg/constants/constants.go diff --git a/pkg/controller/jenkins/constants/labels.go b/pkg/constants/labels.go similarity index 100% rename from pkg/controller/jenkins/constants/labels.go rename to pkg/constants/labels.go diff --git a/pkg/controller/jenkins/handler.go b/pkg/controller/jenkins/handler.go index 1fb694ab..e03a909f 100644 --- a/pkg/controller/jenkins/handler.go +++ b/pkg/controller/jenkins/handler.go @@ -5,7 +5,7 @@ import ( "reflect" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" "github.com/jenkinsci/kubernetes-operator/pkg/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go index 2d0e7506..49430f4f 100644 --- a/pkg/controller/jenkins/jenkins_controller.go +++ b/pkg/controller/jenkins/jenkins_controller.go @@ -8,15 +8,15 @@ import ( "time" "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" - "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/configuration/user" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/user" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/plugins" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/groovy/doc.go b/pkg/groovy/doc.go similarity index 100% rename from pkg/controller/jenkins/groovy/doc.go rename to pkg/groovy/doc.go diff --git a/pkg/controller/jenkins/groovy/groovy.go b/pkg/groovy/groovy.go similarity index 98% rename from pkg/controller/jenkins/groovy/groovy.go rename to pkg/groovy/groovy.go index 6c68357e..9244575b 100644 --- a/pkg/controller/jenkins/groovy/groovy.go +++ b/pkg/groovy/groovy.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/go-logr/logr" diff --git a/pkg/controller/jenkins/groovy/groovy_test.go b/pkg/groovy/groovy_test.go similarity index 99% rename from pkg/controller/jenkins/groovy/groovy_test.go rename to pkg/groovy/groovy_test.go index fd12fb6d..94fe20b1 100644 --- a/pkg/controller/jenkins/groovy/groovy_test.go +++ b/pkg/groovy/groovy_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" "github.com/golang/mock/gomock" "github.com/jenkinsci/kubernetes-operator/pkg/log" diff --git a/pkg/controller/jenkins/notifications/event/event.go b/pkg/notifications/event/event.go similarity index 90% rename from pkg/controller/jenkins/notifications/event/event.go rename to pkg/notifications/event/event.go index 637e667a..6dec551a 100644 --- a/pkg/controller/jenkins/notifications/event/event.go +++ b/pkg/notifications/event/event.go @@ -2,7 +2,7 @@ package event import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" ) // Phase defines the context where notification has been generated: base or user. diff --git a/pkg/controller/jenkins/notifications/mailgun/mailgun.go b/pkg/notifications/mailgun/mailgun.go similarity index 94% rename from pkg/controller/jenkins/notifications/mailgun/mailgun.go rename to pkg/notifications/mailgun/mailgun.go index 5dc5dc4e..72729407 100644 --- a/pkg/controller/jenkins/notifications/mailgun/mailgun.go +++ b/pkg/notifications/mailgun/mailgun.go @@ -7,8 +7,8 @@ import ( "time" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/provider" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/provider" "github.com/mailgun/mailgun-go/v3" "github.com/pkg/errors" diff --git a/pkg/controller/jenkins/notifications/mailgun/mailgun_test.go b/pkg/notifications/mailgun/mailgun_test.go similarity index 94% rename from pkg/controller/jenkins/notifications/mailgun/mailgun_test.go rename to pkg/notifications/mailgun/mailgun_test.go index 3f428732..b621a651 100644 --- a/pkg/controller/jenkins/notifications/mailgun/mailgun_test.go +++ b/pkg/notifications/mailgun/mailgun_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/provider" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/provider" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/notifications/msteams/msteams.go b/pkg/notifications/msteams/msteams.go similarity index 95% rename from pkg/controller/jenkins/notifications/msteams/msteams.go rename to pkg/notifications/msteams/msteams.go index d97fc50f..1048a4ee 100644 --- a/pkg/controller/jenkins/notifications/msteams/msteams.go +++ b/pkg/notifications/msteams/msteams.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/provider" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/provider" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/notifications/msteams/msteams_test.go b/pkg/notifications/msteams/msteams_test.go similarity index 96% rename from pkg/controller/jenkins/notifications/msteams/msteams_test.go rename to pkg/notifications/msteams/msteams_test.go index e052c340..f0e413e5 100644 --- a/pkg/controller/jenkins/notifications/msteams/msteams_test.go +++ b/pkg/notifications/msteams/msteams_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/provider" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/provider" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/notifications/provider/provider.go b/pkg/notifications/provider/provider.go similarity index 92% rename from pkg/controller/jenkins/notifications/provider/provider.go rename to pkg/notifications/provider/provider.go index 356062b3..36bf7b29 100644 --- a/pkg/controller/jenkins/notifications/provider/provider.go +++ b/pkg/notifications/provider/provider.go @@ -2,7 +2,7 @@ package provider import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" ) const ( diff --git a/pkg/controller/jenkins/notifications/reason/reason.go b/pkg/notifications/reason/reason.go similarity index 100% rename from pkg/controller/jenkins/notifications/reason/reason.go rename to pkg/notifications/reason/reason.go diff --git a/pkg/controller/jenkins/notifications/reason/reason_test.go b/pkg/notifications/reason/reason_test.go similarity index 100% rename from pkg/controller/jenkins/notifications/reason/reason_test.go rename to pkg/notifications/reason/reason_test.go diff --git a/pkg/controller/jenkins/notifications/sender.go b/pkg/notifications/sender.go similarity index 85% rename from pkg/controller/jenkins/notifications/sender.go rename to pkg/notifications/sender.go index 6707c2b5..850ef252 100644 --- a/pkg/controller/jenkins/notifications/sender.go +++ b/pkg/notifications/sender.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/mailgun" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/msteams" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/slack" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/smtp" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/mailgun" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/msteams" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/slack" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/smtp" k8sevent "github.com/jenkinsci/kubernetes-operator/pkg/event" "github.com/jenkinsci/kubernetes-operator/pkg/log" diff --git a/pkg/controller/jenkins/notifications/slack/slack.go b/pkg/notifications/slack/slack.go similarity index 95% rename from pkg/controller/jenkins/notifications/slack/slack.go rename to pkg/notifications/slack/slack.go index 93797f6c..eaeb9f9b 100644 --- a/pkg/controller/jenkins/notifications/slack/slack.go +++ b/pkg/notifications/slack/slack.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/provider" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/provider" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/notifications/slack/slack_test.go b/pkg/notifications/slack/slack_test.go similarity index 96% rename from pkg/controller/jenkins/notifications/slack/slack_test.go rename to pkg/notifications/slack/slack_test.go index 2fd1322f..84e8fc59 100644 --- a/pkg/controller/jenkins/notifications/slack/slack_test.go +++ b/pkg/notifications/slack/slack_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/provider" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/provider" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/notifications/smtp/smtp.go b/pkg/notifications/smtp/smtp.go similarity index 95% rename from pkg/controller/jenkins/notifications/smtp/smtp.go rename to pkg/notifications/smtp/smtp.go index fbc7e4eb..156cc00b 100644 --- a/pkg/controller/jenkins/notifications/smtp/smtp.go +++ b/pkg/notifications/smtp/smtp.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/provider" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/provider" "github.com/pkg/errors" "gopkg.in/gomail.v2" diff --git a/pkg/controller/jenkins/notifications/smtp/smtp_test.go b/pkg/notifications/smtp/smtp_test.go similarity index 97% rename from pkg/controller/jenkins/notifications/smtp/smtp_test.go rename to pkg/notifications/smtp/smtp_test.go index 6f4302d4..2e49123c 100644 --- a/pkg/controller/jenkins/notifications/smtp/smtp_test.go +++ b/pkg/notifications/smtp/smtp_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/event" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/event" + "github.com/jenkinsci/kubernetes-operator/pkg/notifications/reason" "github.com/emersion/go-smtp" "github.com/stretchr/testify/assert" diff --git a/pkg/controller/jenkins/plugins/base_plugins.go b/pkg/plugins/base_plugins.go similarity index 100% rename from pkg/controller/jenkins/plugins/base_plugins.go rename to pkg/plugins/base_plugins.go diff --git a/pkg/controller/jenkins/plugins/plugin.go b/pkg/plugins/plugin.go similarity index 100% rename from pkg/controller/jenkins/plugins/plugin.go rename to pkg/plugins/plugin.go diff --git a/pkg/controller/jenkins/plugins/plugin_test.go b/pkg/plugins/plugin_test.go similarity index 100% rename from pkg/controller/jenkins/plugins/plugin_test.go rename to pkg/plugins/plugin_test.go diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 70ec7b52..f878eece 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -7,11 +7,11 @@ import ( "time" "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/groovy" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/groovy" + "github.com/jenkinsci/kubernetes-operator/pkg/plugins" "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test" diff --git a/test/e2e/jenkins.go b/test/e2e/jenkins.go index 80631d52..7eaabeb2 100644 --- a/test/e2e/jenkins.go +++ b/test/e2e/jenkins.go @@ -5,11 +5,11 @@ import ( "testing" "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" - "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/constants" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/stretchr/testify/require" diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go index 43c5e1af..c1494109 100644 --- a/test/e2e/main_test.go +++ b/test/e2e/main_test.go @@ -6,7 +6,7 @@ import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/operator-framework/operator-sdk/pkg/test/e2eutil" diff --git a/test/e2e/mode_openshift.go b/test/e2e/mode_openshift.go index 11215120..d6aa054d 100644 --- a/test/e2e/mode_openshift.go +++ b/test/e2e/mode_openshift.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" corev1 "k8s.io/api/core/v1" ) diff --git a/test/e2e/mode_openshift_oauth.go b/test/e2e/mode_openshift_oauth.go index 9019853c..a832aed4 100644 --- a/test/e2e/mode_openshift_oauth.go +++ b/test/e2e/mode_openshift_oauth.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" framework "github.com/operator-framework/operator-sdk/pkg/test" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 001611b5..6f36d968 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/stretchr/testify/require" diff --git a/test/e2e/restorebackup_test.go b/test/e2e/restorebackup_test.go index 0eb490c4..0fa269c5 100644 --- a/test/e2e/restorebackup_test.go +++ b/test/e2e/restorebackup_test.go @@ -7,9 +7,9 @@ import ( "github.com/jenkinsci/kubernetes-operator/internal/try" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/stretchr/testify/assert" diff --git a/test/e2e/seedjobs_test.go b/test/e2e/seedjobs_test.go index be48926e..8ac0b11c 100644 --- a/test/e2e/seedjobs_test.go +++ b/test/e2e/seedjobs_test.go @@ -13,9 +13,9 @@ import ( "github.com/jenkinsci/kubernetes-operator/internal/render" "github.com/jenkinsci/kubernetes-operator/internal/try" "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/user/seedjobs" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/user/seedjobs" + "github.com/jenkinsci/kubernetes-operator/pkg/constants" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/stretchr/testify/assert" diff --git a/test/e2e/wait.go b/test/e2e/wait.go index fbf7a673..a1ba2e51 100644 --- a/test/e2e/wait.go +++ b/test/e2e/wait.go @@ -10,8 +10,8 @@ import ( "github.com/jenkinsci/kubernetes-operator/internal/try" "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/resources" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/client" + "github.com/jenkinsci/kubernetes-operator/pkg/configuration/base/resources" "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test"