Skip to content

Commit

Permalink
Update Sirupsen to sirupsen
Browse files Browse the repository at this point in the history
  • Loading branch information
yasker committed Mar 8, 2019
1 parent 10e5282 commit c8e3f94
Show file tree
Hide file tree
Showing 80 changed files with 526 additions and 414 deletions.
2 changes: 1 addition & 1 deletion api/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package api
import (
"net/http"

"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/pkg/errors"
"github.com/rancher/go-rancher/api"
"github.com/sirupsen/logrus"
)

func (s *Server) BackupVolumeList(w http.ResponseWriter, req *http.Request) error {
Expand Down
2 changes: 1 addition & 1 deletion api/forwarder.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net/http"
"net/http/httputil"

"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-manager/manager"
)
Expand Down
2 changes: 1 addition & 1 deletion api/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"strconv"

"github.com/Sirupsen/logrus"
"github.com/rancher/go-rancher/api"
"github.com/rancher/go-rancher/client"
"github.com/sirupsen/logrus"

"k8s.io/api/core/v1"

Expand Down
2 changes: 1 addition & 1 deletion api/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"net/http"
"time"

"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/pkg/errors"
"github.com/rancher/go-rancher/api"
"github.com/rancher/go-rancher/client"
"github.com/sirupsen/logrus"

apierrors "k8s.io/apimachinery/pkg/api/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion api/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strconv"
"time"

"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
"github.com/rancher/go-rancher/api"
"github.com/rancher/go-rancher/client"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-manager/controller"
)
Expand Down
2 changes: 1 addition & 1 deletion app/csi.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app

import (
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-manager/csi"
Expand Down
2 changes: 1 addition & 1 deletion app/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"net/http"
"os"

"github.com/Sirupsen/logrus"
"github.com/rancher/go-iscsi-helper/iscsi"
iscsi_util "github.com/rancher/go-iscsi-helper/util"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-manager/api"
Expand Down
2 changes: 1 addition & 1 deletion app/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

pvController "github.com/kubernetes-incubator/external-storage/lib/controller"
Expand Down
2 changes: 1 addition & 1 deletion app/driver_flexvolume.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion app/post_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion app/uninstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package app
import (
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion app/volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sort"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion controller/controller_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion controller/engine_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controller/engine_image_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"reflect"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

appsv1beta2 "k8s.io/api/apps/v1beta2"
"k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion controller/instance_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controller/node_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controller/provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strconv"

"github.com/Sirupsen/logrus"
pvController "github.com/kubernetes-incubator/external-storage/lib/controller"
"github.com/sirupsen/logrus"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion controller/replica_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controller/setting_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"net/http"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion controller/uninstall_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/controller"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/time/rate"

longhorn "github.com/rancher/longhorn-manager/k8s/pkg/apis/longhorn/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion controller/volume_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion controller/websocket_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package controller
import (
"sync"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/controller"
Expand Down
2 changes: 1 addition & 1 deletion csi/controller_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"time"

"github.com/Sirupsen/logrus"
csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
csicommon "github.com/kubernetes-csi/drivers/pkg/csi-common"
"github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
volumeutil "k8s.io/kubernetes/pkg/volume/util"
Expand Down
2 changes: 1 addition & 1 deletion csi/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package csi
import (
"sync"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2"
"k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion csi/deployment_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2"
Expand Down
2 changes: 1 addition & 1 deletion csi/manager.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package csi

import (
"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
csicommon "github.com/kubernetes-csi/drivers/pkg/csi-common"
Expand Down
2 changes: 1 addition & 1 deletion csi/node_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/Sirupsen/logrus"
csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
csicommon "github.com/kubernetes-csi/drivers/pkg/csi-common"
"github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"k8s.io/kubernetes/pkg/util/mount"
Expand Down
2 changes: 1 addition & 1 deletion engineapi/backups.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"path/filepath"
"strings"

"github.com/Sirupsen/logrus"
"github.com/mitchellh/mapstructure"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/backupstore"
"github.com/rancher/longhorn-manager/types"
Expand Down
2 changes: 1 addition & 1 deletion engineapi/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-manager/types"
"github.com/rancher/longhorn-manager/util"
Expand Down
2 changes: 1 addition & 1 deletion engineapi/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-manager/util"
)
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-manager/app"
Expand Down
2 changes: 1 addition & 1 deletion manager/engineimage.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Expand Down
2 changes: 1 addition & 1 deletion manager/misc.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"path/filepath"
"reflect"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"

"k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion manager/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package manager
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/rancher/longhorn-manager/types"
"github.com/rancher/longhorn-manager/util"
"github.com/sirupsen/logrus"

longhorn "github.com/rancher/longhorn-manager/k8s/pkg/apis/longhorn/v1alpha1"
)
Expand Down
2 changes: 1 addition & 1 deletion manager/volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"reflect"
"sort"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Expand Down
2 changes: 1 addition & 1 deletion scheduler/replica_scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"path/filepath"

"github.com/Sirupsen/logrus"
"github.com/rancher/longhorn-manager/datastore"
"github.com/rancher/longhorn-manager/types"
"github.com/rancher/longhorn-manager/util"
"github.com/sirupsen/logrus"

longhorn "github.com/rancher/longhorn-manager/k8s/pkg/apis/longhorn/v1alpha1"
)
Expand Down
2 changes: 1 addition & 1 deletion util/daemon/daemon.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package daemon

import (
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"os"
"os/signal"
"syscall"
Expand Down
Loading

0 comments on commit c8e3f94

Please sign in to comment.