From 28ffed0506cda0619c36c776820383b9b2123cc2 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Tue, 22 Oct 2024 10:43:09 +0200 Subject: [PATCH 1/2] refactor(operator)!: Rename loki api go module --- operator/Makefile | 2 +- operator/api/loki/go.mod | 2 +- operator/api/loki/v1beta1/alertingrule_types.go | 2 +- operator/api/loki/v1beta1/alertingrule_types_test.go | 4 ++-- operator/api/loki/v1beta1/lokistack_types.go | 2 +- operator/api/loki/v1beta1/lokistack_types_test.go | 4 ++-- operator/api/loki/v1beta1/recordingrule_types.go | 2 +- .../api/loki/v1beta1/recordingrule_types_test.go | 4 ++-- operator/api/loki/v1beta1/rulerconfig_types.go | 2 +- operator/api/loki/v1beta1/rulerconfig_types_test.go | 4 ++-- operator/cmd/loki-broker/main.go | 2 +- operator/cmd/loki-operator/main.go | 4 ++-- operator/config/docs/config.json | 6 +++--- operator/docs/operator/api.md | 12 ++++++------ operator/go.mod | 4 ++-- .../controller/loki/alertingrule_controller.go | 2 +- .../controller/loki/certrotation_controller.go | 2 +- .../controller/loki/certrotation_controller_test.go | 2 +- .../controller/loki/dashboards_controller.go | 2 +- .../internal/lokistack/certrotation_discovery.go | 2 +- .../internal/lokistack/ruler_config_discovery.go | 2 +- .../loki/internal/lokistack/rules_discovery.go | 2 +- .../controller/loki/internal/lokistack/update.go | 2 +- .../loki/internal/management/state/state.go | 2 +- .../loki/internal/management/state/state_test.go | 2 +- .../internal/controller/loki/lokistack_controller.go | 2 +- .../controller/loki/lokistack_controller_test.go | 2 +- .../loki/lokistack_zone_labeling_controller.go | 2 +- .../controller/loki/recordingrule_controller.go | 2 +- .../controller/loki/rulerconfig_controller.go | 2 +- operator/internal/handlers/credentialsrequest.go | 2 +- .../internal/handlers/credentialsrequest_test.go | 2 +- operator/internal/handlers/dashboards_create_test.go | 2 +- .../handlers/internal/certificates/options.go | 2 +- .../handlers/internal/certificates/options_test.go | 2 +- .../handlers/internal/gateway/base_domain.go | 2 +- .../internal/handlers/internal/gateway/gateway.go | 2 +- .../handlers/internal/gateway/gateway_test.go | 2 +- operator/internal/handlers/internal/gateway/modes.go | 2 +- .../internal/handlers/internal/gateway/modes_test.go | 2 +- .../handlers/internal/gateway/tenant_configsecret.go | 2 +- .../internal/gateway/tenant_configsecret_test.go | 2 +- .../handlers/internal/gateway/tenant_secrets.go | 2 +- .../handlers/internal/gateway/tenant_secrets_test.go | 2 +- .../handlers/internal/openshift/alertmanager.go | 2 +- .../internal/handlers/internal/openshift/proxy.go | 2 +- operator/internal/handlers/internal/rules/cleanup.go | 2 +- .../internal/handlers/internal/rules/cleanup_test.go | 2 +- operator/internal/handlers/internal/rules/config.go | 2 +- operator/internal/handlers/internal/rules/rules.go | 2 +- .../internal/handlers/internal/rules/rules_test.go | 2 +- operator/internal/handlers/internal/rules/secrets.go | 2 +- .../internal/handlers/internal/rules/secrets_test.go | 2 +- .../handlers/internal/storage/ca_configmap.go | 2 +- .../internal/handlers/internal/storage/secrets.go | 2 +- .../handlers/internal/storage/secrets_test.go | 2 +- .../internal/handlers/internal/storage/storage.go | 2 +- .../handlers/internal/storage/storage_test.go | 2 +- .../internal/handlers/lokistack_check_cert_expiry.go | 2 +- .../handlers/lokistack_check_cert_expiry_test.go | 2 +- .../internal/handlers/lokistack_create_or_update.go | 2 +- .../handlers/lokistack_create_or_update_test.go | 2 +- .../handlers/lokistack_enable_zone_awareness.go | 2 +- .../handlers/lokistack_enable_zone_awareness_test.go | 2 +- operator/internal/handlers/lokistack_rotate_certs.go | 2 +- .../internal/handlers/lokistack_rotate_certs_test.go | 2 +- operator/internal/manifests/build.go | 2 +- operator/internal/manifests/build_test.go | 2 +- operator/internal/manifests/compactor_test.go | 2 +- operator/internal/manifests/config.go | 2 +- operator/internal/manifests/config_test.go | 2 +- operator/internal/manifests/distributor_test.go | 2 +- operator/internal/manifests/gateway_tenants.go | 2 +- operator/internal/manifests/gateway_tenants_test.go | 2 +- operator/internal/manifests/gateway_test.go | 2 +- operator/internal/manifests/indexgateway_test.go | 2 +- operator/internal/manifests/ingester_test.go | 2 +- .../internal/manifests/internal/config/build_test.go | 2 +- .../internal/manifests/internal/config/options.go | 2 +- .../internal/manifests/internal/gateway/build.go | 2 +- .../manifests/internal/gateway/build_test.go | 2 +- .../internal/manifests/internal/gateway/options.go | 2 +- .../internal/manifests/internal/rules/marshal.go | 2 +- .../manifests/internal/rules/marshal_test.go | 2 +- operator/internal/manifests/internal/sizes.go | 2 +- operator/internal/manifests/memberlist.go | 2 +- operator/internal/manifests/memberlist_test.go | 2 +- operator/internal/manifests/node_placement.go | 2 +- operator/internal/manifests/node_placement_test.go | 2 +- .../internal/manifests/openshift/alertingrule.go | 2 +- .../manifests/openshift/alertingrule_test.go | 2 +- operator/internal/manifests/openshift/build_test.go | 2 +- operator/internal/manifests/openshift/configure.go | 2 +- .../internal/manifests/openshift/opa_openshift.go | 2 +- operator/internal/manifests/openshift/options.go | 2 +- .../internal/manifests/openshift/recordingrule.go | 2 +- .../manifests/openshift/recordingrule_test.go | 2 +- operator/internal/manifests/options.go | 2 +- operator/internal/manifests/options_test.go | 2 +- operator/internal/manifests/proxy_env.go | 2 +- operator/internal/manifests/proxy_env_test.go | 2 +- operator/internal/manifests/querier_test.go | 2 +- operator/internal/manifests/query-frontend_test.go | 2 +- operator/internal/manifests/ruler.go | 2 +- operator/internal/manifests/ruler_test.go | 2 +- operator/internal/manifests/rules_config.go | 2 +- operator/internal/manifests/rules_config_test.go | 2 +- operator/internal/manifests/service_monitor_test.go | 2 +- operator/internal/manifests/service_test.go | 2 +- operator/internal/manifests/serviceaccount_test.go | 2 +- operator/internal/manifests/storage/configure.go | 2 +- .../internal/manifests/storage/configure_test.go | 2 +- operator/internal/manifests/storage/options.go | 2 +- operator/internal/manifests/storage/schema.go | 2 +- operator/internal/manifests/storage/schema_test.go | 2 +- operator/internal/manifests/var.go | 2 +- operator/internal/metrics/lokistack.go | 2 +- operator/internal/metrics/lokistack_test.go | 2 +- operator/internal/status/components.go | 2 +- operator/internal/status/components_test.go | 2 +- operator/internal/status/conditions_test.go | 2 +- operator/internal/status/lokistack.go | 2 +- operator/internal/status/lokistack_test.go | 2 +- operator/internal/status/status.go | 2 +- operator/internal/status/status_test.go | 2 +- operator/internal/status/storage.go | 2 +- operator/internal/status/storage_test.go | 2 +- operator/internal/validation/alertingrule.go | 2 +- operator/internal/validation/alertingrule_test.go | 2 +- operator/internal/validation/lokistack.go | 2 +- operator/internal/validation/lokistack_test.go | 2 +- .../internal/validation/openshift/alertingrule.go | 2 +- .../validation/openshift/alertingrule_test.go | 2 +- operator/internal/validation/openshift/common.go | 2 +- .../internal/validation/openshift/recordingrule.go | 2 +- .../validation/openshift/recordingrule_test.go | 2 +- operator/internal/validation/recordingrule.go | 2 +- operator/internal/validation/recordingrule_test.go | 2 +- operator/internal/validation/rulerconfig.go | 2 +- operator/internal/validation/rulerconfig_test.go | 2 +- 140 files changed, 153 insertions(+), 153 deletions(-) diff --git a/operator/Makefile b/operator/Makefile index 46e2c5f438d35..d9031ba588c3d 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -314,7 +314,7 @@ oci-push-calculator: ## Push the calculator image ##@ Website TYPES_TARGET := $(shell find api/loki -type f -iname "*_types.go") docs/operator/api.md: $(TYPES_TARGET) $(GEN_CRD_API_REFERENCE_DOCS) - $(GEN_CRD_API_REFERENCE_DOCS) -api-dir "github.com/grafana/loki/operator/apis/loki/" -config "$(PWD)/config/docs/config.json" -template-dir "$(PWD)/config/docs/templates" -out-file "$(PWD)/$@" + $(GEN_CRD_API_REFERENCE_DOCS) -api-dir "github.com/grafana/loki/operator/api/loki/" -config "$(PWD)/config/docs/config.json" -template-dir "$(PWD)/config/docs/templates" -out-file "$(PWD)/$@" sed -i 's/+docs:/ docs:/' $@ sed -i 's/+parent:/ parent:/' $@ sed -i 's/##/\n##/' $@ diff --git a/operator/api/loki/go.mod b/operator/api/loki/go.mod index 24d692d874e34..1fbcffb6bfe3b 100644 --- a/operator/api/loki/go.mod +++ b/operator/api/loki/go.mod @@ -1,4 +1,4 @@ -module github.com/grafana/loki/operator/apis/loki +module github.com/grafana/loki/operator/api/loki go 1.19 diff --git a/operator/api/loki/v1beta1/alertingrule_types.go b/operator/api/loki/v1beta1/alertingrule_types.go index 9a51320f788d4..15d9c6afd02cc 100644 --- a/operator/api/loki/v1beta1/alertingrule_types.go +++ b/operator/api/loki/v1beta1/alertingrule_types.go @@ -1,7 +1,7 @@ package v1beta1 import ( - v1 "github.com/grafana/loki/operator/apis/loki/v1" + v1 "github.com/grafana/loki/operator/api/loki/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/api/loki/v1beta1/alertingrule_types_test.go b/operator/api/loki/v1beta1/alertingrule_types_test.go index 373e7d8e71e00..e21f95e2380e8 100644 --- a/operator/api/loki/v1beta1/alertingrule_types_test.go +++ b/operator/api/loki/v1beta1/alertingrule_types_test.go @@ -3,8 +3,8 @@ package v1beta1_test import ( "testing" - v1 "github.com/grafana/loki/operator/apis/loki/v1" - "github.com/grafana/loki/operator/apis/loki/v1beta1" + v1 "github.com/grafana/loki/operator/api/loki/v1" + "github.com/grafana/loki/operator/api/loki/v1beta1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/operator/api/loki/v1beta1/lokistack_types.go b/operator/api/loki/v1beta1/lokistack_types.go index cd7fb0c90cff5..e37436d213eda 100644 --- a/operator/api/loki/v1beta1/lokistack_types.go +++ b/operator/api/loki/v1beta1/lokistack_types.go @@ -1,7 +1,7 @@ package v1beta1 import ( - v1 "github.com/grafana/loki/operator/apis/loki/v1" + v1 "github.com/grafana/loki/operator/api/loki/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" diff --git a/operator/api/loki/v1beta1/lokistack_types_test.go b/operator/api/loki/v1beta1/lokistack_types_test.go index 28ffb1763137d..33477d1b89024 100644 --- a/operator/api/loki/v1beta1/lokistack_types_test.go +++ b/operator/api/loki/v1beta1/lokistack_types_test.go @@ -7,8 +7,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/grafana/loki/operator/apis/loki/v1" - "github.com/grafana/loki/operator/apis/loki/v1beta1" + v1 "github.com/grafana/loki/operator/api/loki/v1" + "github.com/grafana/loki/operator/api/loki/v1beta1" ) func TestConvertToV1_LokiStack(t *testing.T) { diff --git a/operator/api/loki/v1beta1/recordingrule_types.go b/operator/api/loki/v1beta1/recordingrule_types.go index e6d7f63ddd3ab..348ca3703f59d 100644 --- a/operator/api/loki/v1beta1/recordingrule_types.go +++ b/operator/api/loki/v1beta1/recordingrule_types.go @@ -1,7 +1,7 @@ package v1beta1 import ( - v1 "github.com/grafana/loki/operator/apis/loki/v1" + v1 "github.com/grafana/loki/operator/api/loki/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/api/loki/v1beta1/recordingrule_types_test.go b/operator/api/loki/v1beta1/recordingrule_types_test.go index d2a8ea7df83ab..6c8f494699571 100644 --- a/operator/api/loki/v1beta1/recordingrule_types_test.go +++ b/operator/api/loki/v1beta1/recordingrule_types_test.go @@ -3,8 +3,8 @@ package v1beta1_test import ( "testing" - v1 "github.com/grafana/loki/operator/apis/loki/v1" - "github.com/grafana/loki/operator/apis/loki/v1beta1" + v1 "github.com/grafana/loki/operator/api/loki/v1" + "github.com/grafana/loki/operator/api/loki/v1beta1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/operator/api/loki/v1beta1/rulerconfig_types.go b/operator/api/loki/v1beta1/rulerconfig_types.go index c7bd9b4e7e812..420c9fb617021 100644 --- a/operator/api/loki/v1beta1/rulerconfig_types.go +++ b/operator/api/loki/v1beta1/rulerconfig_types.go @@ -1,7 +1,7 @@ package v1beta1 import ( - v1 "github.com/grafana/loki/operator/apis/loki/v1" + v1 "github.com/grafana/loki/operator/api/loki/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/api/loki/v1beta1/rulerconfig_types_test.go b/operator/api/loki/v1beta1/rulerconfig_types_test.go index ab79fc35e0e58..239e43027c887 100644 --- a/operator/api/loki/v1beta1/rulerconfig_types_test.go +++ b/operator/api/loki/v1beta1/rulerconfig_types_test.go @@ -3,8 +3,8 @@ package v1beta1_test import ( "testing" - v1 "github.com/grafana/loki/operator/apis/loki/v1" - "github.com/grafana/loki/operator/apis/loki/v1beta1" + v1 "github.com/grafana/loki/operator/api/loki/v1" + "github.com/grafana/loki/operator/api/loki/v1beta1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/operator/cmd/loki-broker/main.go b/operator/cmd/loki-broker/main.go index 93d77f518c911..0e1c638620e71 100644 --- a/operator/cmd/loki-broker/main.go +++ b/operator/cmd/loki-broker/main.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/yaml" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/cmd/loki-operator/main.go b/operator/cmd/loki-operator/main.go index 00afb7c5765a4..a80bef34aba48 100644 --- a/operator/cmd/loki-operator/main.go +++ b/operator/cmd/loki-operator/main.go @@ -18,8 +18,8 @@ import ( runtimemetrics "sigs.k8s.io/controller-runtime/pkg/metrics" ctrlconfigv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" - lokiv1beta1 "github.com/grafana/loki/operator/apis/loki/v1beta1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" + lokiv1beta1 "github.com/grafana/loki/operator/api/loki/v1beta1" "github.com/grafana/loki/operator/internal/config" lokictrl "github.com/grafana/loki/operator/internal/controller/loki" "github.com/grafana/loki/operator/internal/metrics" diff --git a/operator/config/docs/config.json b/operator/config/docs/config.json index fb1b7d8a11b2b..295dcf5a99b57 100644 --- a/operator/config/docs/config.json +++ b/operator/config/docs/config.json @@ -30,15 +30,15 @@ "docsURLTemplate": "https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1#JSON" }, { - "typeMatchPrefix": "^github\\.com/grafana/loki/operator/apis/loki/v1", + "typeMatchPrefix": "^github\\.com/grafana/loki/operator/api/loki/v1", "docsURLTemplate": "../v1/api.md#loki.grafana.com/v1.{{ .TypeIdentifier}}" }, { - "typeMatchPrefix": "^github\\.com/grafana/loki/operator/apis/loki/v1beta1", + "typeMatchPrefix": "^github\\.com/grafana/loki/operator/api/loki/v1beta1", "docsURLTemplate": "../v1beta1/api.md#loki-grafana.com-v1beta1-{{ .TypeIdentifier}}" }, { - "typeMatchPrefix": "^github\\.com/grafana/loki/operator/apis/loki/config/v1", + "typeMatchPrefix": "^github\\.com/grafana/loki/operator/api/loki/config/v1", "docsURLTemplate": "../v1/feature-gates.md#loki-grafana-com-v1-{{ .TypeIdentifier}}" }, { diff --git a/operator/docs/operator/api.md b/operator/docs/operator/api.md index 54c105bf143db..47e690b3888c2 100644 --- a/operator/docs/operator/api.md +++ b/operator/docs/operator/api.md @@ -1007,7 +1007,7 @@ BlockedQueryTypes ## BlockedQueryTypes { #loki-grafana-com-v1-BlockedQueryTypes } -([]github.com/grafana/loki/operator/apis/loki/v1.BlockedQueryType alias) +([]github.com/grafana/loki/operator/api/loki/v1.BlockedQueryType alias)

(Appears on:BlockedQuerySpec)

@@ -1461,7 +1461,7 @@ LimitsTemplateSpec tenants
-map[string]github.com/grafana/loki/operator/apis/loki/v1.PerTenantLimitsTemplateSpec +map[string]github.com/grafana/loki/operator/api/loki/v1.PerTenantLimitsTemplateSpec @@ -3405,7 +3405,7 @@ At least one container is still running or is in the process of being restarted. ## PodStatusMap { #loki-grafana-com-v1-PodStatusMap } -(map[github.com/grafana/loki/operator/apis/loki/v1.PodStatus][]string alias) +(map[github.com/grafana/loki/operator/api/loki/v1.PodStatus][]string alias)

(Appears on:LokiStackComponentStatus)

@@ -4594,7 +4594,7 @@ RemoteWriteSpec overrides
-map[string]github.com/grafana/loki/operator/apis/loki/v1.RulerOverrides +map[string]github.com/grafana/loki/operator/api/loki/v1.RulerOverrides @@ -5967,7 +5967,7 @@ LimitsTemplateSpec tenants
-map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.LimitsTemplateSpec +map[string]github.com/grafana/loki/operator/api/loki/v1beta1.LimitsTemplateSpec @@ -8188,7 +8188,7 @@ RemoteWriteSpec overrides
-map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.RulerOverrides +map[string]github.com/grafana/loki/operator/api/loki/v1beta1.RulerOverrides diff --git a/operator/go.mod b/operator/go.mod index 5390362e6efe7..5ab042bf45609 100644 --- a/operator/go.mod +++ b/operator/go.mod @@ -10,7 +10,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/grafana/loki v1.6.2-0.20230403212622-90888a0cc737 - github.com/grafana/loki/operator/apis/loki v0.0.0-00010101000000-000000000000 + github.com/grafana/loki/operator/api/loki v0.0.0-00010101000000-000000000000 github.com/imdario/mergo v0.3.16 github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0 github.com/openshift/api v0.0.0-20240912201240-0a8800162826 // release-4.17 @@ -162,7 +162,7 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace github.com/grafana/loki/operator/apis/loki => ./api/loki +replace github.com/grafana/loki/operator/api/loki => ./api/loki // Replace v2.4.0+incompatible indirect refs with v5.1.1 for compatibility with google.golang.org/grpc >=v1.56.3 replace github.com/sercand/kuberesolver => github.com/sercand/kuberesolver/v5 v5.1.1 diff --git a/operator/internal/controller/loki/alertingrule_controller.go b/operator/internal/controller/loki/alertingrule_controller.go index 21a920e42568c..84890d553100c 100644 --- a/operator/internal/controller/loki/alertingrule_controller.go +++ b/operator/internal/controller/loki/alertingrule_controller.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/handler" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/controller/loki/internal/lokistack" ) diff --git a/operator/internal/controller/loki/certrotation_controller.go b/operator/internal/controller/loki/certrotation_controller.go index be2ad1eb70bd5..b677a32b5990e 100644 --- a/operator/internal/controller/loki/certrotation_controller.go +++ b/operator/internal/controller/loki/certrotation_controller.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/certrotation" "github.com/grafana/loki/operator/internal/controller/loki/internal/lokistack" "github.com/grafana/loki/operator/internal/controller/loki/internal/management/state" diff --git a/operator/internal/controller/loki/certrotation_controller_test.go b/operator/internal/controller/loki/certrotation_controller_test.go index 584a52644421f..7e1936b924877 100644 --- a/operator/internal/controller/loki/certrotation_controller_test.go +++ b/operator/internal/controller/loki/certrotation_controller_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/controller/loki/dashboards_controller.go b/operator/internal/controller/loki/dashboards_controller.go index ec9f4b9ab71b8..87d2ee15c0dd3 100644 --- a/operator/internal/controller/loki/dashboards_controller.go +++ b/operator/internal/controller/loki/dashboards_controller.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/predicate" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/handlers" ) diff --git a/operator/internal/controller/loki/internal/lokistack/certrotation_discovery.go b/operator/internal/controller/loki/internal/lokistack/certrotation_discovery.go index 1b16b580e6059..377aadf6ee826 100644 --- a/operator/internal/controller/loki/internal/lokistack/certrotation_discovery.go +++ b/operator/internal/controller/loki/internal/lokistack/certrotation_discovery.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/controller/loki/internal/lokistack/ruler_config_discovery.go b/operator/internal/controller/loki/internal/lokistack/ruler_config_discovery.go index 6d1852ca03e54..06249caa03230 100644 --- a/operator/internal/controller/loki/internal/lokistack/ruler_config_discovery.go +++ b/operator/internal/controller/loki/internal/lokistack/ruler_config_discovery.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/controller/loki/internal/lokistack/rules_discovery.go b/operator/internal/controller/loki/internal/lokistack/rules_discovery.go index ed51722d07bc9..9ea2821ec03df 100644 --- a/operator/internal/controller/loki/internal/lokistack/rules_discovery.go +++ b/operator/internal/controller/loki/internal/lokistack/rules_discovery.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/controller/loki/internal/lokistack/update.go b/operator/internal/controller/loki/internal/lokistack/update.go index b16ed815a7310..24fd3dafe6cd6 100644 --- a/operator/internal/controller/loki/internal/lokistack/update.go +++ b/operator/internal/controller/loki/internal/lokistack/update.go @@ -7,7 +7,7 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/controller/loki/internal/management/state/state.go b/operator/internal/controller/loki/internal/management/state/state.go index 759c26e57ba43..13204043ea67c 100644 --- a/operator/internal/controller/loki/internal/management/state/state.go +++ b/operator/internal/controller/loki/internal/management/state/state.go @@ -7,7 +7,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" ctrl "sigs.k8s.io/controller-runtime" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/controller/loki/internal/management/state/state_test.go b/operator/internal/controller/loki/internal/management/state/state_test.go index 0d4ece6f78ac3..f6f8a9241d0ed 100644 --- a/operator/internal/controller/loki/internal/management/state/state_test.go +++ b/operator/internal/controller/loki/internal/management/state/state_test.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/controller/loki/lokistack_controller.go b/operator/internal/controller/loki/lokistack_controller.go index c0763bb646e53..5c7c376d3bd06 100644 --- a/operator/internal/controller/loki/lokistack_controller.go +++ b/operator/internal/controller/loki/lokistack_controller.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/config" "github.com/grafana/loki/operator/internal/controller/loki/internal/management/state" "github.com/grafana/loki/operator/internal/external/k8s" diff --git a/operator/internal/controller/loki/lokistack_controller_test.go b/operator/internal/controller/loki/lokistack_controller_test.go index 7029570a68310..0af66748f41d5 100644 --- a/operator/internal/controller/loki/lokistack_controller_test.go +++ b/operator/internal/controller/loki/lokistack_controller_test.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/controller/loki/lokistack_zone_labeling_controller.go b/operator/internal/controller/loki/lokistack_zone_labeling_controller.go index 4656e3feeb288..a45c06a860f3f 100644 --- a/operator/internal/controller/loki/lokistack_zone_labeling_controller.go +++ b/operator/internal/controller/loki/lokistack_zone_labeling_controller.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/predicate" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/handlers" ) diff --git a/operator/internal/controller/loki/recordingrule_controller.go b/operator/internal/controller/loki/recordingrule_controller.go index ed58701383e92..75a2c971f1eb9 100644 --- a/operator/internal/controller/loki/recordingrule_controller.go +++ b/operator/internal/controller/loki/recordingrule_controller.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/handler" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/controller/loki/internal/lokistack" ) diff --git a/operator/internal/controller/loki/rulerconfig_controller.go b/operator/internal/controller/loki/rulerconfig_controller.go index d774278bb3c6e..901ca5b65d0e1 100644 --- a/operator/internal/controller/loki/rulerconfig_controller.go +++ b/operator/internal/controller/loki/rulerconfig_controller.go @@ -8,7 +8,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/controller/loki/internal/lokistack" ) diff --git a/operator/internal/handlers/credentialsrequest.go b/operator/internal/handlers/credentialsrequest.go index 9096f15d4026f..7d25bde2c9d27 100644 --- a/operator/internal/handlers/credentialsrequest.go +++ b/operator/internal/handlers/credentialsrequest.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/config" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests" diff --git a/operator/internal/handlers/credentialsrequest_test.go b/operator/internal/handlers/credentialsrequest_test.go index dfb63cf166820..d71995d3de2b7 100644 --- a/operator/internal/handlers/credentialsrequest_test.go +++ b/operator/internal/handlers/credentialsrequest_test.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/config" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/handlers/dashboards_create_test.go b/operator/internal/handlers/dashboards_create_test.go index f897b45841543..71001c4760bd7 100644 --- a/operator/internal/handlers/dashboards_create_test.go +++ b/operator/internal/handlers/dashboards_create_test.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/handlers/internal/certificates/options.go b/operator/internal/handlers/internal/certificates/options.go index 4aa9d1871112e..b978ae3b0e9f0 100644 --- a/operator/internal/handlers/internal/certificates/options.go +++ b/operator/internal/handlers/internal/certificates/options.go @@ -10,7 +10,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/certrotation" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/handlers/internal/certificates/options_test.go b/operator/internal/handlers/internal/certificates/options_test.go index 56f2080f74a86..de578a6ca5b68 100644 --- a/operator/internal/handlers/internal/certificates/options_test.go +++ b/operator/internal/handlers/internal/certificates/options_test.go @@ -15,7 +15,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/handlers/internal/gateway/base_domain.go b/operator/internal/handlers/internal/gateway/base_domain.go index 893659ca5d29b..c1170b70f7edc 100644 --- a/operator/internal/handlers/internal/gateway/base_domain.go +++ b/operator/internal/handlers/internal/gateway/base_domain.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/status" ) diff --git a/operator/internal/handlers/internal/gateway/gateway.go b/operator/internal/handlers/internal/gateway/gateway.go index 5957364b4a572..d37c82866af35 100644 --- a/operator/internal/handlers/internal/gateway/gateway.go +++ b/operator/internal/handlers/internal/gateway/gateway.go @@ -7,7 +7,7 @@ import ( "github.com/go-logr/logr" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/handlers/internal/openshift" "github.com/grafana/loki/operator/internal/manifests" diff --git a/operator/internal/handlers/internal/gateway/gateway_test.go b/operator/internal/handlers/internal/gateway/gateway_test.go index cb4db6c5a64a1..59dcf5821ab40 100644 --- a/operator/internal/handlers/internal/gateway/gateway_test.go +++ b/operator/internal/handlers/internal/gateway/gateway_test.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/status" ) diff --git a/operator/internal/handlers/internal/gateway/modes.go b/operator/internal/handlers/internal/gateway/modes.go index 8fd9855b352dc..46a271361b939 100644 --- a/operator/internal/handlers/internal/gateway/modes.go +++ b/operator/internal/handlers/internal/gateway/modes.go @@ -3,7 +3,7 @@ package gateway import ( "github.com/ViaQ/logerr/v2/kverrors" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func validateModes(stack *lokiv1.LokiStack) error { diff --git a/operator/internal/handlers/internal/gateway/modes_test.go b/operator/internal/handlers/internal/gateway/modes_test.go index 0d6dd9eb88cd6..20ae7c86ca4da 100644 --- a/operator/internal/handlers/internal/gateway/modes_test.go +++ b/operator/internal/handlers/internal/gateway/modes_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestValidateModes_StaticMode(t *testing.T) { diff --git a/operator/internal/handlers/internal/gateway/tenant_configsecret.go b/operator/internal/handlers/internal/gateway/tenant_configsecret.go index f4e6c493bc069..252ebe7b34495 100644 --- a/operator/internal/handlers/internal/gateway/tenant_configsecret.go +++ b/operator/internal/handlers/internal/gateway/tenant_configsecret.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/handlers/internal/gateway/tenant_configsecret_test.go b/operator/internal/handlers/internal/gateway/tenant_configsecret_test.go index 15e85a2295465..5c1020fd48b3d 100644 --- a/operator/internal/handlers/internal/gateway/tenant_configsecret_test.go +++ b/operator/internal/handlers/internal/gateway/tenant_configsecret_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/handlers/internal/gateway/tenant_secrets.go b/operator/internal/handlers/internal/gateway/tenant_secrets.go index 6cc39ae05e254..84bcf1b8c07f1 100644 --- a/operator/internal/handlers/internal/gateway/tenant_secrets.go +++ b/operator/internal/handlers/internal/gateway/tenant_secrets.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests" "github.com/grafana/loki/operator/internal/status" diff --git a/operator/internal/handlers/internal/gateway/tenant_secrets_test.go b/operator/internal/handlers/internal/gateway/tenant_secrets_test.go index 52c1476059174..7094416b03028 100644 --- a/operator/internal/handlers/internal/gateway/tenant_secrets_test.go +++ b/operator/internal/handlers/internal/gateway/tenant_secrets_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/handlers/internal/openshift/alertmanager.go b/operator/internal/handlers/internal/openshift/alertmanager.go index d470bf6ffe6df..0ee614d596549 100644 --- a/operator/internal/handlers/internal/openshift/alertmanager.go +++ b/operator/internal/handlers/internal/openshift/alertmanager.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/handlers/internal/openshift/proxy.go b/operator/internal/handlers/internal/openshift/proxy.go index 4f5c2c022e901..10d2330c104e6 100644 --- a/operator/internal/handlers/internal/openshift/proxy.go +++ b/operator/internal/handlers/internal/openshift/proxy.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/handlers/internal/rules/cleanup.go b/operator/internal/handlers/internal/rules/cleanup.go index abd5bacd5c032..faabe70d4ea82 100644 --- a/operator/internal/handlers/internal/rules/cleanup.go +++ b/operator/internal/handlers/internal/rules/cleanup.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/grafana/loki/operator/apis/loki/v1" + v1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/handlers/internal/rules/cleanup_test.go b/operator/internal/handlers/internal/rules/cleanup_test.go index 5ecd9f69c345f..18242877c578b 100644 --- a/operator/internal/handlers/internal/rules/cleanup_test.go +++ b/operator/internal/handlers/internal/rules/cleanup_test.go @@ -17,7 +17,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/handlers/internal/rules/config.go b/operator/internal/handlers/internal/rules/config.go index ec4413fc49ecd..e983be441f75f 100644 --- a/operator/internal/handlers/internal/rules/config.go +++ b/operator/internal/handlers/internal/rules/config.go @@ -7,7 +7,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/handlers/internal/rules/rules.go b/operator/internal/handlers/internal/rules/rules.go index e21335e98c095..93196a98c0526 100644 --- a/operator/internal/handlers/internal/rules/rules.go +++ b/operator/internal/handlers/internal/rules/rules.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/handlers/internal/openshift" "github.com/grafana/loki/operator/internal/manifests" diff --git a/operator/internal/handlers/internal/rules/rules_test.go b/operator/internal/handlers/internal/rules/rules_test.go index e33a2ac928a6a..c5f4b17ea8047 100644 --- a/operator/internal/handlers/internal/rules/rules_test.go +++ b/operator/internal/handlers/internal/rules/rules_test.go @@ -14,7 +14,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/status" ) diff --git a/operator/internal/handlers/internal/rules/secrets.go b/operator/internal/handlers/internal/rules/secrets.go index 311bd139c615c..09b103c41cb46 100644 --- a/operator/internal/handlers/internal/rules/secrets.go +++ b/operator/internal/handlers/internal/rules/secrets.go @@ -4,7 +4,7 @@ import ( "github.com/ViaQ/logerr/v2/kverrors" corev1 "k8s.io/api/core/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/handlers/internal/rules/secrets_test.go b/operator/internal/handlers/internal/rules/secrets_test.go index 118cc0c8e0fb9..b59905ca93451 100644 --- a/operator/internal/handlers/internal/rules/secrets_test.go +++ b/operator/internal/handlers/internal/rules/secrets_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/handlers/internal/rules" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/handlers/internal/storage/ca_configmap.go b/operator/internal/handlers/internal/storage/ca_configmap.go index 904e63373a207..4935a31355de8 100644 --- a/operator/internal/handlers/internal/storage/ca_configmap.go +++ b/operator/internal/handlers/internal/storage/ca_configmap.go @@ -10,7 +10,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/status" ) diff --git a/operator/internal/handlers/internal/storage/secrets.go b/operator/internal/handlers/internal/storage/secrets.go index 6f8066838ec16..36065afb4c8ab 100644 --- a/operator/internal/handlers/internal/storage/secrets.go +++ b/operator/internal/handlers/internal/storage/secrets.go @@ -18,7 +18,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests/storage" "github.com/grafana/loki/operator/internal/status" diff --git a/operator/internal/handlers/internal/storage/secrets_test.go b/operator/internal/handlers/internal/storage/secrets_test.go index 2cc0861d5258c..0688b099f3a86 100644 --- a/operator/internal/handlers/internal/storage/secrets_test.go +++ b/operator/internal/handlers/internal/storage/secrets_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/handlers/internal/storage/storage.go b/operator/internal/handlers/internal/storage/storage.go index 0f767dec38b0b..af7dbc726437d 100644 --- a/operator/internal/handlers/internal/storage/storage.go +++ b/operator/internal/handlers/internal/storage/storage.go @@ -6,7 +6,7 @@ import ( "time" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests/storage" "github.com/grafana/loki/operator/internal/status" diff --git a/operator/internal/handlers/internal/storage/storage_test.go b/operator/internal/handlers/internal/storage/storage_test.go index cf500fd76d085..fe483656e7147 100644 --- a/operator/internal/handlers/internal/storage/storage_test.go +++ b/operator/internal/handlers/internal/storage/storage_test.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/status" ) diff --git a/operator/internal/handlers/lokistack_check_cert_expiry.go b/operator/internal/handlers/lokistack_check_cert_expiry.go index c7e10613659a9..70d0b6fa75a4a 100644 --- a/operator/internal/handlers/lokistack_check_cert_expiry.go +++ b/operator/internal/handlers/lokistack_check_cert_expiry.go @@ -9,7 +9,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/certrotation" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/handlers/internal/certificates" diff --git a/operator/internal/handlers/lokistack_check_cert_expiry_test.go b/operator/internal/handlers/lokistack_check_cert_expiry_test.go index 6b6d35c8b6bcd..84cb54f78a68d 100644 --- a/operator/internal/handlers/lokistack_check_cert_expiry_test.go +++ b/operator/internal/handlers/lokistack_check_cert_expiry_test.go @@ -16,7 +16,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/certrotation" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/handlers/lokistack_create_or_update.go b/operator/internal/handlers/lokistack_create_or_update.go index d87f820b1f77e..e834fac0282ab 100644 --- a/operator/internal/handlers/lokistack_create_or_update.go +++ b/operator/internal/handlers/lokistack_create_or_update.go @@ -16,7 +16,7 @@ import ( ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "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/rules" diff --git a/operator/internal/handlers/lokistack_create_or_update_test.go b/operator/internal/handlers/lokistack_create_or_update_test.go index c4242d69506e5..b2a64e39fa922 100644 --- a/operator/internal/handlers/lokistack_create_or_update_test.go +++ b/operator/internal/handlers/lokistack_create_or_update_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/status" ) diff --git a/operator/internal/handlers/lokistack_enable_zone_awareness.go b/operator/internal/handlers/lokistack_enable_zone_awareness.go index c66f54af5bc04..97e178d819e64 100644 --- a/operator/internal/handlers/lokistack_enable_zone_awareness.go +++ b/operator/internal/handlers/lokistack_enable_zone_awareness.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/handlers/lokistack_enable_zone_awareness_test.go b/operator/internal/handlers/lokistack_enable_zone_awareness_test.go index f0c0f02be342b..dd3767408d83c 100644 --- a/operator/internal/handlers/lokistack_enable_zone_awareness_test.go +++ b/operator/internal/handlers/lokistack_enable_zone_awareness_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/handlers/lokistack_rotate_certs.go b/operator/internal/handlers/lokistack_rotate_certs.go index f8d2e845f58a7..7ed6d85827ed1 100644 --- a/operator/internal/handlers/lokistack_rotate_certs.go +++ b/operator/internal/handlers/lokistack_rotate_certs.go @@ -13,7 +13,7 @@ import ( ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/certrotation" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/handlers/internal/certificates" diff --git a/operator/internal/handlers/lokistack_rotate_certs_test.go b/operator/internal/handlers/lokistack_rotate_certs_test.go index 7ace87de85cd1..e204c99b9217b 100644 --- a/operator/internal/handlers/lokistack_rotate_certs_test.go +++ b/operator/internal/handlers/lokistack_rotate_certs_test.go @@ -16,7 +16,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/manifests/build.go b/operator/internal/manifests/build.go index cc0da5771c0c1..99b0d5daa597e 100644 --- a/operator/internal/manifests/build.go +++ b/operator/internal/manifests/build.go @@ -7,7 +7,7 @@ import ( "github.com/openshift/library-go/pkg/crypto" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal" ) diff --git a/operator/internal/manifests/build_test.go b/operator/internal/manifests/build_test.go index d9bf7b8e75d43..536e40df04629 100644 --- a/operator/internal/manifests/build_test.go +++ b/operator/internal/manifests/build_test.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal" ) diff --git a/operator/internal/manifests/compactor_test.go b/operator/internal/manifests/compactor_test.go index 6839d64a74263..ac636b364a6f4 100644 --- a/operator/internal/manifests/compactor_test.go +++ b/operator/internal/manifests/compactor_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/config.go b/operator/internal/manifests/config.go index e212e6d6a30fe..f40a8ad21c54a 100644 --- a/operator/internal/manifests/config.go +++ b/operator/internal/manifests/config.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/config" ) diff --git a/operator/internal/manifests/config_test.go b/operator/internal/manifests/config_test.go index faebb2f73b3a0..ec55aa21bc60b 100644 --- a/operator/internal/manifests/config_test.go +++ b/operator/internal/manifests/config_test.go @@ -12,7 +12,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/config" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/manifests/distributor_test.go b/operator/internal/manifests/distributor_test.go index a3b9e6abc932d..ec10e34472386 100644 --- a/operator/internal/manifests/distributor_test.go +++ b/operator/internal/manifests/distributor_test.go @@ -10,7 +10,7 @@ import ( policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/gateway_tenants.go b/operator/internal/manifests/gateway_tenants.go index f3cf5894515c0..1a4610a94114f 100644 --- a/operator/internal/manifests/gateway_tenants.go +++ b/operator/internal/manifests/gateway_tenants.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/config" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/manifests/gateway_tenants_test.go b/operator/internal/manifests/gateway_tenants_test.go index 68eb6ef48d47c..051b6a653aab8 100644 --- a/operator/internal/manifests/gateway_tenants_test.go +++ b/operator/internal/manifests/gateway_tenants_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/manifests/gateway_test.go b/operator/internal/manifests/gateway_test.go index 393b2f4478483..02ad588974858 100644 --- a/operator/internal/manifests/gateway_test.go +++ b/operator/internal/manifests/gateway_test.go @@ -15,7 +15,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/gateway" "github.com/grafana/loki/operator/internal/manifests/openshift" "github.com/grafana/loki/operator/internal/manifests/storage" diff --git a/operator/internal/manifests/indexgateway_test.go b/operator/internal/manifests/indexgateway_test.go index 93ab7a033e147..35f46ae88777c 100644 --- a/operator/internal/manifests/indexgateway_test.go +++ b/operator/internal/manifests/indexgateway_test.go @@ -9,7 +9,7 @@ import ( policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/ingester_test.go b/operator/internal/manifests/ingester_test.go index 8f5fe728780f3..c491b580ad7cf 100644 --- a/operator/internal/manifests/ingester_test.go +++ b/operator/internal/manifests/ingester_test.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index 5bc4e9d047221..0ce06d606517e 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/utils/ptr" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/internal/config/options.go b/operator/internal/manifests/internal/config/options.go index 78153f0a9f845..c22f0f898fb4c 100644 --- a/operator/internal/manifests/internal/config/options.go +++ b/operator/internal/manifests/internal/config/options.go @@ -7,7 +7,7 @@ import ( "time" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/internal/gateway/build.go b/operator/internal/manifests/internal/gateway/build.go index 41de2a9282fd2..6b2b00c8ae339 100644 --- a/operator/internal/manifests/internal/gateway/build.go +++ b/operator/internal/manifests/internal/gateway/build.go @@ -8,7 +8,7 @@ import ( "github.com/ViaQ/logerr/v2/kverrors" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) const ( diff --git a/operator/internal/manifests/internal/gateway/build_test.go b/operator/internal/manifests/internal/gateway/build_test.go index 77d7fc1873a24..2b089f464ed08 100644 --- a/operator/internal/manifests/internal/gateway/build_test.go +++ b/operator/internal/manifests/internal/gateway/build_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/manifests/internal/gateway/options.go b/operator/internal/manifests/internal/gateway/options.go index eefefedcfbca6..9854f01071f7b 100644 --- a/operator/internal/manifests/internal/gateway/options.go +++ b/operator/internal/manifests/internal/gateway/options.go @@ -1,7 +1,7 @@ package gateway import ( - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/manifests/internal/rules/marshal.go b/operator/internal/manifests/internal/rules/marshal.go index 192f7d8ba7ef4..288faf3b35e29 100644 --- a/operator/internal/manifests/internal/rules/marshal.go +++ b/operator/internal/manifests/internal/rules/marshal.go @@ -4,7 +4,7 @@ import ( "github.com/ViaQ/logerr/v2/kverrors" "gopkg.in/yaml.v2" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) const tenantLabel = "tenantId" diff --git a/operator/internal/manifests/internal/rules/marshal_test.go b/operator/internal/manifests/internal/rules/marshal_test.go index 1620f050a7652..f9f14580470a5 100644 --- a/operator/internal/manifests/internal/rules/marshal_test.go +++ b/operator/internal/manifests/internal/rules/marshal_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/rules" ) diff --git a/operator/internal/manifests/internal/sizes.go b/operator/internal/manifests/internal/sizes.go index 4962e4b3e762c..0501aba60ea1e 100644 --- a/operator/internal/manifests/internal/sizes.go +++ b/operator/internal/manifests/internal/sizes.go @@ -4,7 +4,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // ComponentResources is a map of component->requests/limits diff --git a/operator/internal/manifests/memberlist.go b/operator/internal/manifests/memberlist.go index dd279b3b48e47..451ce39618edd 100644 --- a/operator/internal/manifests/memberlist.go +++ b/operator/internal/manifests/memberlist.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // BuildLokiGossipRingService creates a k8s service for the gossip/memberlist members of the cluster diff --git a/operator/internal/manifests/memberlist_test.go b/operator/internal/manifests/memberlist_test.go index f7d2b0686f518..e9bfbded964fa 100644 --- a/operator/internal/manifests/memberlist_test.go +++ b/operator/internal/manifests/memberlist_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestConfigureHashRingEnv_UseDefaults_NoHashRingSpec(t *testing.T) { diff --git a/operator/internal/manifests/node_placement.go b/operator/internal/manifests/node_placement.go index 7a74cc877225b..f965a093458b2 100644 --- a/operator/internal/manifests/node_placement.go +++ b/operator/internal/manifests/node_placement.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) const ( diff --git a/operator/internal/manifests/node_placement_test.go b/operator/internal/manifests/node_placement_test.go index 73497840bc5d3..a400ad50d0bfc 100644 --- a/operator/internal/manifests/node_placement_test.go +++ b/operator/internal/manifests/node_placement_test.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/openshift/alertingrule.go b/operator/internal/manifests/openshift/alertingrule.go index e4869e9f7ca5c..5d03db6d0f924 100644 --- a/operator/internal/manifests/openshift/alertingrule.go +++ b/operator/internal/manifests/openshift/alertingrule.go @@ -1,6 +1,6 @@ package openshift -import lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" +import lokiv1 "github.com/grafana/loki/operator/api/loki/v1" func AlertingRuleTenantLabels(ar *lokiv1.AlertingRule) { switch ar.Spec.TenantID { diff --git a/operator/internal/manifests/openshift/alertingrule_test.go b/operator/internal/manifests/openshift/alertingrule_test.go index 89519af3cb14f..afd50dc3d2d73 100644 --- a/operator/internal/manifests/openshift/alertingrule_test.go +++ b/operator/internal/manifests/openshift/alertingrule_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestAlertingRuleTenantLabels(t *testing.T) { diff --git a/operator/internal/manifests/openshift/build_test.go b/operator/internal/manifests/openshift/build_test.go index 9cf050ed92fab..5ce0cba1473c2 100644 --- a/operator/internal/manifests/openshift/build_test.go +++ b/operator/internal/manifests/openshift/build_test.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestBuildGatewayTenantModeObjects_ClusterRoleRefMatches(t *testing.T) { diff --git a/operator/internal/manifests/openshift/configure.go b/operator/internal/manifests/openshift/configure.go index cac8dc77c64f4..75ecc65973bf5 100644 --- a/operator/internal/manifests/openshift/configure.go +++ b/operator/internal/manifests/openshift/configure.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/config" ) diff --git a/operator/internal/manifests/openshift/opa_openshift.go b/operator/internal/manifests/openshift/opa_openshift.go index ccf5eac09b7a7..bc804c11b11ed 100644 --- a/operator/internal/manifests/openshift/opa_openshift.go +++ b/operator/internal/manifests/openshift/opa_openshift.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) const ( diff --git a/operator/internal/manifests/openshift/options.go b/operator/internal/manifests/openshift/options.go index 7cba773841b82..2d6276446dfb8 100644 --- a/operator/internal/manifests/openshift/options.go +++ b/operator/internal/manifests/openshift/options.go @@ -5,7 +5,7 @@ import ( "math/rand" "time" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/config" ) diff --git a/operator/internal/manifests/openshift/recordingrule.go b/operator/internal/manifests/openshift/recordingrule.go index 97be1bb4a17ec..8e8a0eccfa6de 100644 --- a/operator/internal/manifests/openshift/recordingrule.go +++ b/operator/internal/manifests/openshift/recordingrule.go @@ -1,6 +1,6 @@ package openshift -import lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" +import lokiv1 "github.com/grafana/loki/operator/api/loki/v1" func RecordingRuleTenantLabels(r *lokiv1.RecordingRule) { switch r.Spec.TenantID { diff --git a/operator/internal/manifests/openshift/recordingrule_test.go b/operator/internal/manifests/openshift/recordingrule_test.go index 16e95b2310a65..901913dac2944 100644 --- a/operator/internal/manifests/openshift/recordingrule_test.go +++ b/operator/internal/manifests/openshift/recordingrule_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestRecordingRuleTenantLabels(t *testing.T) { diff --git a/operator/internal/manifests/options.go b/operator/internal/manifests/options.go index f16abaab4d41d..c3e627b047003 100644 --- a/operator/internal/manifests/options.go +++ b/operator/internal/manifests/options.go @@ -5,7 +5,7 @@ import ( "time" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal" "github.com/grafana/loki/operator/internal/manifests/internal/config" "github.com/grafana/loki/operator/internal/manifests/openshift" diff --git a/operator/internal/manifests/options_test.go b/operator/internal/manifests/options_test.go index d6fe7c5c19d4a..06cf1cb41ec2c 100644 --- a/operator/internal/manifests/options_test.go +++ b/operator/internal/manifests/options_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/config" ) diff --git a/operator/internal/manifests/proxy_env.go b/operator/internal/manifests/proxy_env.go index e0bc1841ace49..21e564d8a0d1c 100644 --- a/operator/internal/manifests/proxy_env.go +++ b/operator/internal/manifests/proxy_env.go @@ -6,7 +6,7 @@ import ( "github.com/imdario/mergo" corev1 "k8s.io/api/core/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) const ( diff --git a/operator/internal/manifests/proxy_env_test.go b/operator/internal/manifests/proxy_env_test.go index 9a780dfe48be4..a12e0d7bccdb0 100644 --- a/operator/internal/manifests/proxy_env_test.go +++ b/operator/internal/manifests/proxy_env_test.go @@ -8,7 +8,7 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestContainerEnvVars_ReadVarsFromCustomResource(t *testing.T) { diff --git a/operator/internal/manifests/querier_test.go b/operator/internal/manifests/querier_test.go index ff3e0ccd45630..565e4f82a4803 100644 --- a/operator/internal/manifests/querier_test.go +++ b/operator/internal/manifests/querier_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/query-frontend_test.go b/operator/internal/manifests/query-frontend_test.go index d11fb968ce3ac..a29ee5e4977eb 100644 --- a/operator/internal/manifests/query-frontend_test.go +++ b/operator/internal/manifests/query-frontend_test.go @@ -9,7 +9,7 @@ import ( policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/ruler.go b/operator/internal/manifests/ruler.go index bcf0c18e6e739..76e451c6f266c 100644 --- a/operator/internal/manifests/ruler.go +++ b/operator/internal/manifests/ruler.go @@ -14,7 +14,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/config" "github.com/grafana/loki/operator/internal/manifests/openshift" "github.com/grafana/loki/operator/internal/manifests/storage" diff --git a/operator/internal/manifests/ruler_test.go b/operator/internal/manifests/ruler_test.go index b753dc090de8c..866a40b6c10e8 100644 --- a/operator/internal/manifests/ruler_test.go +++ b/operator/internal/manifests/ruler_test.go @@ -10,7 +10,7 @@ import ( policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/openshift" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/rules_config.go b/operator/internal/manifests/rules_config.go index 1640aedc4f10c..5cc4a3772ae3e 100644 --- a/operator/internal/manifests/rules_config.go +++ b/operator/internal/manifests/rules_config.go @@ -6,7 +6,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/internal/rules" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/manifests/rules_config_test.go b/operator/internal/manifests/rules_config_test.go index 338fab231644e..c164c60cd5b4c 100644 --- a/operator/internal/manifests/rules_config_test.go +++ b/operator/internal/manifests/rules_config_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestRulesConfigMap_ReturnsDataEntriesPerRule(t *testing.T) { diff --git a/operator/internal/manifests/service_monitor_test.go b/operator/internal/manifests/service_monitor_test.go index 6598453027396..4cf1979b51993 100644 --- a/operator/internal/manifests/service_monitor_test.go +++ b/operator/internal/manifests/service_monitor_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/utils/ptr" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // Test that all serviceMonitor match the labels of their services so that we know all serviceMonitor diff --git a/operator/internal/manifests/service_test.go b/operator/internal/manifests/service_test.go index 7f033abcb9344..87dc987d2d802 100644 --- a/operator/internal/manifests/service_test.go +++ b/operator/internal/manifests/service_test.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" configv1 "github.com/grafana/loki/operator/api/config/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // Test that the service ports have matching deployment/statefulset/daemonset ports on the podspec. diff --git a/operator/internal/manifests/serviceaccount_test.go b/operator/internal/manifests/serviceaccount_test.go index dc08b62f700c0..1a6046280fcf9 100644 --- a/operator/internal/manifests/serviceaccount_test.go +++ b/operator/internal/manifests/serviceaccount_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/storage" ) diff --git a/operator/internal/manifests/storage/configure.go b/operator/internal/manifests/storage/configure.go index b1c8a0df955a9..ce6fa78273349 100644 --- a/operator/internal/manifests/storage/configure.go +++ b/operator/internal/manifests/storage/configure.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) var ( diff --git a/operator/internal/manifests/storage/configure_test.go b/operator/internal/manifests/storage/configure_test.go index 804ca1d52bb02..3080f924c11cf 100644 --- a/operator/internal/manifests/storage/configure_test.go +++ b/operator/internal/manifests/storage/configure_test.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestConfigureDeploymentForStorageType(t *testing.T) { diff --git a/operator/internal/manifests/storage/options.go b/operator/internal/manifests/storage/options.go index 1adb80235b097..59618953d1f92 100644 --- a/operator/internal/manifests/storage/options.go +++ b/operator/internal/manifests/storage/options.go @@ -1,7 +1,7 @@ package storage import ( - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // Options is used to configure Loki to integrate with diff --git a/operator/internal/manifests/storage/schema.go b/operator/internal/manifests/storage/schema.go index a36f4c46c6598..c9cf737a4a2ae 100644 --- a/operator/internal/manifests/storage/schema.go +++ b/operator/internal/manifests/storage/schema.go @@ -6,7 +6,7 @@ import ( "github.com/ViaQ/logerr/v2/kverrors" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/validation" ) diff --git a/operator/internal/manifests/storage/schema_test.go b/operator/internal/manifests/storage/schema_test.go index c3ca914658f9e..7490ae5aeb002 100644 --- a/operator/internal/manifests/storage/schema_test.go +++ b/operator/internal/manifests/storage/schema_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestBuildSchemaConfig_NoSchemas(t *testing.T) { diff --git a/operator/internal/manifests/var.go b/operator/internal/manifests/var.go index 46a4516ced94c..9e501ee72ae99 100644 --- a/operator/internal/manifests/var.go +++ b/operator/internal/manifests/var.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests/openshift" ) diff --git a/operator/internal/metrics/lokistack.go b/operator/internal/metrics/lokistack.go index 7bdc966024956..c321562ecec86 100644 --- a/operator/internal/metrics/lokistack.go +++ b/operator/internal/metrics/lokistack.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) const ( diff --git a/operator/internal/metrics/lokistack_test.go b/operator/internal/metrics/lokistack_test.go index 061b349c4e0e6..ba12439fa6edc 100644 --- a/operator/internal/metrics/lokistack_test.go +++ b/operator/internal/metrics/lokistack_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/status/components.go b/operator/internal/status/components.go index 3e59f8a198556..78f26572831ce 100644 --- a/operator/internal/status/components.go +++ b/operator/internal/status/components.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/status/components_test.go b/operator/internal/status/components_test.go index 0132ac772a358..2606d704c4188 100644 --- a/operator/internal/status/components_test.go +++ b/operator/internal/status/components_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/status/conditions_test.go b/operator/internal/status/conditions_test.go index e011b8406460a..5cb16eb2162b9 100644 --- a/operator/internal/status/conditions_test.go +++ b/operator/internal/status/conditions_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestMergeConditions(t *testing.T) { diff --git a/operator/internal/status/lokistack.go b/operator/internal/status/lokistack.go index 17d81ab01d3aa..d32036a37f2bc 100644 --- a/operator/internal/status/lokistack.go +++ b/operator/internal/status/lokistack.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/status/lokistack_test.go b/operator/internal/status/lokistack_test.go index d3ae5e4839436..1ec64dc20c898 100644 --- a/operator/internal/status/lokistack_test.go +++ b/operator/internal/status/lokistack_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" ) diff --git a/operator/internal/status/status.go b/operator/internal/status/status.go index c544695d3d2ea..ca86e02d6434d 100644 --- a/operator/internal/status/status.go +++ b/operator/internal/status/status.go @@ -10,7 +10,7 @@ import ( "k8s.io/client-go/util/retry" ctrl "sigs.k8s.io/controller-runtime" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/status/status_test.go b/operator/internal/status/status_test.go index 58978f49f7745..9028fc95b99a7 100644 --- a/operator/internal/status/status_test.go +++ b/operator/internal/status/status_test.go @@ -12,7 +12,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/manifests" ) diff --git a/operator/internal/status/storage.go b/operator/internal/status/storage.go index 620b5d4eeb364..066fe113fa520 100644 --- a/operator/internal/status/storage.go +++ b/operator/internal/status/storage.go @@ -7,7 +7,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" ctrl "sigs.k8s.io/controller-runtime" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s" ) diff --git a/operator/internal/status/storage_test.go b/operator/internal/status/storage_test.go index 86ea6641b4739..8924a7808d609 100644 --- a/operator/internal/status/storage_test.go +++ b/operator/internal/status/storage_test.go @@ -12,7 +12,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/external/k8s/k8sfakes" "github.com/grafana/loki/operator/internal/status" ) diff --git a/operator/internal/validation/alertingrule.go b/operator/internal/validation/alertingrule.go index d72f0b1ae8d95..59727737ce914 100644 --- a/operator/internal/validation/alertingrule.go +++ b/operator/internal/validation/alertingrule.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) var _ admission.CustomValidator = &AlertingRuleValidator{} diff --git a/operator/internal/validation/alertingrule_test.go b/operator/internal/validation/alertingrule_test.go index 6eac5be9a25c0..fa29ecd252054 100644 --- a/operator/internal/validation/alertingrule_test.go +++ b/operator/internal/validation/alertingrule_test.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/validation" ) diff --git a/operator/internal/validation/lokistack.go b/operator/internal/validation/lokistack.go index e6c84458c0802..12fe94a36960e 100644 --- a/operator/internal/validation/lokistack.go +++ b/operator/internal/validation/lokistack.go @@ -12,7 +12,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // objectStorageSchemaMap defines the type for mapping a schema version with a date diff --git a/operator/internal/validation/lokistack_test.go b/operator/internal/validation/lokistack_test.go index 791447e013018..f0e9e6d0274ae 100644 --- a/operator/internal/validation/lokistack_test.go +++ b/operator/internal/validation/lokistack_test.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/validation" ) diff --git a/operator/internal/validation/openshift/alertingrule.go b/operator/internal/validation/openshift/alertingrule.go index cb22f1785895e..e9dc191597e0b 100644 --- a/operator/internal/validation/openshift/alertingrule.go +++ b/operator/internal/validation/openshift/alertingrule.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/utils/strings/slices" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // AlertingRuleValidator does extended-validation of AlertingRule resources for Openshift-based deployments. diff --git a/operator/internal/validation/openshift/alertingrule_test.go b/operator/internal/validation/openshift/alertingrule_test.go index c613de51df0fa..1644f7e10bd3e 100644 --- a/operator/internal/validation/openshift/alertingrule_test.go +++ b/operator/internal/validation/openshift/alertingrule_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestAlertingRuleValidator(t *testing.T) { diff --git a/operator/internal/validation/openshift/common.go b/operator/internal/validation/openshift/common.go index a2b28d5f5f0aa..a41161cbc54f6 100644 --- a/operator/internal/validation/openshift/common.go +++ b/operator/internal/validation/openshift/common.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "k8s.io/apimachinery/pkg/util/validation/field" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) const ( diff --git a/operator/internal/validation/openshift/recordingrule.go b/operator/internal/validation/openshift/recordingrule.go index 6e0d9106c8c35..bb6851058fa6d 100644 --- a/operator/internal/validation/openshift/recordingrule.go +++ b/operator/internal/validation/openshift/recordingrule.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/utils/strings/slices" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) // RecordingRuleValidator does extended-validation of RecordingRule resources for Openshift-based deployments. diff --git a/operator/internal/validation/openshift/recordingrule_test.go b/operator/internal/validation/openshift/recordingrule_test.go index 99540f2937c42..e51ab748c82cf 100644 --- a/operator/internal/validation/openshift/recordingrule_test.go +++ b/operator/internal/validation/openshift/recordingrule_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) func TestRecordingRuleValidator(t *testing.T) { diff --git a/operator/internal/validation/recordingrule.go b/operator/internal/validation/recordingrule.go index a84011efd2de8..a5b2a803af23e 100644 --- a/operator/internal/validation/recordingrule.go +++ b/operator/internal/validation/recordingrule.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) var _ admission.CustomValidator = &RecordingRuleValidator{} diff --git a/operator/internal/validation/recordingrule_test.go b/operator/internal/validation/recordingrule_test.go index 6b47ef0d6d8d7..fd79def757ed6 100644 --- a/operator/internal/validation/recordingrule_test.go +++ b/operator/internal/validation/recordingrule_test.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/validation" ) diff --git a/operator/internal/validation/rulerconfig.go b/operator/internal/validation/rulerconfig.go index 9e4ab0b0b8297..3a9c51282887c 100644 --- a/operator/internal/validation/rulerconfig.go +++ b/operator/internal/validation/rulerconfig.go @@ -11,7 +11,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" ) var _ admission.CustomValidator = &RulerConfigValidator{} diff --git a/operator/internal/validation/rulerconfig_test.go b/operator/internal/validation/rulerconfig_test.go index 4ed8757cabdbd..32097460dae8e 100644 --- a/operator/internal/validation/rulerconfig_test.go +++ b/operator/internal/validation/rulerconfig_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/utils/ptr" - lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" + lokiv1 "github.com/grafana/loki/operator/api/loki/v1" "github.com/grafana/loki/operator/internal/validation" ) From 4d7e0f620129a95ecb01e029ccdc7d2f485b252f Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Tue, 22 Oct 2024 12:39:54 +0200 Subject: [PATCH 2/2] Fix docs config --- operator/config/docs/config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/operator/config/docs/config.json b/operator/config/docs/config.json index 295dcf5a99b57..c646667f25840 100644 --- a/operator/config/docs/config.json +++ b/operator/config/docs/config.json @@ -51,9 +51,9 @@ "k8s.io/apimachinery/pkg/apis/": "Kubernetes ", "k8s.io/component-base/config/": "Kubernetes ", "sigs.k8s.io/controller-runtime/pkg/config/": "K8S Controller-runtime ", - "github.com/grafana/loki/operator/apis/loki/v1": "Loki Operator v1", - "github.com/grafana/loki/operator/apis/loki/v1beta1": "Loki Operator v1beta1", - "github.com/grafana/loki/operator/apis/loki/config/v1": "Feature Gates" + "github.com/grafana/loki/operator/api/loki/v1": "Loki Operator v1", + "github.com/grafana/loki/operator/api/loki/v1beta1": "Loki Operator v1beta1", + "github.com/grafana/loki/operator/api/loki/config/v1": "Feature Gates" }, "markdownDisabled": false }