diff --git a/Makefile b/Makefile index 70464e8cc..84b08398b 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ test: manifests generate fmt setup-envtest ## Run tests. .PHONY: build build: generate fmt ## Build manager binary. - CGO_ENABLED=0 go build -o bin/manager -ldflags ${LD_FLAGS} main.go + CGO_ENABLED=0 go build -o bin/manager -ldflags ${LD_FLAGS} cmd/main.go .PHONY: must-gather must-gather: @@ -164,7 +164,7 @@ run: manifests generate ## Run a controller from your host. RELATED_IMAGE_TEMPO_GATEWAY=$(TEMPO_GATEWAY_IMAGE) \ RELATED_IMAGE_TEMPO_GATEWAY_OPA=$(TEMPO_GATEWAY_OPA_IMAGE) \ RELATED_IMAGE_OAUTH_PROXY=$(OAUTH_PROXY_IMAGE) \ - go run -ldflags ${LD_FLAGS} ./main.go --zap-log-level=info start + go run -ldflags ${LD_FLAGS} ./cmd/main.go --zap-log-level=info start .PHONY: container-must-gather container-must-gather: @@ -223,10 +223,10 @@ $(LOCALBIN): ## Tool Versions KUSTOMIZE_VERSION ?= v5.0.3 -CONTROLLER_GEN_VERSION ?= v0.15.0 +CONTROLLER_GEN_VERSION ?= v0.16.5 GEN_API_DOCS_VERSION ?= v0.6.0 ENVTEST_VERSION ?= latest -OPERATOR_SDK_VERSION ?= 1.32.0 +OPERATOR_SDK_VERSION ?= 1.33.0 OLM_VERSION ?= v0.28.0 CERTMANAGER_VERSION ?= 1.9.1 CHAINSAW_VERSION ?= v0.2.4 @@ -488,7 +488,7 @@ docs/spec/%: bundle/community/manifests/% | gen-api-docs $(GEN_API_DOCS) < $^ > $@ docs/operator/config.yaml: gen-api-docs - $(GEN_API_DOCS) -pkg github.com/grafana/tempo-operator/apis/config/v1alpha1 -type ProjectConfig -format multiline > $@ + $(GEN_API_DOCS) -pkg github.com/grafana/tempo-operator/api/config/v1alpha1 -type ProjectConfig -format multiline > $@ ##@ Release CHLOGGEN_VERSION=v0.11.0 diff --git a/PROJECT b/PROJECT index cf3097871..ba86c0d62 100644 --- a/PROJECT +++ b/PROJECT @@ -1,6 +1,6 @@ domain: grafana.com layout: -- go.kubebuilder.io/v3 +- go.kubebuilder.io/v4 multigroup: true plugins: manifests.sdk.operatorframework.io/v2: {} diff --git a/apis/config/v1alpha1/doc.go b/api/config/v1alpha1/doc.go similarity index 100% rename from apis/config/v1alpha1/doc.go rename to api/config/v1alpha1/doc.go diff --git a/apis/config/v1alpha1/groupversion_info.go b/api/config/v1alpha1/groupversion_info.go similarity index 100% rename from apis/config/v1alpha1/groupversion_info.go rename to api/config/v1alpha1/groupversion_info.go diff --git a/apis/config/v1alpha1/projectconfig_types.go b/api/config/v1alpha1/projectconfig_types.go similarity index 100% rename from apis/config/v1alpha1/projectconfig_types.go rename to api/config/v1alpha1/projectconfig_types.go diff --git a/apis/config/v1alpha1/projectconfig_validation.go b/api/config/v1alpha1/projectconfig_validation.go similarity index 100% rename from apis/config/v1alpha1/projectconfig_validation.go rename to api/config/v1alpha1/projectconfig_validation.go diff --git a/apis/config/v1alpha1/projectconfig_validation_test.go b/api/config/v1alpha1/projectconfig_validation_test.go similarity index 100% rename from apis/config/v1alpha1/projectconfig_validation_test.go rename to api/config/v1alpha1/projectconfig_validation_test.go diff --git a/apis/config/v1alpha1/zz_generated.deepcopy.go b/api/config/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from apis/config/v1alpha1/zz_generated.deepcopy.go rename to api/config/v1alpha1/zz_generated.deepcopy.go diff --git a/apis/tempo/register.go b/api/tempo/register.go similarity index 100% rename from apis/tempo/register.go rename to api/tempo/register.go diff --git a/apis/tempo/v1alpha1/auth.go b/api/tempo/v1alpha1/auth.go similarity index 100% rename from apis/tempo/v1alpha1/auth.go rename to api/tempo/v1alpha1/auth.go diff --git a/apis/tempo/v1alpha1/common_types.go b/api/tempo/v1alpha1/common_types.go similarity index 100% rename from apis/tempo/v1alpha1/common_types.go rename to api/tempo/v1alpha1/common_types.go diff --git a/apis/tempo/v1alpha1/doc.go b/api/tempo/v1alpha1/doc.go similarity index 100% rename from apis/tempo/v1alpha1/doc.go rename to api/tempo/v1alpha1/doc.go diff --git a/apis/tempo/v1alpha1/groupversion_info.go b/api/tempo/v1alpha1/groupversion_info.go similarity index 100% rename from apis/tempo/v1alpha1/groupversion_info.go rename to api/tempo/v1alpha1/groupversion_info.go diff --git a/apis/tempo/v1alpha1/ingress_types.go b/api/tempo/v1alpha1/ingress_types.go similarity index 100% rename from apis/tempo/v1alpha1/ingress_types.go rename to api/tempo/v1alpha1/ingress_types.go diff --git a/apis/tempo/v1alpha1/tempomonolithic_defaults.go b/api/tempo/v1alpha1/tempomonolithic_defaults.go similarity index 97% rename from apis/tempo/v1alpha1/tempomonolithic_defaults.go rename to api/tempo/v1alpha1/tempomonolithic_defaults.go index 148422d60..a7d7e071c 100644 --- a/apis/tempo/v1alpha1/tempomonolithic_defaults.go +++ b/api/tempo/v1alpha1/tempomonolithic_defaults.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) var ( diff --git a/apis/tempo/v1alpha1/tempomonolithic_defaults_test.go b/api/tempo/v1alpha1/tempomonolithic_defaults_test.go similarity index 99% rename from apis/tempo/v1alpha1/tempomonolithic_defaults_test.go rename to api/tempo/v1alpha1/tempomonolithic_defaults_test.go index 0768c3688..dc15844e4 100644 --- a/apis/tempo/v1alpha1/tempomonolithic_defaults_test.go +++ b/api/tempo/v1alpha1/tempomonolithic_defaults_test.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) var ( diff --git a/apis/tempo/v1alpha1/tempomonolithic_types.go b/api/tempo/v1alpha1/tempomonolithic_types.go similarity index 100% rename from apis/tempo/v1alpha1/tempomonolithic_types.go rename to api/tempo/v1alpha1/tempomonolithic_types.go diff --git a/apis/tempo/v1alpha1/tempostack_types.go b/api/tempo/v1alpha1/tempostack_types.go similarity index 99% rename from apis/tempo/v1alpha1/tempostack_types.go rename to api/tempo/v1alpha1/tempostack_types.go index 8a9103e12..a10f68eeb 100644 --- a/apis/tempo/v1alpha1/tempostack_types.go +++ b/api/tempo/v1alpha1/tempostack_types.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/config/v1alpha1" + "github.com/grafana/tempo-operator/api/config/v1alpha1" ) // ManagementStateType defines the type for CR management states. diff --git a/apis/tempo/v1alpha1/zz_generated.deepcopy.go b/api/tempo/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from apis/tempo/v1alpha1/zz_generated.deepcopy.go rename to api/tempo/v1alpha1/zz_generated.deepcopy.go diff --git a/bundle/community/bundle.Dockerfile b/bundle/community/bundle.Dockerfile index 3b77d3543..4fb824e90 100644 --- a/bundle/community/bundle.Dockerfile +++ b/bundle/community/bundle.Dockerfile @@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=tempo-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml index 2c9f15a27..d79d4577f 100644 --- a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml @@ -74,13 +74,13 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 - createdAt: "2024-11-06T14:25:14Z" + createdAt: "2024-11-18T01:29:19Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: tempo-operator-system - operators.operatorframework.io/builder: operator-sdk-v1.32.0 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 + operators.operatorframework.io/builder: operator-sdk-v1.33.0 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG name: tempo-operator.v0.14.1 @@ -1253,6 +1253,13 @@ spec: verbs: - create - patch + - apiGroups: + - "" + resources: + - persistentvolumeclaims + verbs: + - list + - watch - apiGroups: - apps resources: @@ -1289,13 +1296,6 @@ spec: - get - list - watch - - apiGroups: - - "" - resources: - - persistentvolumeclaims - verbs: - - list - - watch - apiGroups: - grafana.integreatly.org resources: @@ -1370,31 +1370,6 @@ spec: - tempo.grafana.com resources: - tempomonolithics - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - tempo.grafana.com - resources: - - tempomonolithics/finalizers - verbs: - - update - - apiGroups: - - tempo.grafana.com - resources: - - tempomonolithics/status - verbs: - - get - - patch - - update - - apiGroups: - - tempo.grafana.com - resources: - tempostacks verbs: - create @@ -1407,12 +1382,14 @@ spec: - apiGroups: - tempo.grafana.com resources: + - tempomonolithics/finalizers - tempostacks/finalizers verbs: - update - apiGroups: - tempo.grafana.com resources: + - tempomonolithics/status - tempostacks/status verbs: - get diff --git a/bundle/community/manifests/tempo.grafana.com_tempomonolithics.yaml b/bundle/community/manifests/tempo.grafana.com_tempomonolithics.yaml index 6d285729c..68dc52397 100644 --- a/bundle/community/manifests/tempo.grafana.com_tempomonolithics.yaml +++ b/bundle/community/manifests/tempo.grafana.com_tempomonolithics.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.5 creationTimestamp: null labels: app.kubernetes.io/managed-by: operator-lifecycle-manager @@ -966,7 +966,6 @@ spec: description: |- TLS defines the TLS configuration for OTLP/gRPC ingestion. - On OpenShift when operator config `servingCertsService` and TLS is enabled but no `certName` and `caName` are provided it will use OpenShift serving certificate service. properties: @@ -1004,7 +1003,6 @@ spec: description: |- TLS defines the TLS configuration for OTLP/HTTP ingestion. - On OpenShift when operator config `servingCertsService` and TLS is enabled but no `certName` and `caName` are provided it will use OpenShift serving certificate service. properties: @@ -1052,11 +1050,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1154,11 +1150,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1392,11 +1386,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1548,11 +1540,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1759,16 +1749,8 @@ spec: conditions: description: Conditions of the Tempo deployment health. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -1809,12 +1791,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml index 68eb5046f..f9fc9b043 100644 --- a/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml +++ b/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.5 creationTimestamp: null labels: app.kubernetes.io/managed-by: operator-lifecycle-manager @@ -322,11 +322,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -507,12 +505,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -599,7 +595,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -688,11 +683,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -783,7 +776,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently, there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -803,12 +795,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -895,7 +885,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -984,11 +973,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -1078,7 +1065,6 @@ spec: description: |- TLS defines TLS configuration for distributor receivers - If openshift feature flag `servingCertsService` is enabled and TLS is enabled but no certName or caName is specified, OpenShift service serving certificates will be used. properties: @@ -1108,7 +1094,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -1128,12 +1113,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1220,7 +1203,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1309,11 +1291,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -1466,12 +1446,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1558,7 +1536,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1647,11 +1624,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1754,12 +1729,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1846,7 +1819,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1935,11 +1907,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -2031,7 +2001,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -2051,12 +2020,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -2143,7 +2110,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -2232,11 +2198,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2344,11 +2308,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2487,11 +2449,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2553,11 +2513,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2751,6 +2709,7 @@ spec: Defaults to 30 seconds. type: string required: + - managementState - storage type: object status: @@ -2813,16 +2772,8 @@ spec: conditions: description: Conditions of the Tempo deployment health. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -2863,12 +2814,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/bundle/community/metadata/annotations.yaml b/bundle/community/metadata/annotations.yaml index 6ee5fdc49..86b5886f0 100644 --- a/bundle/community/metadata/annotations.yaml +++ b/bundle/community/metadata/annotations.yaml @@ -5,9 +5,9 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: tempo-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 diff --git a/bundle/openshift/bundle.Dockerfile b/bundle/openshift/bundle.Dockerfile index 3b77d3543..4fb824e90 100644 --- a/bundle/openshift/bundle.Dockerfile +++ b/bundle/openshift/bundle.Dockerfile @@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=tempo-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml index b62e83a47..ccb90e6b6 100644 --- a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml @@ -74,13 +74,13 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 - createdAt: "2024-11-06T14:25:12Z" + createdAt: "2024-11-18T01:29:18Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: tempo-operator-system - operators.operatorframework.io/builder: operator-sdk-v1.32.0 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 + operators.operatorframework.io/builder: operator-sdk-v1.33.0 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG name: tempo-operator.v0.14.1 @@ -1263,6 +1263,13 @@ spec: verbs: - create - patch + - apiGroups: + - "" + resources: + - persistentvolumeclaims + verbs: + - list + - watch - apiGroups: - apps resources: @@ -1299,13 +1306,6 @@ spec: - get - list - watch - - apiGroups: - - "" - resources: - - persistentvolumeclaims - verbs: - - list - - watch - apiGroups: - grafana.integreatly.org resources: @@ -1380,31 +1380,6 @@ spec: - tempo.grafana.com resources: - tempomonolithics - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - tempo.grafana.com - resources: - - tempomonolithics/finalizers - verbs: - - update - - apiGroups: - - tempo.grafana.com - resources: - - tempomonolithics/status - verbs: - - get - - patch - - update - - apiGroups: - - tempo.grafana.com - resources: - tempostacks verbs: - create @@ -1417,12 +1392,14 @@ spec: - apiGroups: - tempo.grafana.com resources: + - tempomonolithics/finalizers - tempostacks/finalizers verbs: - update - apiGroups: - tempo.grafana.com resources: + - tempomonolithics/status - tempostacks/status verbs: - get diff --git a/bundle/openshift/manifests/tempo.grafana.com_tempomonolithics.yaml b/bundle/openshift/manifests/tempo.grafana.com_tempomonolithics.yaml index 6d285729c..68dc52397 100644 --- a/bundle/openshift/manifests/tempo.grafana.com_tempomonolithics.yaml +++ b/bundle/openshift/manifests/tempo.grafana.com_tempomonolithics.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.5 creationTimestamp: null labels: app.kubernetes.io/managed-by: operator-lifecycle-manager @@ -966,7 +966,6 @@ spec: description: |- TLS defines the TLS configuration for OTLP/gRPC ingestion. - On OpenShift when operator config `servingCertsService` and TLS is enabled but no `certName` and `caName` are provided it will use OpenShift serving certificate service. properties: @@ -1004,7 +1003,6 @@ spec: description: |- TLS defines the TLS configuration for OTLP/HTTP ingestion. - On OpenShift when operator config `servingCertsService` and TLS is enabled but no `certName` and `caName` are provided it will use OpenShift serving certificate service. properties: @@ -1052,11 +1050,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1154,11 +1150,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1392,11 +1386,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1548,11 +1540,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1759,16 +1749,8 @@ spec: conditions: description: Conditions of the Tempo deployment health. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -1809,12 +1791,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml index 68eb5046f..f9fc9b043 100644 --- a/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml +++ b/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.5 creationTimestamp: null labels: app.kubernetes.io/managed-by: operator-lifecycle-manager @@ -322,11 +322,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -507,12 +505,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -599,7 +595,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -688,11 +683,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -783,7 +776,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently, there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -803,12 +795,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -895,7 +885,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -984,11 +973,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -1078,7 +1065,6 @@ spec: description: |- TLS defines TLS configuration for distributor receivers - If openshift feature flag `servingCertsService` is enabled and TLS is enabled but no certName or caName is specified, OpenShift service serving certificates will be used. properties: @@ -1108,7 +1094,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -1128,12 +1113,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1220,7 +1203,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1309,11 +1291,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -1466,12 +1446,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1558,7 +1536,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1647,11 +1624,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1754,12 +1729,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1846,7 +1819,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1935,11 +1907,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -2031,7 +2001,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -2051,12 +2020,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -2143,7 +2110,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -2232,11 +2198,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2344,11 +2308,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2487,11 +2449,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2553,11 +2513,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2751,6 +2709,7 @@ spec: Defaults to 30 seconds. type: string required: + - managementState - storage type: object status: @@ -2813,16 +2772,8 @@ spec: conditions: description: Conditions of the Tempo deployment health. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -2863,12 +2814,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/bundle/openshift/metadata/annotations.yaml b/bundle/openshift/metadata/annotations.yaml index 6ee5fdc49..86b5886f0 100644 --- a/bundle/openshift/metadata/annotations.yaml +++ b/bundle/openshift/metadata/annotations.yaml @@ -5,9 +5,9 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: tempo-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 diff --git a/cmd/gather/cluster/cluster.go b/cmd/gather/cluster/cluster.go index c1f6b9c33..216bba1f0 100644 --- a/cmd/gather/cluster/cluster.go +++ b/cmd/gather/cluster/cluster.go @@ -18,7 +18,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - tempov1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + tempov1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/cmd/gather/config" routev1 "github.com/openshift/api/route/v1" diff --git a/cmd/gather/cluster/write.go b/cmd/gather/cluster/write.go index 5a9fe7a21..770ac9a18 100644 --- a/cmd/gather/cluster/write.go +++ b/cmd/gather/cluster/write.go @@ -17,7 +17,7 @@ import ( cgocorev1 "k8s.io/client-go/kubernetes/typed/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - tempov1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + tempov1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func createTempoStackFolder(collectionDir string, tempoStack *tempov1alpha1.TempoStack) (string, error) { diff --git a/cmd/gather/main.go b/cmd/gather/main.go index ea358bbe6..7579fd5fb 100644 --- a/cmd/gather/main.go +++ b/cmd/gather/main.go @@ -31,7 +31,7 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - tempov1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + tempov1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/cmd/gather/cluster" "github.com/grafana/tempo-operator/cmd/gather/config" diff --git a/cmd/generate/main.go b/cmd/generate/main.go index 2d2521933..02bdcd2fd 100644 --- a/cmd/generate/main.go +++ b/cmd/generate/main.go @@ -15,8 +15,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" - "github.com/grafana/tempo-operator/cmd" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" + "github.com/grafana/tempo-operator/cmd/root" "github.com/grafana/tempo-operator/internal/manifests" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/webhooks" @@ -105,7 +105,7 @@ func toYAMLManifest(scheme *runtime.Scheme, objects []client.Object, out io.Writ } func generate(c *cobra.Command, crPath string, outPath string, params manifestutils.Params) error { - rootCmdConfig := c.Context().Value(cmd.RootConfigKey{}).(cmd.RootConfig) + rootCmdConfig := c.Context().Value(root.RootConfigKey{}).(root.RootConfig) options := rootCmdConfig.Options var specReader io.Reader @@ -176,7 +176,7 @@ func NewGenerateCommand() *cobra.Command { Use: "generate", Short: "Generate YAML manifests from a Tempo CR", RunE: func(c *cobra.Command, args []string) error { - rootCmdConfig := c.Context().Value(cmd.RootConfigKey{}).(cmd.RootConfig) + rootCmdConfig := c.Context().Value(root.RootConfigKey{}).(root.RootConfig) params := manifestutils.Params{ CtrlConfig: rootCmdConfig.CtrlConfig, } diff --git a/cmd/generate/main_test.go b/cmd/generate/main_test.go index 2a73ec05a..f64d4cd15 100644 --- a/cmd/generate/main_test.go +++ b/cmd/generate/main_test.go @@ -13,7 +13,7 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" "github.com/grafana/tempo-operator/cmd" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/main.go b/cmd/main.go similarity index 88% rename from main.go rename to cmd/main.go index 8f2662daa..ca54bde01 100644 --- a/main.go +++ b/cmd/main.go @@ -4,15 +4,15 @@ import ( "flag" "os" - "github.com/grafana/tempo-operator/cmd" "github.com/grafana/tempo-operator/cmd/generate" + "github.com/grafana/tempo-operator/cmd/root" "github.com/grafana/tempo-operator/cmd/start" "github.com/grafana/tempo-operator/cmd/version" "github.com/grafana/tempo-operator/internal/logging" ) func main() { - rootCmd := cmd.NewRootCommand() + rootCmd := root.NewRootCommand() rootCmd.AddCommand(start.NewStartCommand()) rootCmd.AddCommand(generate.NewGenerateCommand()) rootCmd.AddCommand(version.NewVersionCommand()) diff --git a/cmd/root.go b/cmd/root/root.go similarity index 94% rename from cmd/root.go rename to cmd/root/root.go index 02741dd1e..1ea1c4133 100644 --- a/cmd/root.go +++ b/cmd/root/root.go @@ -1,4 +1,4 @@ -package cmd +package root import ( "context" @@ -15,8 +15,8 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - tempov1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + tempov1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) var ( diff --git a/cmd/root_test.go b/cmd/root/root_test.go similarity index 94% rename from cmd/root_test.go rename to cmd/root/root_test.go index cca92a3eb..3718af313 100644 --- a/cmd/root_test.go +++ b/cmd/root/root_test.go @@ -1,4 +1,4 @@ -package cmd +package root import ( "context" @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) func TestReadConfig(t *testing.T) { diff --git a/cmd/start/main.go b/cmd/start/main.go index d18c43bee..03fae75e7 100644 --- a/cmd/start/main.go +++ b/cmd/start/main.go @@ -16,9 +16,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/manager" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/cmd" - controllers "github.com/grafana/tempo-operator/controllers/tempo" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/cmd/root" + controllers "github.com/grafana/tempo-operator/internal/controller/tempo" "github.com/grafana/tempo-operator/internal/crdmetrics" "github.com/grafana/tempo-operator/internal/version" "github.com/grafana/tempo-operator/internal/webhooks" @@ -26,7 +26,7 @@ import ( ) func start(c *cobra.Command, args []string) { - rootCmdConfig := c.Context().Value(cmd.RootConfigKey{}).(cmd.RootConfig) + rootCmdConfig := c.Context().Value(root.RootConfigKey{}).(root.RootConfig) ctrlConfig, options := rootCmdConfig.CtrlConfig, rootCmdConfig.Options setupLog := ctrl.Log.WithName("setup") version := version.Get() diff --git a/config/crd/bases/tempo.grafana.com_tempomonolithics.yaml b/config/crd/bases/tempo.grafana.com_tempomonolithics.yaml index 918f93e42..ebf73af55 100644 --- a/config/crd/bases/tempo.grafana.com_tempomonolithics.yaml +++ b/config/crd/bases/tempo.grafana.com_tempomonolithics.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.5 name: tempomonolithics.tempo.grafana.com spec: group: tempo.grafana.com @@ -962,7 +962,6 @@ spec: description: |- TLS defines the TLS configuration for OTLP/gRPC ingestion. - On OpenShift when operator config `servingCertsService` and TLS is enabled but no `certName` and `caName` are provided it will use OpenShift serving certificate service. properties: @@ -1000,7 +999,6 @@ spec: description: |- TLS defines the TLS configuration for OTLP/HTTP ingestion. - On OpenShift when operator config `servingCertsService` and TLS is enabled but no `certName` and `caName` are provided it will use OpenShift serving certificate service. properties: @@ -1048,11 +1046,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1150,11 +1146,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1388,11 +1382,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1544,11 +1536,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1755,16 +1745,8 @@ spec: conditions: description: Conditions of the Tempo deployment health. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -1805,12 +1787,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/config/crd/bases/tempo.grafana.com_tempostacks.yaml b/config/crd/bases/tempo.grafana.com_tempostacks.yaml index 61e06807a..8f7eb94d0 100644 --- a/config/crd/bases/tempo.grafana.com_tempostacks.yaml +++ b/config/crd/bases/tempo.grafana.com_tempostacks.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.5 name: tempostacks.tempo.grafana.com spec: group: tempo.grafana.com @@ -318,11 +318,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -503,12 +501,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -595,7 +591,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -684,11 +679,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -779,7 +772,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently, there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -799,12 +791,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -891,7 +881,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -980,11 +969,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -1074,7 +1061,6 @@ spec: description: |- TLS defines TLS configuration for distributor receivers - If openshift feature flag `servingCertsService` is enabled and TLS is enabled but no certName or caName is specified, OpenShift service serving certificates will be used. properties: @@ -1104,7 +1090,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -1124,12 +1109,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1216,7 +1199,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1305,11 +1287,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -1462,12 +1442,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1554,7 +1532,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1643,11 +1620,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -1750,12 +1725,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -1842,7 +1815,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -1931,11 +1903,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -2027,7 +1997,6 @@ spec: description: |- TempoComponentSpec is embedded to extend this definition with further options. - Currently there is no way to inline this field. See: https://github.com/golang/go/issues/6213 properties: @@ -2047,12 +2016,10 @@ spec: Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: - 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- - If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows. format: int64 @@ -2139,7 +2106,6 @@ spec: type indicates which kind of seccomp profile will be applied. Valid options are: - Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied. @@ -2228,11 +2194,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2340,11 +2304,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2483,11 +2445,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2549,11 +2509,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry @@ -2747,6 +2705,7 @@ spec: Defaults to 30 seconds. type: string required: + - managementState - storage type: object status: @@ -2809,16 +2768,8 @@ spec: conditions: description: Conditions of the Tempo deployment health. items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -2859,12 +2810,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 5cade67bd..3316c5644 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -27,6 +27,13 @@ rules: verbs: - create - patch +- apiGroups: + - "" + resources: + - persistentvolumeclaims + verbs: + - list + - watch - apiGroups: - apps resources: @@ -63,13 +70,6 @@ rules: - get - list - watch -- apiGroups: - - "" - resources: - - persistentvolumeclaims - verbs: - - list - - watch - apiGroups: - grafana.integreatly.org resources: @@ -144,31 +144,6 @@ rules: - tempo.grafana.com resources: - tempomonolithics - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - tempo.grafana.com - resources: - - tempomonolithics/finalizers - verbs: - - update -- apiGroups: - - tempo.grafana.com - resources: - - tempomonolithics/status - verbs: - - get - - patch - - update -- apiGroups: - - tempo.grafana.com - resources: - tempostacks verbs: - create @@ -181,12 +156,14 @@ rules: - apiGroups: - tempo.grafana.com resources: + - tempomonolithics/finalizers - tempostacks/finalizers verbs: - update - apiGroups: - tempo.grafana.com resources: + - tempomonolithics/status - tempostacks/status verbs: - get diff --git a/go.mod b/go.mod index b48832974..f11583f60 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/grafana/tempo-operator go 1.22.0 require ( - github.com/Masterminds/semver/v3 v3.2.1 github.com/ViaQ/logerr/v2 v2.1.0 github.com/go-logr/logr v1.4.2 github.com/go-logr/zapr v1.3.0 @@ -11,8 +10,6 @@ require ( github.com/grafana/grafana-operator/v5 v5.9.0 github.com/imdario/mergo v0.3.16 github.com/novln/docker-parser v1.0.0 - github.com/onsi/ginkgo/v2 v2.19.0 - github.com/onsi/gomega v1.33.1 github.com/openshift/library-go v0.0.0-20220622115547-84d884f4c9f6 github.com/operator-framework/api v0.23.0 github.com/operator-framework/operator-lib v0.13.0 @@ -25,7 +22,6 @@ require ( go.opentelemetry.io/otel/metric v1.28.0 go.opentelemetry.io/otel/sdk/metric v1.28.0 go.uber.org/zap v1.27.0 - gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.29.4 k8s.io/apiextensions-apiserver v0.29.4 k8s.io/apimachinery v0.29.4 @@ -65,13 +61,11 @@ require ( github.com/go-openapi/strfmt v0.23.0 // indirect github.com/go-openapi/swag v0.22.9 // indirect github.com/go-openapi/validate v0.23.0 // indirect - github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grafana/grafana-openapi-client-go v0.0.0-20240215164046-eb0e60d27cb7 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -83,6 +77,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/ulid v1.3.1 // indirect + github.com/onsi/ginkgo/v2 v2.19.0 // indirect + github.com/onsi/gomega v1.33.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect @@ -100,10 +96,10 @@ require ( golang.org/x/term v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/component-base v0.29.4 // indirect k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 7f25aad2b..1af3fb76c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= -github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/ViaQ/logerr/v2 v2.1.0 h1:8WwzuNa1x+a6tRUl+6sFel83A/QxlFBUaFW2FyG2zzY= github.com/ViaQ/logerr/v2 v2.1.0/go.mod h1:/qoWLm3YG40Sv5u75s4fvzjZ5p36xINzaxU2L+DJ9uw= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= @@ -50,6 +48,7 @@ github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZC github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE= github.com/go-openapi/validate v0.23.0 h1:2l7PJLzCis4YUGEoW6eoQw3WhyM65WSIcjX6SQnlfDw= github.com/go-openapi/validate v0.23.0/go.mod h1:EeiAZ5bmpSIOJV1WLfyYF9qp/B1ZgSaEpHTJHtN5cbE= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= diff --git a/internal/certrotation/build.go b/internal/certrotation/build.go index f85d11bb4..ff736373a 100644 --- a/internal/certrotation/build.go +++ b/internal/certrotation/build.go @@ -7,7 +7,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) var defaultUserInfo = &user.DefaultInfo{Name: "system:tempostacks", Groups: []string{"system:logging"}} diff --git a/internal/certrotation/build_test.go b/internal/certrotation/build_test.go index 4bc80d043..357d2c564 100644 --- a/internal/certrotation/build_test.go +++ b/internal/certrotation/build_test.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) func TestBuildAll(t *testing.T) { diff --git a/internal/certrotation/handlers/certrotation_discovery.go b/internal/certrotation/handlers/certrotation_discovery.go index 942c1b560..973c978e2 100644 --- a/internal/certrotation/handlers/certrotation_discovery.go +++ b/internal/certrotation/handlers/certrotation_discovery.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - v1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + v1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) const certRotationRequiredAtKey = "tempo.grafana.com/certRotationRequiredAt" diff --git a/internal/certrotation/handlers/check_cert_expiry.go b/internal/certrotation/handlers/check_cert_expiry.go index b1c3539e7..489f201ec 100644 --- a/internal/certrotation/handlers/check_cert_expiry.go +++ b/internal/certrotation/handlers/check_cert_expiry.go @@ -9,8 +9,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - v1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + v1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/certrotation" ) diff --git a/internal/certrotation/handlers/rotate_certs.go b/internal/certrotation/handlers/rotate_certs.go index 256fa9971..dda83f3cd 100644 --- a/internal/certrotation/handlers/rotate_certs.go +++ b/internal/certrotation/handlers/rotate_certs.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - v1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + v1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/certrotation" "github.com/grafana/tempo-operator/internal/manifests" ) diff --git a/internal/certrotation/options.go b/internal/certrotation/options.go index 1a73d7706..2e966e4fd 100644 --- a/internal/certrotation/options.go +++ b/internal/certrotation/options.go @@ -4,7 +4,7 @@ import ( "crypto/x509" "time" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" "github.com/openshift/library-go/pkg/crypto" corev1 "k8s.io/api/core/v1" diff --git a/internal/certrotation/target_test.go b/internal/certrotation/target_test.go index eead7acf3..a7f3e429b 100644 --- a/internal/certrotation/target_test.go +++ b/internal/certrotation/target_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/cert" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) func TestCertificatesExpired(t *testing.T) { diff --git a/controllers/tempo/certrotation_controller.go b/internal/controller/tempo/certrotation_controller.go similarity index 93% rename from controllers/tempo/certrotation_controller.go rename to internal/controller/tempo/certrotation_controller.go index 28c59f824..a7e25ac51 100644 --- a/controllers/tempo/certrotation_controller.go +++ b/internal/controller/tempo/certrotation_controller.go @@ -10,11 +10,11 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" - tempoStackState "github.com/grafana/tempo-operator/controllers/tempo/internal/management/state" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/certrotation" "github.com/grafana/tempo-operator/internal/certrotation/handlers" + tempoStackState "github.com/grafana/tempo-operator/internal/controller/tempo/internal/management/state" ) // CertRotationReconciler reconciles the `tempo.grafana.com/certRotationRequiredAt` annotation on diff --git a/controllers/tempo/common.go b/internal/controller/tempo/common.go similarity index 97% rename from controllers/tempo/common.go rename to internal/controller/tempo/common.go index ea8d21566..7585accfc 100644 --- a/controllers/tempo/common.go +++ b/internal/controller/tempo/common.go @@ -17,8 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/handlers/gateway" "github.com/grafana/tempo-operator/internal/manifests" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" diff --git a/controllers/tempo/internal/management/state/state.go b/internal/controller/tempo/internal/management/state/state.go similarity index 91% rename from controllers/tempo/internal/management/state/state.go rename to internal/controller/tempo/internal/management/state/state.go index 20d66b4d5..51cb8a09a 100644 --- a/controllers/tempo/internal/management/state/state.go +++ b/internal/controller/tempo/internal/management/state/state.go @@ -5,7 +5,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - tempov1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + tempov1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/ViaQ/logerr/v2/kverrors" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/tempo/internal/management/state/state_test.go b/internal/controller/tempo/internal/management/state/state_test.go similarity index 92% rename from controllers/tempo/internal/management/state/state_test.go rename to internal/controller/tempo/internal/management/state/state_test.go index 4c6061da3..aec68d2c4 100644 --- a/controllers/tempo/internal/management/state/state_test.go +++ b/internal/controller/tempo/internal/management/state/state_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" - tempov1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" - "github.com/grafana/tempo-operator/controllers/tempo/internal/management/state" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" + tempov1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" + "github.com/grafana/tempo-operator/internal/controller/tempo/internal/management/state" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/tempo/operator_controller.go b/internal/controller/tempo/operator_controller.go similarity index 98% rename from controllers/tempo/operator_controller.go rename to internal/controller/tempo/operator_controller.go index 562801da0..0c9332833 100644 --- a/controllers/tempo/operator_controller.go +++ b/internal/controller/tempo/operator_controller.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/operator" diff --git a/controllers/tempo/operator_controller_test.go b/internal/controller/tempo/operator_controller_test.go similarity index 97% rename from controllers/tempo/operator_controller_test.go rename to internal/controller/tempo/operator_controller_test.go index 7d0e4cc16..a686658b0 100644 --- a/controllers/tempo/operator_controller_test.go +++ b/internal/controller/tempo/operator_controller_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/controllers/tempo/suite_test.go b/internal/controller/tempo/suite_test.go similarity index 95% rename from controllers/tempo/suite_test.go rename to internal/controller/tempo/suite_test.go index ed3a296f1..4dcecad8d 100644 --- a/controllers/tempo/suite_test.go +++ b/internal/controller/tempo/suite_test.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/controllers/tempo/tempomonolithic_controller.go b/internal/controller/tempo/tempomonolithic_controller.go similarity index 98% rename from controllers/tempo/tempomonolithic_controller.go rename to internal/controller/tempo/tempomonolithic_controller.go index c24285d2f..f00a7f31b 100644 --- a/controllers/tempo/tempomonolithic_controller.go +++ b/internal/controller/tempo/tempomonolithic_controller.go @@ -19,8 +19,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/handlers/storage" "github.com/grafana/tempo-operator/internal/manifests/monolithic" "github.com/grafana/tempo-operator/internal/status" diff --git a/controllers/tempo/tempomonolithic_controller_test.go b/internal/controller/tempo/tempomonolithic_controller_test.go similarity index 93% rename from controllers/tempo/tempomonolithic_controller_test.go rename to internal/controller/tempo/tempomonolithic_controller_test.go index d182c9a86..ff817dcbd 100644 --- a/controllers/tempo/tempomonolithic_controller_test.go +++ b/internal/controller/tempo/tempomonolithic_controller_test.go @@ -13,8 +13,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestReconcileMonolithic(t *testing.T) { diff --git a/controllers/tempo/tempostack_controller.go b/internal/controller/tempo/tempostack_controller.go similarity index 98% rename from controllers/tempo/tempostack_controller.go rename to internal/controller/tempo/tempostack_controller.go index e97cd2472..9c28790eb 100644 --- a/controllers/tempo/tempostack_controller.go +++ b/internal/controller/tempo/tempostack_controller.go @@ -25,8 +25,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/certrotation/handlers" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/status" diff --git a/controllers/tempo/tempostack_controller_test.go b/internal/controller/tempo/tempostack_controller_test.go similarity index 99% rename from controllers/tempo/tempostack_controller_test.go rename to internal/controller/tempo/tempostack_controller_test.go index fe49b8e27..aee87a729 100644 --- a/controllers/tempo/tempostack_controller_test.go +++ b/internal/controller/tempo/tempostack_controller_test.go @@ -18,8 +18,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/status" "github.com/grafana/tempo-operator/internal/version" ) diff --git a/controllers/tempo/tempostack_create_or_update.go b/internal/controller/tempo/tempostack_create_or_update.go similarity index 98% rename from controllers/tempo/tempostack_create_or_update.go rename to internal/controller/tempo/tempostack_create_or_update.go index 83dea55fd..b731459aa 100644 --- a/controllers/tempo/tempostack_create_or_update.go +++ b/internal/controller/tempo/tempostack_create_or_update.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/handlers/storage" "github.com/grafana/tempo-operator/internal/manifests" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" diff --git a/controllers/tempo/testdata/prometheus-operator-0.66.0.yaml b/internal/controller/tempo/testdata/prometheus-operator-0.66.0.yaml similarity index 100% rename from controllers/tempo/testdata/prometheus-operator-0.66.0.yaml rename to internal/controller/tempo/testdata/prometheus-operator-0.66.0.yaml diff --git a/internal/crdmetrics/tempo_stack.go b/internal/crdmetrics/tempo_stack.go index 71bb4bcdb..61f186bb4 100644 --- a/internal/crdmetrics/tempo_stack.go +++ b/internal/crdmetrics/tempo_stack.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/otel/metric" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) type tempoStackMetrics struct { diff --git a/internal/crdmetrics/tempo_stack_test.go b/internal/crdmetrics/tempo_stack_test.go index 40d8be394..03cc9b906 100644 --- a/internal/crdmetrics/tempo_stack_test.go +++ b/internal/crdmetrics/tempo_stack_test.go @@ -16,7 +16,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) type expectedMetric struct { diff --git a/internal/handlers/gateway/basedomain.go b/internal/handlers/gateway/basedomain.go index efbfa047e..f9a4126f1 100644 --- a/internal/handlers/gateway/basedomain.go +++ b/internal/handlers/gateway/basedomain.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/status" ) diff --git a/internal/handlers/gateway/oidc_secret.go b/internal/handlers/gateway/oidc_secret.go index bb008dd23..5ef8815a7 100644 --- a/internal/handlers/gateway/oidc_secret.go +++ b/internal/handlers/gateway/oidc_secret.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/status" ) diff --git a/internal/handlers/gateway/oidc_secret_test.go b/internal/handlers/gateway/oidc_secret_test.go index 6012f8d1a..267ba7a01 100644 --- a/internal/handlers/gateway/oidc_secret_test.go +++ b/internal/handlers/gateway/oidc_secret_test.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/status" ) diff --git a/internal/handlers/gateway/suite_test.go b/internal/handlers/gateway/suite_test.go index 9cf52ef3e..fd07dced0 100644 --- a/internal/handlers/gateway/suite_test.go +++ b/internal/handlers/gateway/suite_test.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/handlers/gateway/testdata" //+kubebuilder:scaffold:imports ) diff --git a/internal/handlers/gateway/tenants_data_test.go b/internal/handlers/gateway/tenants_data_test.go index 39ff4c627..8eeba859b 100644 --- a/internal/handlers/gateway/tenants_data_test.go +++ b/internal/handlers/gateway/tenants_data_test.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/handlers/storage/storage.go b/internal/handlers/storage/storage.go index 61f5c9b6f..0dea139d5 100644 --- a/internal/handlers/storage/storage.go +++ b/internal/handlers/storage/storage.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/handlers/storage/tls.go b/internal/handlers/storage/tls.go index 0839ad52a..f1ddc61b9 100644 --- a/internal/handlers/storage/tls.go +++ b/internal/handlers/storage/tls.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/compactor/compactor.go b/internal/manifests/compactor/compactor.go index 942817a20..e89bd52e8 100644 --- a/internal/manifests/compactor/compactor.go +++ b/internal/manifests/compactor/compactor.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/compactor/compactor_test.go b/internal/manifests/compactor/compactor_test.go index deed86532..83a977b9e 100644 --- a/internal/manifests/compactor/compactor_test.go +++ b/internal/manifests/compactor/compactor_test.go @@ -13,8 +13,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/config/build.go b/internal/manifests/config/build.go index b5a5f58db..db2112cf6 100644 --- a/internal/manifests/config/build.go +++ b/internal/manifests/config/build.go @@ -10,7 +10,7 @@ import ( "k8s.io/utils/ptr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/config/build_test.go b/internal/manifests/config/build_test.go index dd3577743..5ba6166dc 100644 --- a/internal/manifests/config/build_test.go +++ b/internal/manifests/config/build_test.go @@ -9,8 +9,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/tlsprofile" ) diff --git a/internal/manifests/config/configmap_test.go b/internal/manifests/config/configmap_test.go index 88d064a6e..0fd650c59 100644 --- a/internal/manifests/config/configmap_test.go +++ b/internal/manifests/config/configmap_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/tlsprofile" ) diff --git a/internal/manifests/distributor/distributor.go b/internal/manifests/distributor/distributor.go index d99206372..7529423ad 100644 --- a/internal/manifests/distributor/distributor.go +++ b/internal/manifests/distributor/distributor.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/distributor/distributor_test.go b/internal/manifests/distributor/distributor_test.go index 91e287bbf..63cfada0b 100644 --- a/internal/manifests/distributor/distributor_test.go +++ b/internal/manifests/distributor/distributor_test.go @@ -13,8 +13,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/gateway/configs.go b/internal/manifests/gateway/configs.go index 5abf83766..980378dd2 100644 --- a/internal/manifests/gateway/configs.go +++ b/internal/manifests/gateway/configs.go @@ -7,7 +7,7 @@ import ( "math/rand" "text/template" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/gateway/configs_test.go b/internal/manifests/gateway/configs_test.go index 8157d12bc..965a52553 100644 --- a/internal/manifests/gateway/configs_test.go +++ b/internal/manifests/gateway/configs_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/gateway/gateway.go b/internal/manifests/gateway/gateway.go index 2ca7c5fa7..c79213cda 100644 --- a/internal/manifests/gateway/gateway.go +++ b/internal/manifests/gateway/gateway.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/manifests/gateway/gateway_test.go b/internal/manifests/gateway/gateway_test.go index 1520c2165..722c59a6c 100644 --- a/internal/manifests/gateway/gateway_test.go +++ b/internal/manifests/gateway/gateway_test.go @@ -19,8 +19,8 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" "github.com/grafana/tempo-operator/internal/tlsprofile" diff --git a/internal/manifests/gateway/openshift.go b/internal/manifests/gateway/openshift.go index 7878db200..9946d9304 100644 --- a/internal/manifests/gateway/openshift.go +++ b/internal/manifests/gateway/openshift.go @@ -13,8 +13,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/manifests/gateway/openshift_test.go b/internal/manifests/gateway/openshift_test.go index 23e64f92e..90cc7062c 100644 --- a/internal/manifests/gateway/openshift_test.go +++ b/internal/manifests/gateway/openshift_test.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/manifests/grafana/datasource_test.go b/internal/manifests/grafana/datasource_test.go index a43ed35b7..c0d9a1901 100644 --- a/internal/manifests/grafana/datasource_test.go +++ b/internal/manifests/grafana/datasource_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/ingester/ingester.go b/internal/manifests/ingester/ingester.go index 00adec471..2f2ba6db5 100644 --- a/internal/manifests/ingester/ingester.go +++ b/internal/manifests/ingester/ingester.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/ingester/ingester_test.go b/internal/manifests/ingester/ingester_test.go index 68dd34efc..75ce6abb5 100644 --- a/internal/manifests/ingester/ingester_test.go +++ b/internal/manifests/ingester/ingester_test.go @@ -12,8 +12,8 @@ import ( k8slabels "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/manifests_test.go b/internal/manifests/manifests_test.go index dfeeddeff..71d1ca05c 100644 --- a/internal/manifests/manifests_test.go +++ b/internal/manifests/manifests_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/manifestutils/params.go b/internal/manifests/manifestutils/params.go index a69aef028..9958f808a 100644 --- a/internal/manifests/manifestutils/params.go +++ b/internal/manifests/manifestutils/params.go @@ -1,8 +1,8 @@ package manifestutils import ( - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/tlsprofile" ) diff --git a/internal/manifests/manifestutils/resources.go b/internal/manifests/manifestutils/resources.go index 3a0d4e740..f71c64a4b 100644 --- a/internal/manifests/manifestutils/resources.go +++ b/internal/manifests/manifestutils/resources.go @@ -4,7 +4,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) const requestsPercentage = 0.3 diff --git a/internal/manifests/manifestutils/resources_test.go b/internal/manifests/manifestutils/resources_test.go index 51ff8271e..b033a4a91 100644 --- a/internal/manifests/manifestutils/resources_test.go +++ b/internal/manifests/manifestutils/resources_test.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/utils/ptr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestResourceSum(t *testing.T) { diff --git a/internal/manifests/manifestutils/storage.go b/internal/manifests/manifestutils/storage.go index e54beacf5..e425d1fe6 100644 --- a/internal/manifests/manifestutils/storage.go +++ b/internal/manifests/manifestutils/storage.go @@ -5,7 +5,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // ConfigureAzureStorage mounts the Azure Storage credentials in a pod. diff --git a/internal/manifests/manifestutils/storage_test.go b/internal/manifests/manifestutils/storage_test.go index fbb888a8f..66530b798 100644 --- a/internal/manifests/manifestutils/storage_test.go +++ b/internal/manifests/manifestutils/storage_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func findEnvVar(name string, envVars *[]corev1.EnvVar) error { diff --git a/internal/manifests/manifestutils/tls.go b/internal/manifests/manifestutils/tls.go index ae56c3041..e697190e9 100644 --- a/internal/manifests/manifestutils/tls.go +++ b/internal/manifests/manifestutils/tls.go @@ -7,7 +7,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/manifests/manifestutils/tls_test.go b/internal/manifests/manifestutils/tls_test.go index 4068fe56d..9aad457b0 100644 --- a/internal/manifests/manifestutils/tls_test.go +++ b/internal/manifests/manifestutils/tls_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestConfigureTLSVolumes(t *testing.T) { diff --git a/internal/manifests/manifestutils/tracing.go b/internal/manifests/manifestutils/tracing.go index 0a552ae07..a89688a86 100644 --- a/internal/manifests/manifestutils/tracing.go +++ b/internal/manifests/manifestutils/tracing.go @@ -6,7 +6,7 @@ import ( "github.com/imdario/mergo" corev1 "k8s.io/api/core/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // PatchTracingJaegerEnv adds configures jaeger-sdk via environment variables if diff --git a/internal/manifests/manifestutils/tracing_test.go b/internal/manifests/manifestutils/tracing_test.go index 9d00e288f..15024e118 100644 --- a/internal/manifests/manifestutils/tracing_test.go +++ b/internal/manifests/manifestutils/tracing_test.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func Test_PatchTracingJaegerEnv(t *testing.T) { diff --git a/internal/manifests/memberlist/gossip.go b/internal/manifests/memberlist/gossip.go index e8f1a74ae..7b5e0014f 100644 --- a/internal/manifests/memberlist/gossip.go +++ b/internal/manifests/memberlist/gossip.go @@ -7,7 +7,7 @@ import ( k8slabels "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/manifests/memberlist/gossip_test.go b/internal/manifests/memberlist/gossip_test.go index 4e2ec2ed2..463de0ba5 100644 --- a/internal/manifests/memberlist/gossip_test.go +++ b/internal/manifests/memberlist/gossip_test.go @@ -10,7 +10,7 @@ import ( k8slabels "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/monolithic/build.go b/internal/manifests/monolithic/build.go index 3c16670ce..5f3245def 100644 --- a/internal/manifests/monolithic/build.go +++ b/internal/manifests/monolithic/build.go @@ -6,7 +6,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" "github.com/grafana/tempo-operator/internal/manifests/oauthproxy" diff --git a/internal/manifests/monolithic/build_test.go b/internal/manifests/monolithic/build_test.go index 9265da1d8..fbb0cd25e 100644 --- a/internal/manifests/monolithic/build_test.go +++ b/internal/manifests/monolithic/build_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestBuildAll(t *testing.T) { diff --git a/internal/manifests/monolithic/configmap.go b/internal/manifests/monolithic/configmap.go index fdf48d8c3..fa71de158 100644 --- a/internal/manifests/monolithic/configmap.go +++ b/internal/manifests/monolithic/configmap.go @@ -6,11 +6,10 @@ import ( "path" "time" - "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" tempoStackConfig "github.com/grafana/tempo-operator/internal/manifests/config" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/monolithic/configmap_test.go b/internal/manifests/monolithic/configmap_test.go index 66d268091..9c5e51256 100644 --- a/internal/manifests/monolithic/configmap_test.go +++ b/internal/manifests/monolithic/configmap_test.go @@ -10,8 +10,8 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/tlsprofile" ) diff --git a/internal/manifests/monolithic/gateway.go b/internal/manifests/monolithic/gateway.go index 928bcbdc3..bf3dec1bd 100644 --- a/internal/manifests/monolithic/gateway.go +++ b/internal/manifests/monolithic/gateway.go @@ -3,7 +3,7 @@ package monolithic import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/gateway" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/monolithic/gateway_test.go b/internal/manifests/monolithic/gateway_test.go index 106deae9a..e70ccbd0a 100644 --- a/internal/manifests/monolithic/gateway_test.go +++ b/internal/manifests/monolithic/gateway_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestGateway(t *testing.T) { diff --git a/internal/manifests/monolithic/grafana_datasource_test.go b/internal/manifests/monolithic/grafana_datasource_test.go index b643a5a67..ac54664fa 100644 --- a/internal/manifests/monolithic/grafana_datasource_test.go +++ b/internal/manifests/monolithic/grafana_datasource_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestBuildGrafanaDatasource(t *testing.T) { diff --git a/internal/manifests/monolithic/jaegerui_ingress.go b/internal/manifests/monolithic/jaegerui_ingress.go index 2ccb66404..c8fb0895a 100644 --- a/internal/manifests/monolithic/jaegerui_ingress.go +++ b/internal/manifests/monolithic/jaegerui_ingress.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/manifests/monolithic/jaegerui_ingress_test.go b/internal/manifests/monolithic/jaegerui_ingress_test.go index e5cac15ad..e554bd856 100644 --- a/internal/manifests/monolithic/jaegerui_ingress_test.go +++ b/internal/manifests/monolithic/jaegerui_ingress_test.go @@ -12,8 +12,8 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/monolithic/options.go b/internal/manifests/monolithic/options.go index ff2fad050..345e7ed03 100644 --- a/internal/manifests/monolithic/options.go +++ b/internal/manifests/monolithic/options.go @@ -1,8 +1,8 @@ package monolithic import ( - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/tlsprofile" ) diff --git a/internal/manifests/monolithic/prometheusrule_test.go b/internal/manifests/monolithic/prometheusrule_test.go index 1b6ce382b..580126d90 100644 --- a/internal/manifests/monolithic/prometheusrule_test.go +++ b/internal/manifests/monolithic/prometheusrule_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestBuildPrometheusRules(t *testing.T) { diff --git a/internal/manifests/monolithic/serviceaccount.go b/internal/manifests/monolithic/serviceaccount.go index 2e0d3c375..1c2f938dc 100644 --- a/internal/manifests/monolithic/serviceaccount.go +++ b/internal/manifests/monolithic/serviceaccount.go @@ -4,7 +4,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/gateway" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/monolithic/serviceaccount_test.go b/internal/manifests/monolithic/serviceaccount_test.go index b99d6a8ff..6a3189c15 100644 --- a/internal/manifests/monolithic/serviceaccount_test.go +++ b/internal/manifests/monolithic/serviceaccount_test.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/monolithic/servicemonitor_test.go b/internal/manifests/monolithic/servicemonitor_test.go index 32ae31ce1..9380e5150 100644 --- a/internal/manifests/monolithic/servicemonitor_test.go +++ b/internal/manifests/monolithic/servicemonitor_test.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestBuildServiceMonitor(t *testing.T) { diff --git a/internal/manifests/monolithic/services_test.go b/internal/manifests/monolithic/services_test.go index 26742b5d8..3f98ddb35 100644 --- a/internal/manifests/monolithic/services_test.go +++ b/internal/manifests/monolithic/services_test.go @@ -9,8 +9,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestBuildServices(t *testing.T) { diff --git a/internal/manifests/monolithic/statefulset.go b/internal/manifests/monolithic/statefulset.go index b62a466b1..7d2a7e315 100644 --- a/internal/manifests/monolithic/statefulset.go +++ b/internal/manifests/monolithic/statefulset.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/gateway" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/monolithic/statefulset_test.go b/internal/manifests/monolithic/statefulset_test.go index aa0239afc..618a5eeda 100644 --- a/internal/manifests/monolithic/statefulset_test.go +++ b/internal/manifests/monolithic/statefulset_test.go @@ -13,8 +13,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/monolithic/util.go b/internal/manifests/monolithic/util.go index 5aaca80c2..bfd59ef1d 100644 --- a/internal/manifests/monolithic/util.go +++ b/internal/manifests/monolithic/util.go @@ -1,6 +1,6 @@ package monolithic -import "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" +import "github.com/grafana/tempo-operator/api/tempo/v1alpha1" func tlsSecretAndBundleEmptyGRPC(tempo v1alpha1.TempoMonolithic) bool { if tempo.Spec.Ingestion != nil && tempo.Spec.Ingestion.OTLP != nil && diff --git a/internal/manifests/oauthproxy/oauth_proxy.go b/internal/manifests/oauthproxy/oauth_proxy.go index f440e9c5c..267647f5b 100644 --- a/internal/manifests/oauthproxy/oauth_proxy.go +++ b/internal/manifests/oauthproxy/oauth_proxy.go @@ -12,8 +12,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/manifests/oauthproxy/oauth_proxy_test.go b/internal/manifests/oauthproxy/oauth_proxy_test.go index bde7ff220..12b3b0bda 100644 --- a/internal/manifests/oauthproxy/oauth_proxy_test.go +++ b/internal/manifests/oauthproxy/oauth_proxy_test.go @@ -18,8 +18,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/operator/manifests.go b/internal/manifests/operator/manifests.go index 9b8e035ca..df7fd2f07 100644 --- a/internal/manifests/operator/manifests.go +++ b/internal/manifests/operator/manifests.go @@ -3,7 +3,7 @@ package operator import ( "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/operator/prometheus" ) diff --git a/internal/manifests/operator/prometheus/servicemonitor.go b/internal/manifests/operator/prometheus/servicemonitor.go index 03532b38b..ede60b774 100644 --- a/internal/manifests/operator/prometheus/servicemonitor.go +++ b/internal/manifests/operator/prometheus/servicemonitor.go @@ -6,7 +6,7 @@ import ( monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/operator/prometheus/servicemonitor_test.go b/internal/manifests/operator/prometheus/servicemonitor_test.go index 2eef4cd75..fff1c6a87 100644 --- a/internal/manifests/operator/prometheus/servicemonitor_test.go +++ b/internal/manifests/operator/prometheus/servicemonitor_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/config/v1alpha1" + "github.com/grafana/tempo-operator/api/config/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/querier/querier.go b/internal/manifests/querier/querier.go index 26213384b..6efd590d8 100644 --- a/internal/manifests/querier/querier.go +++ b/internal/manifests/querier/querier.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/querier/querier_test.go b/internal/manifests/querier/querier_test.go index 57dfcabdf..7dfd9676b 100644 --- a/internal/manifests/querier/querier_test.go +++ b/internal/manifests/querier/querier_test.go @@ -13,8 +13,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/queryfrontend/query_frontend.go b/internal/manifests/queryfrontend/query_frontend.go index 55d1afe70..361769c75 100644 --- a/internal/manifests/queryfrontend/query_frontend.go +++ b/internal/manifests/queryfrontend/query_frontend.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/queryfrontend/query_frontend_test.go b/internal/manifests/queryfrontend/query_frontend_test.go index 9ffb26b6a..cff1cef51 100644 --- a/internal/manifests/queryfrontend/query_frontend_test.go +++ b/internal/manifests/queryfrontend/query_frontend_test.go @@ -17,8 +17,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/memberlist" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/manifests/serviceaccount/serviceaccount_test.go b/internal/manifests/serviceaccount/serviceaccount_test.go index e37d4a1d7..bf14032a4 100644 --- a/internal/manifests/serviceaccount/serviceaccount_test.go +++ b/internal/manifests/serviceaccount/serviceaccount_test.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/manifests/servicemonitor/servicemonitor_test.go b/internal/manifests/servicemonitor/servicemonitor_test.go index 789fccbb9..9f9cf68e9 100644 --- a/internal/manifests/servicemonitor/servicemonitor_test.go +++ b/internal/manifests/servicemonitor/servicemonitor_test.go @@ -9,8 +9,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/certrotation" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/status/client.go b/internal/status/client.go index 562fb46ab..418371f9e 100644 --- a/internal/status/client.go +++ b/internal/status/client.go @@ -5,7 +5,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // StatusClient defines a interface for fetching status information. diff --git a/internal/status/client_test.go b/internal/status/client_test.go index 28b73cf8f..20f641adb 100644 --- a/internal/status/client_test.go +++ b/internal/status/client_test.go @@ -5,7 +5,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) type statusClientStub struct { diff --git a/internal/status/components.go b/internal/status/components.go index 373f51c30..00b0b63fa 100644 --- a/internal/status/components.go +++ b/internal/status/components.go @@ -6,7 +6,7 @@ import ( "github.com/ViaQ/logerr/v2/kverrors" corev1 "k8s.io/api/core/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/status/components_test.go b/internal/status/components_test.go index 9a122de8f..bf4eccfb6 100644 --- a/internal/status/components_test.go +++ b/internal/status/components_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestSetComponentsStatus_WhenListReturnError_ReturnError(t *testing.T) { diff --git a/internal/status/conditions.go b/internal/status/conditions.go index c5f9127f7..3283c1636 100644 --- a/internal/status/conditions.go +++ b/internal/status/conditions.go @@ -5,7 +5,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) const ( diff --git a/internal/status/conditions_test.go b/internal/status/conditions_test.go index ca7cf8bb1..0dab547e6 100644 --- a/internal/status/conditions_test.go +++ b/internal/status/conditions_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestReadyCondition(t *testing.T) { diff --git a/internal/status/metrics.go b/internal/status/metrics.go index b039c2992..10a2c7aa6 100644 --- a/internal/status/metrics.go +++ b/internal/status/metrics.go @@ -6,7 +6,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) var ( diff --git a/internal/status/monolithic.go b/internal/status/monolithic.go index 62053abbf..fc12eb738 100644 --- a/internal/status/monolithic.go +++ b/internal/status/monolithic.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/monolithic" "github.com/grafana/tempo-operator/internal/version" diff --git a/internal/status/monolithic_test.go b/internal/status/monolithic_test.go index cb7df5bef..e6da181ef 100644 --- a/internal/status/monolithic_test.go +++ b/internal/status/monolithic_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestGetStatefulSetStatus(t *testing.T) { diff --git a/internal/status/status.go b/internal/status/status.go index e24cbf35d..cf957ff42 100644 --- a/internal/status/status.go +++ b/internal/status/status.go @@ -3,7 +3,7 @@ package status import ( "context" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/version" ) diff --git a/internal/status/status_test.go b/internal/status/status_test.go index f4df2fb56..de81c0b3f 100644 --- a/internal/status/status_test.go +++ b/internal/status/status_test.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestRefreshPatchError(t *testing.T) { diff --git a/internal/tlsprofile/get.go b/internal/tlsprofile/get.go index 575f6648d..809b777a4 100644 --- a/internal/tlsprofile/get.go +++ b/internal/tlsprofile/get.go @@ -6,7 +6,7 @@ import ( openshiftconfigv1 "github.com/openshift/api/config/v1" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) // ErrGetProfileFromCluster happens when failed to get the cluster security policy in openshift. diff --git a/internal/tlsprofile/get_test.go b/internal/tlsprofile/get_test.go index 0d8d5e75c..25547dabb 100644 --- a/internal/tlsprofile/get_test.go +++ b/internal/tlsprofile/get_test.go @@ -11,7 +11,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) func TestGetInvalidOrEmptyTLSProfile(t *testing.T) { diff --git a/internal/tlsprofile/tlsprofile.go b/internal/tlsprofile/tlsprofile.go index d68592279..fb089c610 100644 --- a/internal/tlsprofile/tlsprofile.go +++ b/internal/tlsprofile/tlsprofile.go @@ -8,7 +8,7 @@ import ( "github.com/openshift/library-go/pkg/crypto" "sigs.k8s.io/controller-runtime/pkg/client" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) // APIServerName is the apiserver resource name used to fetch it. diff --git a/internal/tlsprofile/tlsprofile_test.go b/internal/tlsprofile/tlsprofile_test.go index 0efc547fd..0ea91c84c 100644 --- a/internal/tlsprofile/tlsprofile_test.go +++ b/internal/tlsprofile/tlsprofile_test.go @@ -12,7 +12,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" ) func TestGetTLSSecurityProfile(t *testing.T) { diff --git a/internal/upgrade/suite_test.go b/internal/upgrade/suite_test.go index d6c0b8633..5d18ebc9f 100644 --- a/internal/upgrade/suite_test.go +++ b/internal/upgrade/suite_test.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/internal/upgrade/upgrade.go b/internal/upgrade/upgrade.go index 593bdec92..85e7d5c11 100644 --- a/internal/upgrade/upgrade.go +++ b/internal/upgrade/upgrade.go @@ -8,7 +8,6 @@ import ( "fmt" "reflect" - "github.com/Masterminds/semver/v3" "github.com/go-logr/logr" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -17,8 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/metrics" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/status" "github.com/grafana/tempo-operator/internal/version" ) diff --git a/internal/upgrade/upgrade_test.go b/internal/upgrade/upgrade_test.go index efbeb40ed..5be8d32f9 100644 --- a/internal/upgrade/upgrade_test.go +++ b/internal/upgrade/upgrade_test.go @@ -11,8 +11,8 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/log" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/version" ) diff --git a/internal/upgrade/v0_11_0.go b/internal/upgrade/v0_11_0.go index c7040d5df..a1acf32e2 100644 --- a/internal/upgrade/v0_11_0.go +++ b/internal/upgrade/v0_11_0.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/upgrade/v0_1_0.go b/internal/upgrade/v0_1_0.go index eb30e34cd..1d4725f54 100644 --- a/internal/upgrade/v0_1_0.go +++ b/internal/upgrade/v0_1_0.go @@ -3,7 +3,7 @@ package upgrade import ( "context" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // This is a template for future versions. diff --git a/internal/upgrade/v0_3_0.go b/internal/upgrade/v0_3_0.go index 4837db9e8..39e95f8da 100644 --- a/internal/upgrade/v0_3_0.go +++ b/internal/upgrade/v0_3_0.go @@ -3,7 +3,7 @@ package upgrade import ( "context" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // This upgrade sets the deprecated MaxSearchBytesPerTrace field to nil. diff --git a/internal/upgrade/v0_3_0_test.go b/internal/upgrade/v0_3_0_test.go index 16a7fc4de..5ce06dc61 100644 --- a/internal/upgrade/v0_3_0_test.go +++ b/internal/upgrade/v0_3_0_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/client-go/tools/record" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/version" ) diff --git a/internal/upgrade/v0_5_0.go b/internal/upgrade/v0_5_0.go index 16a9aed40..43be77f88 100644 --- a/internal/upgrade/v0_5_0.go +++ b/internal/upgrade/v0_5_0.go @@ -7,7 +7,7 @@ import ( v1 "k8s.io/api/apps/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/manifests/manifestutils" ) diff --git a/internal/upgrade/v0_6_0.go b/internal/upgrade/v0_6_0.go index b3bd3a48a..ba3e3bccc 100644 --- a/internal/upgrade/v0_6_0.go +++ b/internal/upgrade/v0_6_0.go @@ -3,7 +3,7 @@ package upgrade import ( "context" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // This upgrade unsets the image fields in the TempoStack CR. diff --git a/internal/upgrade/v0_8_0.go b/internal/upgrade/v0_8_0.go index c447c96e8..968d32e1a 100644 --- a/internal/upgrade/v0_8_0.go +++ b/internal/upgrade/v0_8_0.go @@ -3,7 +3,7 @@ package upgrade import ( "context" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // The .spec.storage.tls field from TempoStack CR changed from {caName: ""} to TLSSpec diff --git a/internal/upgrade/versions.go b/internal/upgrade/versions.go index c4d3386e5..6aa3af5d5 100644 --- a/internal/upgrade/versions.go +++ b/internal/upgrade/versions.go @@ -3,9 +3,7 @@ package upgrade import ( "context" - "github.com/Masterminds/semver/v3" - - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) type upgradeTempoStackFn func(ctx context.Context, u Upgrade, tempo *v1alpha1.TempoStack) error diff --git a/internal/webhooks/tempomonolithic_webhook.go b/internal/webhooks/tempomonolithic_webhook.go index 90f33dfc0..8c260c858 100644 --- a/internal/webhooks/tempomonolithic_webhook.go +++ b/internal/webhooks/tempomonolithic_webhook.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" - tempov1alpha1 "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" + tempov1alpha1 "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/handlers/storage" "github.com/grafana/tempo-operator/internal/status" ) diff --git a/internal/webhooks/tempomonolithic_webhook_test.go b/internal/webhooks/tempomonolithic_webhook_test.go index 8f6c6e6b2..61fdc5e08 100644 --- a/internal/webhooks/tempomonolithic_webhook_test.go +++ b/internal/webhooks/tempomonolithic_webhook_test.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) func TestMonolithicValidate(t *testing.T) { diff --git a/internal/webhooks/tempostack_webhook.go b/internal/webhooks/tempostack_webhook.go index ea0f944fa..12970ec8c 100644 --- a/internal/webhooks/tempostack_webhook.go +++ b/internal/webhooks/tempostack_webhook.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/autodetect" "github.com/grafana/tempo-operator/internal/handlers/storage" "github.com/grafana/tempo-operator/internal/manifests/naming" diff --git a/internal/webhooks/tempostack_webhook_test.go b/internal/webhooks/tempostack_webhook_test.go index b24f02553..45aedb7f7 100644 --- a/internal/webhooks/tempostack_webhook_test.go +++ b/internal/webhooks/tempostack_webhook_test.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" "github.com/grafana/tempo-operator/internal/handlers/storage" "github.com/grafana/tempo-operator/internal/manifests/naming" ) diff --git a/internal/webhooks/webhook_suite_test.go b/internal/webhooks/webhook_suite_test.go index 149d9aae4..4c7e853e3 100644 --- a/internal/webhooks/webhook_suite_test.go +++ b/internal/webhooks/webhook_suite_test.go @@ -9,8 +9,6 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" admissionv1beta1 "k8s.io/api/admission/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" @@ -24,8 +22,8 @@ import ( //+kubebuilder:scaffold:imports - configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1" - "github.com/grafana/tempo-operator/apis/tempo/v1alpha1" + configv1alpha1 "github.com/grafana/tempo-operator/api/config/v1alpha1" + "github.com/grafana/tempo-operator/api/tempo/v1alpha1" ) // These tests use Ginkgo (BDD-style Go testing framework). Refer to