Skip to content

Commit

Permalink
remove alias
Browse files Browse the repository at this point in the history
Signed-off-by: Pavel Okhlopkov <[email protected]>
  • Loading branch information
Pavel Okhlopkov committed Nov 5, 2024
1 parent 12b75e4 commit 31abc2d
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion pkg/hook/binding_context/binding_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package binding_context
import (
"encoding/json"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
v1 "k8s.io/api/admission/v1"
apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

Expand Down
2 changes: 1 addition & 1 deletion pkg/hook/controller/admission_bindings_controller.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package controller

import (
log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
v1 "k8s.io/api/admission/v1"

. "github.com/flant/shell-operator/pkg/hook/binding_context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/hook/controller/conversion_bindings_controller.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package controller

import (
log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

. "github.com/flant/shell-operator/pkg/hook/binding_context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/hook/task_metadata/task_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package task_metadata
import (
"fmt"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"

"github.com/flant/shell-operator/pkg/hook/binding_context"
"github.com/flant/shell-operator/pkg/hook/types"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kube/object_patch/operation.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package object_patch
import (
"fmt"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
"github.com/hashicorp/go-multierror"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kube/object_patch/patch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"testing"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kube_events_manager/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kube_events_manager/kube_events_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kube_events_manager/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/metric_storage/vault/vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"sync"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
"github.com/prometheus/client_golang/prometheus"

"github.com/flant/shell-operator/pkg/metric"
Expand Down
2 changes: 1 addition & 1 deletion pkg/shell-operator/combine_binding_context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
. "github.com/onsi/gomega"

"github.com/flant/shell-operator/pkg/hook/binding_context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/shell-operator/http_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"time"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"

Expand Down
2 changes: 1 addition & 1 deletion pkg/shell-operator/operator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
. "github.com/onsi/gomega"

. "github.com/flant/shell-operator/pkg/hook/task_metadata"
Expand Down
2 changes: 1 addition & 1 deletion pkg/task/queue/task_queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"

"github.com/flant/shell-operator/pkg/metric_storage"
"github.com/flant/shell-operator/pkg/task"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/file/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path/filepath"
"strings"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
)

// FileExists returns true if path exists
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/file/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/signal/signal.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/signal"
"syscall"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
)

// WaitForProcessInterruption wait for SIGINT or SIGTERM and run a callback function.
Expand Down
2 changes: 1 addition & 1 deletion pkg/webhook/admission/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package admission
import (
"os"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"

klient "github.com/flant/kube-client/client"
"github.com/flant/shell-operator/pkg/webhook/server"
Expand Down
2 changes: 1 addition & 1 deletion pkg/webhook/admission/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"strings"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
v1 "k8s.io/api/admissionregistration/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Expand Down
2 changes: 1 addition & 1 deletion pkg/webhook/conversion/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"os"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

klient "github.com/flant/kube-client/client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/webhook/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"
"time"

log "github.com/deckhouse/deckhouse/pkg/log"
"github.com/deckhouse/deckhouse/pkg/log"
"github.com/go-chi/chi/v5"
)

Expand Down

0 comments on commit 31abc2d

Please sign in to comment.