apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix `go.mod` path of operator (#5287)

Browse Source 
* fix go mod path of operator

* change import path in all operator files
pull/5307/head
Sashank Agarwal 4 years ago committed by GitHub
parent a88ee16534
commit e19c5863ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 122 additions and 122 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      operator/cmd/loki-broker/main.go
  2. 2
      operator/cmd/size-calculator/main.go
  3. 4
      operator/controllers/internal/management/state/state.go
  4. 6
      operator/controllers/internal/management/state/state_test.go
  5. 12
      operator/controllers/lokistack_controller.go
  6. 6
      operator/controllers/lokistack_controller_test.go
  7. 2
      operator/go.mod
  8. 2
      operator/internal/external/k8s/k8sfakes/fake_builder.go
  9. 2
      operator/internal/external/k8s/k8sfakes/fake_client.go
  10. 2
      operator/internal/external/k8s/k8sfakes/fake_status_writer.go
  11. 6
      operator/internal/handlers/internal/gateway/base_domain.go
  12. 2
      operator/internal/handlers/internal/gateway/modes.go
  13. 2
      operator/internal/handlers/internal/gateway/modes_test.go
  14. 6
      operator/internal/handlers/internal/gateway/tenant_configmap.go
  15. 4
      operator/internal/handlers/internal/gateway/tenant_configmap_test.go
  16. 10
      operator/internal/handlers/internal/gateway/tenant_secrets.go
  17. 6
      operator/internal/handlers/internal/gateway/tenant_secrets_test.go
  18. 2
      operator/internal/handlers/internal/secrets/secrets.go
  19. 2
      operator/internal/handlers/internal/secrets/secrets_test.go
  20. 16
      operator/internal/handlers/lokistack_create_or_update.go
  21. 8
      operator/internal/handlers/lokistack_create_or_update_test.go
  22. 4
      operator/internal/manifests/build.go
  23. 4
      operator/internal/manifests/build_test.go
  24. 2
      operator/internal/manifests/compactor.go
  25. 4
      operator/internal/manifests/compactor_test.go
  26. 2
      operator/internal/manifests/config.go
  27. 4
      operator/internal/manifests/config_test.go
  28. 2
      operator/internal/manifests/distributor.go
  29. 4
      operator/internal/manifests/distributor_test.go
  30. 2
      operator/internal/manifests/gateway.go
  31. 6
      operator/internal/manifests/gateway_tenants.go
  32. 6
      operator/internal/manifests/gateway_tenants_test.go
  33. 4
      operator/internal/manifests/gateway_test.go
  34. 2
      operator/internal/manifests/indexgateway.go
  35. 4
      operator/internal/manifests/indexgateway_test.go
  36. 2
      operator/internal/manifests/ingester.go
  37. 4
      operator/internal/manifests/ingester_test.go
  38. 2
      operator/internal/manifests/internal/config/build_test.go
  39. 2
      operator/internal/manifests/internal/config/options.go
  40. 2
      operator/internal/manifests/internal/gateway/build.go
  41. 4
      operator/internal/manifests/internal/gateway/build_test.go
  42. 4
      operator/internal/manifests/internal/gateway/options.go
  43. 2
      operator/internal/manifests/internal/sizes.go
  44. 2
      operator/internal/manifests/mutate_test.go
  45. 2
      operator/internal/manifests/node_placement_test.go
  46. 6
      operator/internal/manifests/options.go
  47. 2
      operator/internal/manifests/querier.go
  48. 4
      operator/internal/manifests/querier_test.go
  49. 2
      operator/internal/manifests/query-frontend.go
  50. 4
      operator/internal/manifests/query-frontend_test.go
  51. 2
      operator/internal/manifests/service_monitor_test.go
  52. 2
      operator/internal/manifests/service_test.go
  53. 2
      operator/internal/manifests/var.go
  54. 4
      operator/internal/metrics/metrics.go
  55. 6
      operator/internal/status/components.go
  56. 6
      operator/internal/status/components_test.go
  57. 4
      operator/internal/status/lokistack.go
  58. 6
      operator/internal/status/lokistack_test.go
  59. 4
      operator/internal/status/status.go
  60. 8
      operator/main.go

4
operator/cmd/loki-broker/main.go
Unescape View File

@ -9,8 +9,8 @@ import (
"strings"
"github.com/ViaQ/logerr/log"
"github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"sigs.k8s.io/yaml"
)

2
operator/cmd/size-calculator/main.go
Unescape View File

@ -6,7 +6,7 @@ import (
"os"
"time"
"github.com/grafana/loki-operator/internal/sizes"
"github.com/grafana/loki/operator/internal/sizes"
"github.com/prometheus/common/model"
"github.com/ViaQ/logerr/log"

4
operator/controllers/internal/management/state/state.go
Unescape View File

@ -5,8 +5,8 @@ import (
"github.com/ViaQ/logerr/kverrors"
"github.com/ViaQ/logerr/log"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s"
apierrors "k8s.io/apimachinery/pkg/api/errors"

6
operator/controllers/internal/management/state/state_test.go
Unescape View File

@ -5,9 +5,9 @@ import (
"testing"
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/controllers/internal/management/state"
"github.com/grafana/loki-operator/internal/external/k8s/k8sfakes"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/controllers/internal/management/state"
"github.com/grafana/loki/operator/internal/external/k8s/k8sfakes"
"github.com/stretchr/testify/require"
apierrors "k8s.io/apimachinery/pkg/api/errors"

12
operator/controllers/lokistack_controller.go
Unescape View File

@ -5,11 +5,11 @@ import (
"time"
"github.com/go-logr/logr"
"github.com/grafana/loki-operator/controllers/internal/management/state"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki-operator/internal/handlers"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki-operator/internal/status"
"github.com/grafana/loki/operator/controllers/internal/management/state"
"github.com/grafana/loki/operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/handlers"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/grafana/loki/operator/internal/status"
routev1 "github.com/openshift/api/route/v1"
appsv1 "k8s.io/api/apps/v1"
@ -24,7 +24,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/predicate"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
)
var (

6
operator/controllers/lokistack_controller_test.go
Unescape View File

@ -7,9 +7,9 @@ import (
"testing"
"github.com/ViaQ/logerr/log"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki/operator/internal/manifests"
routev1 "github.com/openshift/api/route/v1"
"github.com/stretchr/testify/require"

2
operator/go.mod
Unescape View File

@ -1,4 +1,4 @@
module github.com/grafana/loki-operator
module github.com/grafana/loki/operator
go 1.16

2
operator/internal/external/k8s/k8sfakes/fake_builder.go vendored
Unescape View File

@ -5,7 +5,7 @@ import (
"sync"
"github.com/go-logr/logr"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/external/k8s"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"

2
operator/internal/external/k8s/k8sfakes/fake_client.go vendored
Unescape View File

@ -5,7 +5,7 @@ import (
"context"
"sync"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/external/k8s"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"

2
operator/internal/external/k8s/k8sfakes/fake_status_writer.go vendored
Unescape View File

@ -5,7 +5,7 @@ import (
"context"
"sync"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/external/k8s"
"sigs.k8s.io/controller-runtime/pkg/client"
)

6
operator/internal/handlers/internal/gateway/base_domain.go
Unescape View File

@ -4,9 +4,9 @@ import (
"context"
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki-operator/internal/status"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/status"
configv1 "github.com/openshift/api/config/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
ctrl "sigs.k8s.io/controller-runtime"

2
operator/internal/handlers/internal/gateway/modes.go
Unescape View File

@ -2,7 +2,7 @@ package gateway
import (
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
)
// ValidateModes validates the tenants mode specification.

2
operator/internal/handlers/internal/gateway/modes_test.go
Unescape View File

@ -3,7 +3,7 @@ package gateway
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

6
operator/internal/handlers/internal/gateway/tenant_configmap.go
Unescape View File

@ -3,17 +3,17 @@ package gateway
import (
"context"
"github.com/grafana/loki-operator/internal/manifests/openshift"
"github.com/grafana/loki/operator/internal/manifests/openshift"
"github.com/ViaQ/logerr/log"
"github.com/ViaQ/logerr/kverrors"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki/operator/internal/manifests"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/json"
"sigs.k8s.io/yaml"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/external/k8s"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
)

4
operator/internal/handlers/internal/gateway/tenant_configmap_test.go
Unescape View File

@ -4,9 +4,9 @@ import (
"context"
"testing"
"github.com/grafana/loki-operator/internal/manifests/openshift"
"github.com/grafana/loki/operator/internal/manifests/openshift"
"github.com/grafana/loki-operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki/operator/internal/external/k8s/k8sfakes"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

10
operator/internal/handlers/internal/gateway/tenant_secrets.go
Unescape View File

@ -6,11 +6,11 @@ import (
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki-operator/internal/handlers/internal/secrets"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki-operator/internal/status"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/handlers/internal/secrets"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/grafana/loki/operator/internal/status"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

6
operator/internal/handlers/internal/gateway/tenant_secrets_test.go
Unescape View File

@ -6,9 +6,9 @@ import (
"github.com/stretchr/testify/require"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki/operator/internal/manifests"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
operator/internal/handlers/internal/secrets/secrets.go
Unescape View File

@ -2,7 +2,7 @@ package secrets
import (
"github.com/ViaQ/logerr/kverrors"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki/operator/internal/manifests"
corev1 "k8s.io/api/core/v1"
)

2
operator/internal/handlers/internal/secrets/secrets_test.go
Unescape View File

@ -3,7 +3,7 @@ package secrets_test
import (
"testing"
"github.com/grafana/loki-operator/internal/handlers/internal/secrets"
"github.com/grafana/loki/operator/internal/handlers/internal/secrets"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
)

16
operator/internal/handlers/lokistack_create_or_update.go
Unescape View File

@ -5,17 +5,17 @@ import (
"fmt"
"os"
"github.com/grafana/loki-operator/internal/manifests/openshift"
"github.com/grafana/loki/operator/internal/manifests/openshift"
"github.com/ViaQ/logerr/kverrors"
"github.com/ViaQ/logerr/log"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki-operator/internal/handlers/internal/gateway"
"github.com/grafana/loki-operator/internal/handlers/internal/secrets"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki-operator/internal/metrics"
"github.com/grafana/loki-operator/internal/status"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/handlers/internal/gateway"
"github.com/grafana/loki/operator/internal/handlers/internal/secrets"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/grafana/loki/operator/internal/metrics"
"github.com/grafana/loki/operator/internal/status"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"

8
operator/internal/handlers/lokistack_create_or_update_test.go
Unescape View File

@ -9,10 +9,10 @@ import (
"testing"
"github.com/ViaQ/logerr/log"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki-operator/internal/handlers"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki/operator/internal/handlers"
"github.com/grafana/loki/operator/internal/manifests"
routev1 "github.com/openshift/api/route/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

4
operator/internal/manifests/build.go
Unescape View File

@ -2,8 +2,8 @@ package manifests
import (
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/internal"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/internal"
"github.com/imdario/mergo"
"sigs.k8s.io/controller-runtime/pkg/client"

4
operator/internal/manifests/build_test.go
Unescape View File

@ -6,8 +6,8 @@ import (
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/internal"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/internal"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/compactor.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"path"
"github.com/grafana/loki-operator/internal/manifests/internal/config"
"github.com/grafana/loki/operator/internal/manifests/internal/config"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

4
operator/internal/manifests/compactor_test.go
Unescape View File

@ -3,8 +3,8 @@ package manifests_test
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/config.go
Unescape View File

@ -4,7 +4,7 @@ import (
"crypto/sha1"
"fmt"
"github.com/grafana/loki-operator/internal/manifests/internal/config"
"github.com/grafana/loki/operator/internal/manifests/internal/config"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

4
operator/internal/manifests/config_test.go
Unescape View File

@ -6,8 +6,8 @@ import (
"testing"
"github.com/google/uuid"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"

2
operator/internal/manifests/distributor.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"path"
"github.com/grafana/loki-operator/internal/manifests/internal/config"
"github.com/grafana/loki/operator/internal/manifests/internal/config"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

4
operator/internal/manifests/distributor_test.go
Unescape View File

@ -3,8 +3,8 @@ package manifests_test
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/gateway.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/ViaQ/logerr/kverrors"
"github.com/imdario/mergo"
"github.com/grafana/loki-operator/internal/manifests/internal/gateway"
"github.com/grafana/loki/operator/internal/manifests/internal/gateway"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

6
operator/internal/manifests/gateway_tenants.go
Unescape View File

@ -2,9 +2,9 @@ package manifests
import (
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/internal/gateway"
"github.com/grafana/loki-operator/internal/manifests/openshift"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/internal/gateway"
"github.com/grafana/loki/operator/internal/manifests/openshift"
"github.com/imdario/mergo"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"

6
operator/internal/manifests/gateway_tenants_test.go
Unescape View File

@ -6,9 +6,9 @@ import (
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
"github.com/stretchr/testify/require"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/internal/gateway"
"github.com/grafana/loki-operator/internal/manifests/openshift"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/internal/gateway"
"github.com/grafana/loki/operator/internal/manifests/openshift"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

4
operator/internal/manifests/gateway_test.go
Unescape View File

@ -5,8 +5,8 @@ import (
"reflect"
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/openshift"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/openshift"
"github.com/google/uuid"
"github.com/stretchr/testify/require"

2
operator/internal/manifests/indexgateway.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"path"
"github.com/grafana/loki-operator/internal/manifests/internal/config"
"github.com/grafana/loki/operator/internal/manifests/internal/config"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

4
operator/internal/manifests/indexgateway_test.go
Unescape View File

@ -3,8 +3,8 @@ package manifests_test
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/ingester.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"path"
"github.com/grafana/loki-operator/internal/manifests/internal/config"
"github.com/grafana/loki/operator/internal/manifests/internal/config"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

4
operator/internal/manifests/ingester_test.go
Unescape View File

@ -3,8 +3,8 @@ package manifests_test
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/internal/config/build_test.go
Unescape View File

@ -3,7 +3,7 @@ package config
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/internal/config/options.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"math"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
)
// Options is used to render the loki-config.yaml file template

2
operator/internal/manifests/internal/gateway/build.go
Unescape View File

@ -6,7 +6,7 @@ import (
"io/ioutil"
"text/template"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/ViaQ/logerr/kverrors"
)

4
operator/internal/manifests/internal/gateway/build_test.go
Unescape View File

@ -3,8 +3,8 @@ package gateway
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/openshift"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/openshift"
"github.com/stretchr/testify/require"
)

4
operator/internal/manifests/internal/gateway/options.go
Unescape View File

@ -1,8 +1,8 @@
package gateway
import (
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/openshift"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/openshift"
)
// Options is used to render the rbac.yaml and tenants.yaml file template

2
operator/internal/manifests/internal/sizes.go
Unescape View File

@ -1,7 +1,7 @@
package internal
import (
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
)

2
operator/internal/manifests/mutate_test.go
Unescape View File

@ -6,7 +6,7 @@ import (
routev1 "github.com/openshift/api/route/v1"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/require"
appsv1 "k8s.io/api/apps/v1"

2
operator/internal/manifests/node_placement_test.go
Unescape View File

@ -3,7 +3,7 @@ package manifests
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
)

6
operator/internal/manifests/options.go
Unescape View File

@ -1,9 +1,9 @@
package manifests
import (
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests/internal"
"github.com/grafana/loki-operator/internal/manifests/openshift"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests/internal"
"github.com/grafana/loki/operator/internal/manifests/openshift"
)
// Options is a set of configuration values to use when building manifests such as resource sizes, etc.

2
operator/internal/manifests/querier.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"path"
"github.com/grafana/loki-operator/internal/manifests/internal/config"
"github.com/grafana/loki/operator/internal/manifests/internal/config"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

4
operator/internal/manifests/querier_test.go
Unescape View File

@ -3,8 +3,8 @@ package manifests_test
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/query-frontend.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"path"
"github.com/grafana/loki-operator/internal/manifests/internal/config"
"github.com/grafana/loki/operator/internal/manifests/internal/config"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

4
operator/internal/manifests/query-frontend_test.go
Unescape View File

@ -3,8 +3,8 @@ package manifests_test
import (
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/stretchr/testify/require"
)

2
operator/internal/manifests/service_monitor_test.go
Unescape View File

@ -6,7 +6,7 @@ import (
corev1 "k8s.io/api/core/v1"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

2
operator/internal/manifests/service_test.go
Unescape View File

@ -4,7 +4,7 @@ import (
"fmt"
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

2
operator/internal/manifests/var.go
Unescape View File

@ -3,7 +3,7 @@ package manifests
import (
"fmt"
"github.com/grafana/loki-operator/internal/manifests/openshift"
"github.com/grafana/loki/operator/internal/manifests/openshift"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"

4
operator/internal/metrics/metrics.go
Unescape View File

@ -6,8 +6,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"sigs.k8s.io/controller-runtime/pkg/metrics"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/manifests"
)
// UserDefinedLimitsType defines a label that describes the type of limits

6
operator/internal/status/components.go
Unescape View File

@ -4,9 +4,9 @@ import (
"context"
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s"
"github.com/grafana/loki-operator/internal/manifests"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s"
"github.com/grafana/loki/operator/internal/manifests"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

6
operator/internal/status/components_test.go
Unescape View File

@ -4,9 +4,9 @@ import (
"context"
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki-operator/internal/status"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki/operator/internal/status"
"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"

4
operator/internal/status/lokistack.go
Unescape View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

6
operator/internal/status/lokistack_test.go
Unescape View File

@ -4,9 +4,9 @@ import (
"context"
"testing"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki-operator/internal/status"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s/k8sfakes"
"github.com/grafana/loki/operator/internal/status"
"github.com/stretchr/testify/require"

4
operator/internal/status/status.go
Unescape View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/ViaQ/logerr/kverrors"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/internal/external/k8s"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/internal/external/k8s"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

8
operator/main.go
Unescape View File

@ -11,10 +11,10 @@ import (
// to ensure that exec-entrypoint and run can make use of them.
_ "k8s.io/client-go/plugin/pkg/client/auth"
lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1"
"github.com/grafana/loki-operator/controllers"
"github.com/grafana/loki-operator/internal/manifests"
"github.com/grafana/loki-operator/internal/metrics"
lokiv1beta1 "github.com/grafana/loki/operator/api/v1beta1"
"github.com/grafana/loki/operator/controllers"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/grafana/loki/operator/internal/metrics"
configv1 "github.com/openshift/api/config/v1"
routev1 "github.com/openshift/api/route/v1"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"

Write Preview
Loading…
Cancel
Save