From ee79b2fadc5b1d9bc8fa76e1332767219b3484d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Mon, 11 Feb 2019 21:10:52 +0100 Subject: [PATCH] Rename VirtusLab/jenkins-operator to jenkinsci/kubernetes-operator in *.go --- cmd/manager/main.go | 10 +++++----- pkg/apis/addtoscheme_virtuslab_v1alpha1.go | 2 +- pkg/controller/jenkins/backup/aws/s3.go | 10 +++++----- pkg/controller/jenkins/backup/aws/s3_test.go | 4 ++-- pkg/controller/jenkins/backup/backup.go | 16 ++++++++-------- .../jenkins/backup/nobackup/nobackup.go | 4 ++-- .../jenkins/configuration/base/reconcile.go | 16 ++++++++-------- .../jenkins/configuration/base/reconcile_test.go | 4 ++-- .../base/resources/backup_credentials_secret.go | 4 ++-- .../resources/base_configuration_configmap.go | 4 ++-- .../resources/init_configuration_configmap.go | 4 ++-- .../jenkins/configuration/base/resources/meta.go | 4 ++-- .../resources/operator_credentials_secret.go | 4 ++-- .../jenkins/configuration/base/resources/pod.go | 2 +- .../base/resources/scripts_configmap.go | 4 ++-- .../resources/user_configuration_configmap.go | 4 ++-- .../jenkins/configuration/base/validate.go | 10 +++++----- .../jenkins/configuration/base/validate_test.go | 2 +- .../jenkins/configuration/user/reconcile.go | 16 ++++++++-------- .../configuration/user/seedjobs/seedjobs.go | 10 +++++----- .../configuration/user/seedjobs/seedjobs_test.go | 4 ++-- .../jenkins/configuration/user/validate.go | 6 +++--- .../jenkins/configuration/user/validate_test.go | 2 +- pkg/controller/jenkins/groovy/groovy.go | 6 +++--- pkg/controller/jenkins/handler.go | 2 +- pkg/controller/jenkins/jenkins_controller.go | 14 +++++++------- pkg/controller/jenkins/jobs/jobs.go | 6 +++--- pkg/controller/jenkins/jobs/jobs_test.go | 4 ++-- pkg/controller/jenkins/plugins/plugin.go | 2 +- pkg/controller/jenkins/plugins/plugin_test.go | 2 +- pkg/event/event.go | 2 +- test/e2e/aws_s3_backup_test.go | 6 +++--- test/e2e/base_configuration_test.go | 4 ++-- test/e2e/jenkins.go | 6 +++--- test/e2e/main_test.go | 6 +++--- test/e2e/restart_pod_test.go | 2 +- test/e2e/user_configuration_test.go | 4 ++-- test/e2e/wait.go | 4 ++-- 38 files changed, 108 insertions(+), 108 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 99ec5844..8cf7faeb 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -7,11 +7,11 @@ import ( "os" "runtime" - "github.com/VirtusLab/jenkins-operator/pkg/apis" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins" - "github.com/VirtusLab/jenkins-operator/pkg/event" - "github.com/VirtusLab/jenkins-operator/pkg/log" - "github.com/VirtusLab/jenkins-operator/version" + "github.com/jenkinsci/kubernetes-operator/pkg/apis" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins" + "github.com/jenkinsci/kubernetes-operator/pkg/event" + "github.com/jenkinsci/kubernetes-operator/pkg/log" + "github.com/jenkinsci/kubernetes-operator/version" "github.com/operator-framework/operator-sdk/pkg/k8sutil" "github.com/operator-framework/operator-sdk/pkg/leader" diff --git a/pkg/apis/addtoscheme_virtuslab_v1alpha1.go b/pkg/apis/addtoscheme_virtuslab_v1alpha1.go index 2bd42c32..3485aaac 100644 --- a/pkg/apis/addtoscheme_virtuslab_v1alpha1.go +++ b/pkg/apis/addtoscheme_virtuslab_v1alpha1.go @@ -1,7 +1,7 @@ package apis import ( - "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" ) func init() { diff --git a/pkg/controller/jenkins/backup/aws/s3.go b/pkg/controller/jenkins/backup/aws/s3.go index 9c55469f..619c2012 100644 --- a/pkg/controller/jenkins/backup/aws/s3.go +++ b/pkg/controller/jenkins/backup/aws/s3.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - 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/constants" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" - "github.com/VirtusLab/jenkins-operator/pkg/log" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "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/log" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/backup/aws/s3_test.go b/pkg/controller/jenkins/backup/aws/s3_test.go index 96d35dab..64104b77 100644 --- a/pkg/controller/jenkins/backup/aws/s3_test.go +++ b/pkg/controller/jenkins/backup/aws/s3_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/backup/backup.go b/pkg/controller/jenkins/backup/backup.go index 71931b51..00caf376 100644 --- a/pkg/controller/jenkins/backup/backup.go +++ b/pkg/controller/jenkins/backup/backup.go @@ -5,14 +5,14 @@ import ( "fmt" "time" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/backup/aws" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/backup/nobackup" - jenkinsclient "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" - "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/jobs" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/backup/aws" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/backup/nobackup" + 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/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/jobs" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" "github.com/go-logr/logr" "github.com/pkg/errors" diff --git a/pkg/controller/jenkins/backup/nobackup/nobackup.go b/pkg/controller/jenkins/backup/nobackup/nobackup.go index 04f2eee3..ded47c5b 100644 --- a/pkg/controller/jenkins/backup/nobackup/nobackup.go +++ b/pkg/controller/jenkins/backup/nobackup/nobackup.go @@ -1,8 +1,8 @@ package nobackup import ( - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" "github.com/go-logr/logr" k8s "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index 95ec1470..4227ee10 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -6,14 +6,14 @@ import ( "reflect" "time" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/backup" - jenkinsclient "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" - "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/groovy" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" - "github.com/VirtusLab/jenkins-operator/pkg/log" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/backup" + 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/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" + "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/bndr/gojenkins" "github.com/go-logr/logr" diff --git a/pkg/controller/jenkins/configuration/base/reconcile_test.go b/pkg/controller/jenkins/configuration/base/reconcile_test.go index 20854cae..a5e46dd5 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile_test.go +++ b/pkg/controller/jenkins/configuration/base/reconcile_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" "github.com/stretchr/testify/assert" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/controller/jenkins/configuration/base/resources/backup_credentials_secret.go b/pkg/controller/jenkins/configuration/base/resources/backup_credentials_secret.go index ea9e3ac3..70cf707a 100644 --- a/pkg/controller/jenkins/configuration/base/resources/backup_credentials_secret.go +++ b/pkg/controller/jenkins/configuration/base/resources/backup_credentials_secret.go @@ -3,8 +3,8 @@ package resources import ( "fmt" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go index 823e853a..36e85021 100644 --- a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go @@ -3,8 +3,8 @@ package resources import ( "fmt" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go index 1b04f1d3..8d5dff0f 100644 --- a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go @@ -2,10 +2,10 @@ package resources import ( "fmt" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" "text/template" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" 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/controller/jenkins/configuration/base/resources/meta.go index 27f1003d..b7fd4b17 100644 --- a/pkg/controller/jenkins/configuration/base/resources/meta.go +++ b/pkg/controller/jenkins/configuration/base/resources/meta.go @@ -3,8 +3,8 @@ package resources import ( "fmt" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go b/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go index 00e7091e..895d9367 100644 --- a/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go +++ b/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go @@ -2,9 +2,9 @@ package resources import ( "fmt" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" 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/controller/jenkins/configuration/base/resources/pod.go index c1dc3078..9b544ab5 100644 --- a/pkg/controller/jenkins/configuration/base/resources/pod.go +++ b/pkg/controller/jenkins/configuration/base/resources/pod.go @@ -2,7 +2,7 @@ package resources import ( "fmt" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go index 7b1f969c..5e1ae545 100644 --- a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go @@ -4,8 +4,8 @@ import ( "fmt" "text/template" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go index 5b346bfe..2e66a0ce 100644 --- a/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go @@ -3,8 +3,8 @@ package resources import ( "fmt" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/validate.go b/pkg/controller/jenkins/configuration/base/validate.go index ce63cddd..a1a60c7d 100644 --- a/pkg/controller/jenkins/configuration/base/validate.go +++ b/pkg/controller/jenkins/configuration/base/validate.go @@ -5,11 +5,11 @@ import ( "fmt" "regexp" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/backup" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" - "github.com/VirtusLab/jenkins-operator/pkg/log" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/backup" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" + "github.com/jenkinsci/kubernetes-operator/pkg/log" docker "github.com/docker/distribution/reference" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/controller/jenkins/configuration/base/validate_test.go index 51602680..7243b53e 100644 --- a/pkg/controller/jenkins/configuration/base/validate_test.go +++ b/pkg/controller/jenkins/configuration/base/validate_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/user/reconcile.go b/pkg/controller/jenkins/configuration/user/reconcile.go index fa7bcf1b..22b3b759 100644 --- a/pkg/controller/jenkins/configuration/user/reconcile.go +++ b/pkg/controller/jenkins/configuration/user/reconcile.go @@ -4,14 +4,14 @@ import ( "context" "time" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/backup" - jenkinsclient "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/user/seedjobs" - "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/jobs" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/backup" + 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/configuration/user/seedjobs" + "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/jobs" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go index 57df4202..9511ae02 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go @@ -6,11 +6,11 @@ import ( "encoding/base64" "fmt" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - jenkinsclient "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/jobs" - "github.com/VirtusLab/jenkins-operator/pkg/log" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/jobs" + "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/go-logr/logr" "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go index e266edb3..a35bac93 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/bndr/gojenkins" "github.com/golang/mock/gomock" diff --git a/pkg/controller/jenkins/configuration/user/validate.go b/pkg/controller/jenkins/configuration/user/validate.go index 2083d18a..f734f606 100644 --- a/pkg/controller/jenkins/configuration/user/validate.go +++ b/pkg/controller/jenkins/configuration/user/validate.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/backup" - "github.com/VirtusLab/jenkins-operator/pkg/log" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/backup" + "github.com/jenkinsci/kubernetes-operator/pkg/log" "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/jenkins/configuration/user/validate_test.go b/pkg/controller/jenkins/configuration/user/validate_test.go index 97bce2f4..703f6f6d 100644 --- a/pkg/controller/jenkins/configuration/user/validate_test.go +++ b/pkg/controller/jenkins/configuration/user/validate_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/groovy/groovy.go b/pkg/controller/jenkins/groovy/groovy.go index 638daa26..7de1478c 100644 --- a/pkg/controller/jenkins/groovy/groovy.go +++ b/pkg/controller/jenkins/groovy/groovy.go @@ -6,9 +6,9 @@ import ( "fmt" "sort" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - jenkinsclient "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/jobs" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/jobs" "github.com/go-logr/logr" k8s "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/jenkins/handler.go b/pkg/controller/jenkins/handler.go index 5b52de5e..11361ef6 100644 --- a/pkg/controller/jenkins/handler.go +++ b/pkg/controller/jenkins/handler.go @@ -1,7 +1,7 @@ package jenkins import ( - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go index 9fab9fa7..6d2b5ae6 100644 --- a/pkg/controller/jenkins/jenkins_controller.go +++ b/pkg/controller/jenkins/jenkins_controller.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "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/constants" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" - "github.com/VirtusLab/jenkins-operator/pkg/event" - "github.com/VirtusLab/jenkins-operator/pkg/log" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base" + "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/plugins" + "github.com/jenkinsci/kubernetes-operator/pkg/event" + "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/jobs/jobs.go b/pkg/controller/jenkins/jobs/jobs.go index c25678cd..b29ca7cf 100644 --- a/pkg/controller/jenkins/jobs/jobs.go +++ b/pkg/controller/jenkins/jobs/jobs.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" - "github.com/VirtusLab/jenkins-operator/pkg/log" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" + "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/jobs/jobs_test.go b/pkg/controller/jenkins/jobs/jobs_test.go index 3b2646f0..c903c9bc 100644 --- a/pkg/controller/jenkins/jobs/jobs_test.go +++ b/pkg/controller/jenkins/jobs/jobs_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/bndr/gojenkins" "github.com/golang/mock/gomock" diff --git a/pkg/controller/jenkins/plugins/plugin.go b/pkg/controller/jenkins/plugins/plugin.go index 6033de07..45694ec7 100644 --- a/pkg/controller/jenkins/plugins/plugin.go +++ b/pkg/controller/jenkins/plugins/plugin.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/VirtusLab/jenkins-operator/pkg/log" + "github.com/jenkinsci/kubernetes-operator/pkg/log" ) // Plugin represents jenkins plugin diff --git a/pkg/controller/jenkins/plugins/plugin_test.go b/pkg/controller/jenkins/plugins/plugin_test.go index 12805248..c588f136 100644 --- a/pkg/controller/jenkins/plugins/plugin_test.go +++ b/pkg/controller/jenkins/plugins/plugin_test.go @@ -2,7 +2,7 @@ package plugins import ( "fmt" - "github.com/VirtusLab/jenkins-operator/pkg/log" + "github.com/jenkinsci/kubernetes-operator/pkg/log" "testing" "github.com/stretchr/testify/assert" diff --git a/pkg/event/event.go b/pkg/event/event.go index 614e053f..768890fc 100644 --- a/pkg/event/event.go +++ b/pkg/event/event.go @@ -3,7 +3,7 @@ package event import ( "fmt" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/test/e2e/aws_s3_backup_test.go b/test/e2e/aws_s3_backup_test.go index 1fab28d1..54dc7963 100644 --- a/test/e2e/aws_s3_backup_test.go +++ b/test/e2e/aws_s3_backup_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - 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/constants" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" diff --git a/test/e2e/base_configuration_test.go b/test/e2e/base_configuration_test.go index 38b42585..48ebd90b 100644 --- a/test/e2e/base_configuration_test.go +++ b/test/e2e/base_configuration_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/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 4baf3c53..0b1216ed 100644 --- a/test/e2e/jenkins.go +++ b/test/e2e/jenkins.go @@ -6,9 +6,9 @@ import ( "net/http" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - jenkinsclient "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/client" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test" diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go index 361ffcfd..cea1d238 100644 --- a/test/e2e/main_test.go +++ b/test/e2e/main_test.go @@ -4,9 +4,9 @@ import ( "flag" "testing" - "github.com/VirtusLab/jenkins-operator/pkg/apis" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" + "github.com/jenkinsci/kubernetes-operator/pkg/apis" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" f "github.com/operator-framework/operator-sdk/pkg/test" framework "github.com/operator-framework/operator-sdk/pkg/test" diff --git a/test/e2e/restart_pod_test.go b/test/e2e/restart_pod_test.go index 41c043c4..2114d7ee 100644 --- a/test/e2e/restart_pod_test.go +++ b/test/e2e/restart_pod_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" framework "github.com/operator-framework/operator-sdk/pkg/test" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/user_configuration_test.go b/test/e2e/user_configuration_test.go index 95207e91..067c2182 100644 --- a/test/e2e/user_configuration_test.go +++ b/test/e2e/user_configuration_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/user/seedjobs" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user/seedjobs" "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test" diff --git a/test/e2e/wait.go b/test/e2e/wait.go index 7123204e..5f6759ac 100644 --- a/test/e2e/wait.go +++ b/test/e2e/wait.go @@ -6,8 +6,8 @@ import ( "testing" "time" - virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources" + virtuslabv1alpha1 "github.com/jenkinsci/kubernetes-operator/pkg/apis/virtuslab/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" framework "github.com/operator-framework/operator-sdk/pkg/test" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"