From 4feee18825d8bbc486fa19cdf5df2cda4dd348b3 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 16 Dec 2021 15:42:47 +0100 Subject: [PATCH] Remove ViaQ from source code and manifests --- operator/PROJECT | 4 ++-- operator/cmd/loki-broker/main.go | 4 ++-- operator/cmd/size-calculator/main.go | 2 +- .../internal/management/state/state.go | 4 ++-- .../internal/management/state/state_test.go | 6 +++--- operator/controllers/lokistack_controller.go | 12 ++++++------ .../controllers/lokistack_controller_test.go | 6 +++--- operator/go.mod | 2 +- .../external/k8s/k8sfakes/fake_builder.go | 2 +- .../external/k8s/k8sfakes/fake_client.go | 2 +- .../external/k8s/k8sfakes/fake_status_writer.go | 2 +- .../handlers/internal/gateway/base_domain.go | 6 +++--- .../internal/handlers/internal/gateway/modes.go | 2 +- .../handlers/internal/gateway/modes_test.go | 2 +- .../internal/gateway/tenant_configmap.go | 6 +++--- .../internal/gateway/tenant_configmap_test.go | 4 ++-- .../handlers/internal/gateway/tenant_secrets.go | 10 +++++----- .../internal/gateway/tenant_secrets_test.go | 6 +++--- .../handlers/internal/secrets/secrets.go | 2 +- .../handlers/internal/secrets/secrets_test.go | 2 +- .../handlers/lokistack_create_or_update.go | 16 ++++++++-------- .../handlers/lokistack_create_or_update_test.go | 8 ++++---- operator/internal/manifests/build.go | 4 ++-- operator/internal/manifests/build_test.go | 4 ++-- operator/internal/manifests/compactor.go | 2 +- operator/internal/manifests/compactor_test.go | 4 ++-- operator/internal/manifests/config.go | 2 +- operator/internal/manifests/config_test.go | 4 ++-- operator/internal/manifests/distributor.go | 2 +- operator/internal/manifests/distributor_test.go | 4 ++-- operator/internal/manifests/gateway.go | 2 +- operator/internal/manifests/gateway_tenants.go | 6 +++--- .../internal/manifests/gateway_tenants_test.go | 6 +++--- operator/internal/manifests/gateway_test.go | 4 ++-- operator/internal/manifests/indexgateway.go | 2 +- operator/internal/manifests/indexgateway_test.go | 4 ++-- operator/internal/manifests/ingester.go | 2 +- operator/internal/manifests/ingester_test.go | 4 ++-- .../manifests/internal/config/build_test.go | 2 +- .../manifests/internal/config/options.go | 2 +- .../internal/manifests/internal/gateway/build.go | 2 +- .../manifests/internal/gateway/build_test.go | 4 ++-- .../manifests/internal/gateway/options.go | 4 ++-- operator/internal/manifests/internal/sizes.go | 2 +- operator/internal/manifests/mutate_test.go | 2 +- .../internal/manifests/node_placement_test.go | 2 +- operator/internal/manifests/options.go | 6 +++--- operator/internal/manifests/querier.go | 2 +- operator/internal/manifests/querier_test.go | 4 ++-- operator/internal/manifests/query-frontend.go | 2 +- .../internal/manifests/query-frontend_test.go | 4 ++-- .../internal/manifests/service_monitor_test.go | 2 +- operator/internal/manifests/service_test.go | 2 +- operator/internal/manifests/var.go | 2 +- operator/internal/metrics/metrics.go | 4 ++-- operator/internal/status/components.go | 6 +++--- operator/internal/status/components_test.go | 6 +++--- operator/internal/status/lokistack.go | 4 ++-- operator/internal/status/lokistack_test.go | 6 +++--- operator/internal/status/status.go | 4 ++-- operator/main.go | 8 ++++---- 61 files changed, 124 insertions(+), 124 deletions(-) diff --git a/operator/PROJECT b/operator/PROJECT index 3225ac1fa7..b65b5a6204 100644 --- a/operator/PROJECT +++ b/operator/PROJECT @@ -5,7 +5,7 @@ plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} projectName: loki-operator -repo: github.com/ViaQ/loki-operator +repo: github.com/grafana/loki resources: - api: crdVersion: v1beta1 @@ -14,6 +14,6 @@ resources: domain: openshift.io group: loki kind: LokiStack - path: github.com/ViaQ/loki-operator/api/v1beta1 + path: github.com/grafana/loki-operator/api/v1beta1 version: v1beta1 version: "3" diff --git a/operator/cmd/loki-broker/main.go b/operator/cmd/loki-broker/main.go index 9ac300eb49..572de10cac 100644 --- a/operator/cmd/loki-broker/main.go +++ b/operator/cmd/loki-broker/main.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/ViaQ/logerr/log" - "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" + "github.com/grafana/loki-operator/api/v1beta1" + "github.com/grafana/loki-operator/internal/manifests" "sigs.k8s.io/yaml" ) diff --git a/operator/cmd/size-calculator/main.go b/operator/cmd/size-calculator/main.go index d3ac35b77e..ccac06c3c2 100755 --- a/operator/cmd/size-calculator/main.go +++ b/operator/cmd/size-calculator/main.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/ViaQ/loki-operator/internal/sizes" + "github.com/grafana/loki-operator/internal/sizes" "github.com/prometheus/common/model" "github.com/ViaQ/logerr/log" diff --git a/operator/controllers/internal/management/state/state.go b/operator/controllers/internal/management/state/state.go index c9d3127a87..8f6f65b8a8 100644 --- a/operator/controllers/internal/management/state/state.go +++ b/operator/controllers/internal/management/state/state.go @@ -5,8 +5,8 @@ import ( "github.com/ViaQ/logerr/kverrors" "github.com/ViaQ/logerr/log" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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" diff --git a/operator/controllers/internal/management/state/state_test.go b/operator/controllers/internal/management/state/state_test.go index b097d62ac2..30f554a356 100644 --- a/operator/controllers/internal/management/state/state_test.go +++ b/operator/controllers/internal/management/state/state_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/controllers/internal/management/state" - "github.com/ViaQ/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" diff --git a/operator/controllers/lokistack_controller.go b/operator/controllers/lokistack_controller.go index b0b4e5d1f0..61569d3d8a 100644 --- a/operator/controllers/lokistack_controller.go +++ b/operator/controllers/lokistack_controller.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/ViaQ/loki-operator/controllers/internal/management/state" - "github.com/ViaQ/loki-operator/internal/external/k8s" - "github.com/ViaQ/loki-operator/internal/handlers" - "github.com/ViaQ/loki-operator/internal/manifests" - "github.com/ViaQ/loki-operator/internal/status" "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" 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/ViaQ/loki-operator/api/v1beta1" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" ) var ( diff --git a/operator/controllers/lokistack_controller_test.go b/operator/controllers/lokistack_controller_test.go index 1d279ba369..162d090a16 100644 --- a/operator/controllers/lokistack_controller_test.go +++ b/operator/controllers/lokistack_controller_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/ViaQ/logerr/log" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s/k8sfakes" - "github.com/ViaQ/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" diff --git a/operator/go.mod b/operator/go.mod index 88f49b265b..eecbbd6915 100644 --- a/operator/go.mod +++ b/operator/go.mod @@ -1,4 +1,4 @@ -module github.com/ViaQ/loki-operator +module github.com/grafana/loki-operator go 1.16 diff --git a/operator/internal/external/k8s/k8sfakes/fake_builder.go b/operator/internal/external/k8s/k8sfakes/fake_builder.go index 12d53cd3ad..19b6b751ae 100644 --- a/operator/internal/external/k8s/k8sfakes/fake_builder.go +++ b/operator/internal/external/k8s/k8sfakes/fake_builder.go @@ -4,7 +4,7 @@ package k8sfakes import ( "sync" - "github.com/ViaQ/loki-operator/internal/external/k8s" + "github.com/grafana/loki-operator/internal/external/k8s" "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operator/internal/external/k8s/k8sfakes/fake_client.go b/operator/internal/external/k8s/k8sfakes/fake_client.go index cf7646414f..bdf4050d10 100644 --- a/operator/internal/external/k8s/k8sfakes/fake_client.go +++ b/operator/internal/external/k8s/k8sfakes/fake_client.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ViaQ/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" diff --git a/operator/internal/external/k8s/k8sfakes/fake_status_writer.go b/operator/internal/external/k8s/k8sfakes/fake_status_writer.go index df6aec2092..e564a41c47 100644 --- a/operator/internal/external/k8s/k8sfakes/fake_status_writer.go +++ b/operator/internal/external/k8s/k8sfakes/fake_status_writer.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ViaQ/loki-operator/internal/external/k8s" + "github.com/grafana/loki-operator/internal/external/k8s" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/internal/handlers/internal/gateway/base_domain.go b/operator/internal/handlers/internal/gateway/base_domain.go index 0095bd0294..f029017427 100644 --- a/operator/internal/handlers/internal/gateway/base_domain.go +++ b/operator/internal/handlers/internal/gateway/base_domain.go @@ -4,9 +4,9 @@ import ( "context" "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s" - "github.com/ViaQ/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" diff --git a/operator/internal/handlers/internal/gateway/modes.go b/operator/internal/handlers/internal/gateway/modes.go index 64ab940027..432f182dc4 100644 --- a/operator/internal/handlers/internal/gateway/modes.go +++ b/operator/internal/handlers/internal/gateway/modes.go @@ -2,7 +2,7 @@ package gateway import ( "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" ) // ValidateModes validates the tenants mode specification. diff --git a/operator/internal/handlers/internal/gateway/modes_test.go b/operator/internal/handlers/internal/gateway/modes_test.go index c36bbdc715..8dd0353f2e 100644 --- a/operator/internal/handlers/internal/gateway/modes_test.go +++ b/operator/internal/handlers/internal/gateway/modes_test.go @@ -3,7 +3,7 @@ package gateway import ( "testing" - lokiv1beta1 "github.com/ViaQ/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" ) diff --git a/operator/internal/handlers/internal/gateway/tenant_configmap.go b/operator/internal/handlers/internal/gateway/tenant_configmap.go index 58b3cf453f..b4ea2ad5bf 100644 --- a/operator/internal/handlers/internal/gateway/tenant_configmap.go +++ b/operator/internal/handlers/internal/gateway/tenant_configmap.go @@ -3,17 +3,17 @@ package gateway import ( "context" - "github.com/ViaQ/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/ViaQ/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/ViaQ/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" ) diff --git a/operator/internal/handlers/internal/gateway/tenant_configmap_test.go b/operator/internal/handlers/internal/gateway/tenant_configmap_test.go index b2f02e8be0..208b58ca17 100644 --- a/operator/internal/handlers/internal/gateway/tenant_configmap_test.go +++ b/operator/internal/handlers/internal/gateway/tenant_configmap_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/ViaQ/loki-operator/internal/manifests/openshift" + "github.com/grafana/loki-operator/internal/manifests/openshift" - "github.com/ViaQ/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" diff --git a/operator/internal/handlers/internal/gateway/tenant_secrets.go b/operator/internal/handlers/internal/gateway/tenant_secrets.go index 5ea5b930f0..15ab69fbcf 100644 --- a/operator/internal/handlers/internal/gateway/tenant_secrets.go +++ b/operator/internal/handlers/internal/gateway/tenant_secrets.go @@ -6,11 +6,11 @@ import ( "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s" - "github.com/ViaQ/loki-operator/internal/handlers/internal/secrets" - "github.com/ViaQ/loki-operator/internal/manifests" - "github.com/ViaQ/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" diff --git a/operator/internal/handlers/internal/gateway/tenant_secrets_test.go b/operator/internal/handlers/internal/gateway/tenant_secrets_test.go index 702b205770..0802624802 100644 --- a/operator/internal/handlers/internal/gateway/tenant_secrets_test.go +++ b/operator/internal/handlers/internal/gateway/tenant_secrets_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s/k8sfakes" - "github.com/ViaQ/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" diff --git a/operator/internal/handlers/internal/secrets/secrets.go b/operator/internal/handlers/internal/secrets/secrets.go index 8c7336fdc6..24a1f722ba 100644 --- a/operator/internal/handlers/internal/secrets/secrets.go +++ b/operator/internal/handlers/internal/secrets/secrets.go @@ -2,7 +2,7 @@ package secrets import ( "github.com/ViaQ/logerr/kverrors" - "github.com/ViaQ/loki-operator/internal/manifests" + "github.com/grafana/loki-operator/internal/manifests" corev1 "k8s.io/api/core/v1" ) diff --git a/operator/internal/handlers/internal/secrets/secrets_test.go b/operator/internal/handlers/internal/secrets/secrets_test.go index 064aa0149f..2e1200ec40 100644 --- a/operator/internal/handlers/internal/secrets/secrets_test.go +++ b/operator/internal/handlers/internal/secrets/secrets_test.go @@ -3,7 +3,7 @@ package secrets_test import ( "testing" - "github.com/ViaQ/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" ) diff --git a/operator/internal/handlers/lokistack_create_or_update.go b/operator/internal/handlers/lokistack_create_or_update.go index b666663ff6..757ac1c973 100644 --- a/operator/internal/handlers/lokistack_create_or_update.go +++ b/operator/internal/handlers/lokistack_create_or_update.go @@ -5,17 +5,17 @@ import ( "fmt" "os" - "github.com/ViaQ/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/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s" - "github.com/ViaQ/loki-operator/internal/handlers/internal/gateway" - "github.com/ViaQ/loki-operator/internal/handlers/internal/secrets" - "github.com/ViaQ/loki-operator/internal/manifests" - "github.com/ViaQ/loki-operator/internal/metrics" - "github.com/ViaQ/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" diff --git a/operator/internal/handlers/lokistack_create_or_update_test.go b/operator/internal/handlers/lokistack_create_or_update_test.go index 91015d1bf0..b1b8b73319 100644 --- a/operator/internal/handlers/lokistack_create_or_update_test.go +++ b/operator/internal/handlers/lokistack_create_or_update_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/ViaQ/logerr/log" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s/k8sfakes" - "github.com/ViaQ/loki-operator/internal/handlers" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/build.go b/operator/internal/manifests/build.go index 1f4fcba0da..75c3f9973a 100644 --- a/operator/internal/manifests/build.go +++ b/operator/internal/manifests/build.go @@ -2,8 +2,8 @@ package manifests import ( "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/build_test.go b/operator/internal/manifests/build_test.go index b2aadeb033..7e2609a6ed 100644 --- a/operator/internal/manifests/build_test.go +++ b/operator/internal/manifests/build_test.go @@ -6,8 +6,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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" ) diff --git a/operator/internal/manifests/compactor.go b/operator/internal/manifests/compactor.go index aea16268fc..7a1f291919 100644 --- a/operator/internal/manifests/compactor.go +++ b/operator/internal/manifests/compactor.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/compactor_test.go b/operator/internal/manifests/compactor_test.go index 30c2b746fe..e22d603e76 100644 --- a/operator/internal/manifests/compactor_test.go +++ b/operator/internal/manifests/compactor_test.go @@ -3,8 +3,8 @@ package manifests_test import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" + "github.com/grafana/loki-operator/internal/manifests" "github.com/stretchr/testify/require" ) diff --git a/operator/internal/manifests/config.go b/operator/internal/manifests/config.go index 2c6551cb5a..be7b9bff17 100644 --- a/operator/internal/manifests/config.go +++ b/operator/internal/manifests/config.go @@ -4,7 +4,7 @@ import ( "crypto/sha1" "fmt" - "github.com/ViaQ/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" ) diff --git a/operator/internal/manifests/config_test.go b/operator/internal/manifests/config_test.go index 76003dbb9d..979f63e896 100644 --- a/operator/internal/manifests/config_test.go +++ b/operator/internal/manifests/config_test.go @@ -5,9 +5,9 @@ import ( "math/rand" "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" "github.com/google/uuid" + 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" diff --git a/operator/internal/manifests/distributor.go b/operator/internal/manifests/distributor.go index 4be8cfde85..35e13ce82e 100644 --- a/operator/internal/manifests/distributor.go +++ b/operator/internal/manifests/distributor.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/distributor_test.go b/operator/internal/manifests/distributor_test.go index 5cd6f2b207..feb0869094 100644 --- a/operator/internal/manifests/distributor_test.go +++ b/operator/internal/manifests/distributor_test.go @@ -3,8 +3,8 @@ package manifests_test import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" + "github.com/grafana/loki-operator/internal/manifests" "github.com/stretchr/testify/require" ) diff --git a/operator/internal/manifests/gateway.go b/operator/internal/manifests/gateway.go index f597caeee3..3469da45a3 100644 --- a/operator/internal/manifests/gateway.go +++ b/operator/internal/manifests/gateway.go @@ -8,7 +8,7 @@ import ( "github.com/ViaQ/logerr/kverrors" "github.com/imdario/mergo" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/gateway_tenants.go b/operator/internal/manifests/gateway_tenants.go index 9d4294c818..a4789225de 100644 --- a/operator/internal/manifests/gateway_tenants.go +++ b/operator/internal/manifests/gateway_tenants.go @@ -2,9 +2,9 @@ package manifests import ( "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests/internal/gateway" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/gateway_tenants_test.go b/operator/internal/manifests/gateway_tenants_test.go index 0f7252d0a9..56ad20d1db 100644 --- a/operator/internal/manifests/gateway_tenants_test.go +++ b/operator/internal/manifests/gateway_tenants_test.go @@ -6,9 +6,9 @@ import ( monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/stretchr/testify/require" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests/internal/gateway" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/gateway_test.go b/operator/internal/manifests/gateway_test.go index 4a53ab631d..36b8cd1d9c 100644 --- a/operator/internal/manifests/gateway_test.go +++ b/operator/internal/manifests/gateway_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/indexgateway.go b/operator/internal/manifests/indexgateway.go index d77e4379f5..67a44eda98 100644 --- a/operator/internal/manifests/indexgateway.go +++ b/operator/internal/manifests/indexgateway.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/indexgateway_test.go b/operator/internal/manifests/indexgateway_test.go index 6ad408c5b0..19d7885c2c 100644 --- a/operator/internal/manifests/indexgateway_test.go +++ b/operator/internal/manifests/indexgateway_test.go @@ -3,8 +3,8 @@ package manifests_test import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" + "github.com/grafana/loki-operator/internal/manifests" "github.com/stretchr/testify/require" ) diff --git a/operator/internal/manifests/ingester.go b/operator/internal/manifests/ingester.go index 00cbca3be1..4d34c0ba9e 100644 --- a/operator/internal/manifests/ingester.go +++ b/operator/internal/manifests/ingester.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/ingester_test.go b/operator/internal/manifests/ingester_test.go index 92457ce9df..a448424bd5 100644 --- a/operator/internal/manifests/ingester_test.go +++ b/operator/internal/manifests/ingester_test.go @@ -3,8 +3,8 @@ package manifests_test import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" + "github.com/grafana/loki-operator/internal/manifests" "github.com/stretchr/testify/require" ) diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index d09a914684..eb0b26d9d2 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" "github.com/stretchr/testify/require" ) diff --git a/operator/internal/manifests/internal/config/options.go b/operator/internal/manifests/internal/config/options.go index dc15dabfdf..75198de9b8 100644 --- a/operator/internal/manifests/internal/config/options.go +++ b/operator/internal/manifests/internal/config/options.go @@ -4,7 +4,7 @@ import ( "fmt" "math" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" ) // Options is used to render the loki-config.yaml file template diff --git a/operator/internal/manifests/internal/gateway/build.go b/operator/internal/manifests/internal/gateway/build.go index 0b6b0d1ab9..262f2997d0 100644 --- a/operator/internal/manifests/internal/gateway/build.go +++ b/operator/internal/manifests/internal/gateway/build.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "text/template" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" "github.com/ViaQ/logerr/kverrors" ) diff --git a/operator/internal/manifests/internal/gateway/build_test.go b/operator/internal/manifests/internal/gateway/build_test.go index a24c112115..49fbc527b3 100644 --- a/operator/internal/manifests/internal/gateway/build_test.go +++ b/operator/internal/manifests/internal/gateway/build_test.go @@ -3,8 +3,8 @@ package gateway import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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" ) diff --git a/operator/internal/manifests/internal/gateway/options.go b/operator/internal/manifests/internal/gateway/options.go index 6e3784f650..b33dabea13 100644 --- a/operator/internal/manifests/internal/gateway/options.go +++ b/operator/internal/manifests/internal/gateway/options.go @@ -1,8 +1,8 @@ package gateway import ( - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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 diff --git a/operator/internal/manifests/internal/sizes.go b/operator/internal/manifests/internal/sizes.go index e1051631d4..1cb7e49dea 100644 --- a/operator/internal/manifests/internal/sizes.go +++ b/operator/internal/manifests/internal/sizes.go @@ -1,7 +1,7 @@ package internal import ( - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/operator/internal/manifests/mutate_test.go b/operator/internal/manifests/mutate_test.go index e120357b2d..c58b470f26 100644 --- a/operator/internal/manifests/mutate_test.go +++ b/operator/internal/manifests/mutate_test.go @@ -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/ViaQ/loki-operator/internal/manifests" + "github.com/grafana/loki-operator/internal/manifests" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" diff --git a/operator/internal/manifests/node_placement_test.go b/operator/internal/manifests/node_placement_test.go index ed00aa1360..0c4ff57f85 100644 --- a/operator/internal/manifests/node_placement_test.go +++ b/operator/internal/manifests/node_placement_test.go @@ -3,7 +3,7 @@ package manifests import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/operator/internal/manifests/options.go b/operator/internal/manifests/options.go index 7fa34e6487..c5abae072c 100644 --- a/operator/internal/manifests/options.go +++ b/operator/internal/manifests/options.go @@ -1,9 +1,9 @@ package manifests import ( - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests/internal" - "github.com/ViaQ/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. diff --git a/operator/internal/manifests/querier.go b/operator/internal/manifests/querier.go index eb55e039b5..e02a5b15f9 100644 --- a/operator/internal/manifests/querier.go +++ b/operator/internal/manifests/querier.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/querier_test.go b/operator/internal/manifests/querier_test.go index 6a5c650a8a..4ca55ee512 100644 --- a/operator/internal/manifests/querier_test.go +++ b/operator/internal/manifests/querier_test.go @@ -3,8 +3,8 @@ package manifests_test import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" + "github.com/grafana/loki-operator/internal/manifests" "github.com/stretchr/testify/require" ) diff --git a/operator/internal/manifests/query-frontend.go b/operator/internal/manifests/query-frontend.go index 03b665a60c..a50b94f5b9 100644 --- a/operator/internal/manifests/query-frontend.go +++ b/operator/internal/manifests/query-frontend.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "github.com/ViaQ/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" diff --git a/operator/internal/manifests/query-frontend_test.go b/operator/internal/manifests/query-frontend_test.go index 3683822646..c2d45dc502 100644 --- a/operator/internal/manifests/query-frontend_test.go +++ b/operator/internal/manifests/query-frontend_test.go @@ -3,8 +3,8 @@ package manifests_test import ( "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/manifests" + lokiv1beta1 "github.com/grafana/loki-operator/api/v1beta1" + "github.com/grafana/loki-operator/internal/manifests" "github.com/stretchr/testify/require" ) diff --git a/operator/internal/manifests/service_monitor_test.go b/operator/internal/manifests/service_monitor_test.go index 1b7a640d6b..31c879fa78 100644 --- a/operator/internal/manifests/service_monitor_test.go +++ b/operator/internal/manifests/service_monitor_test.go @@ -6,7 +6,7 @@ import ( corev1 "k8s.io/api/core/v1" - lokiv1beta1 "github.com/ViaQ/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" diff --git a/operator/internal/manifests/service_test.go b/operator/internal/manifests/service_test.go index db34574d92..2bd0b07ead 100644 --- a/operator/internal/manifests/service_test.go +++ b/operator/internal/manifests/service_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - lokiv1beta1 "github.com/ViaQ/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" diff --git a/operator/internal/manifests/var.go b/operator/internal/manifests/var.go index 8969899146..405234c037 100644 --- a/operator/internal/manifests/var.go +++ b/operator/internal/manifests/var.go @@ -3,7 +3,7 @@ package manifests import ( "fmt" - "github.com/ViaQ/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" diff --git a/operator/internal/metrics/metrics.go b/operator/internal/metrics/metrics.go index d6261eadaf..7cd2f8642d 100644 --- a/operator/internal/metrics/metrics.go +++ b/operator/internal/metrics/metrics.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "sigs.k8s.io/controller-runtime/pkg/metrics" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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 diff --git a/operator/internal/status/components.go b/operator/internal/status/components.go index 85b818121f..901cedf310 100644 --- a/operator/internal/status/components.go +++ b/operator/internal/status/components.go @@ -4,9 +4,9 @@ import ( "context" "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s" - "github.com/ViaQ/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" diff --git a/operator/internal/status/components_test.go b/operator/internal/status/components_test.go index 91328760ff..5fdff1bca2 100644 --- a/operator/internal/status/components_test.go +++ b/operator/internal/status/components_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s/k8sfakes" - "github.com/ViaQ/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" diff --git a/operator/internal/status/lokistack.go b/operator/internal/status/lokistack.go index cbf8859503..83ce626b39 100644 --- a/operator/internal/status/lokistack.go +++ b/operator/internal/status/lokistack.go @@ -4,8 +4,8 @@ import ( "context" "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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" diff --git a/operator/internal/status/lokistack_test.go b/operator/internal/status/lokistack_test.go index 44e926c295..c48403a530 100644 --- a/operator/internal/status/lokistack_test.go +++ b/operator/internal/status/lokistack_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/internal/external/k8s/k8sfakes" - "github.com/ViaQ/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" diff --git a/operator/internal/status/status.go b/operator/internal/status/status.go index 77c9f829b3..8becab023f 100644 --- a/operator/internal/status/status.go +++ b/operator/internal/status/status.go @@ -4,8 +4,8 @@ import ( "context" "github.com/ViaQ/logerr/kverrors" - lokiv1beta1 "github.com/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/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" diff --git a/operator/main.go b/operator/main.go index 55ef9d9d26..82c52285e6 100644 --- a/operator/main.go +++ b/operator/main.go @@ -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/ViaQ/loki-operator/api/v1beta1" - "github.com/ViaQ/loki-operator/controllers" - "github.com/ViaQ/loki-operator/internal/manifests" - "github.com/ViaQ/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"