Skip to content

Commit c5d56cb

Browse files
atoulmeatoulme
authored
[chore] move all target-allocator code to internal (#3632)
1 parent b20b922 commit c5d56cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+40
-40
lines changed

‎cmd/otel-allocator/benchmark_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
ctrl "sigs.k8s.io/controller-runtime"
2323
"sigs.k8s.io/controller-runtime/pkg/log"
2424

25-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
26-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/prehook"
27-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/server"
28-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
25+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
26+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/prehook"
27+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/server"
28+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2929
)
3030

3131
// BenchmarkProcessTargets benchmarks the whole target allocation pipeline. It starts with data the prometheus

‎cmd/otel-allocator/allocation/allocator.go ‎cmd/otel-allocator/internal/allocation/allocator.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/go-logr/logr"
1111
"github.com/prometheus/client_golang/prometheus"
1212

13-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
14-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
13+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/diff"
14+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1515
)
1616

1717
/*

‎cmd/otel-allocator/allocation/allocator_test.go ‎cmd/otel-allocator/internal/allocation/allocator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/prometheus/prometheus/model/labels"
1010
"github.com/stretchr/testify/assert"
1111

12-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
12+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1313
)
1414

1515
func TestSetCollectors(t *testing.T) {

‎cmd/otel-allocator/allocation/consistent_hashing.go ‎cmd/otel-allocator/internal/allocation/consistent_hashing.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/buraksezer/consistent"
1010
"github.com/cespare/xxhash/v2"
1111

12-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
12+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1313
)
1414

1515
const consistentHashingStrategyName = "consistent-hashing"

‎cmd/otel-allocator/allocation/consistent_hashing_test.go ‎cmd/otel-allocator/internal/allocation/consistent_hashing_test.go

File renamed without changes.

‎cmd/otel-allocator/allocation/least_weighted.go ‎cmd/otel-allocator/internal/allocation/least_weighted.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package allocation
55

66
import (
7-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
7+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
88
)
99

1010
const leastWeightedStrategyName = "least-weighted"

‎cmd/otel-allocator/allocation/least_weighted_test.go ‎cmd/otel-allocator/internal/allocation/least_weighted_test.go

File renamed without changes.

‎cmd/otel-allocator/allocation/per_node.go ‎cmd/otel-allocator/internal/allocation/per_node.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package allocation
66
import (
77
"fmt"
88

9-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
9+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1010
)
1111

1212
const perNodeStrategyName = "per-node"

‎cmd/otel-allocator/allocation/per_node_test.go ‎cmd/otel-allocator/internal/allocation/per_node_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
logf "sigs.k8s.io/controller-runtime/pkg/log"
1212

13-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
13+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1414
)
1515

1616
var loggerPerNode = logf.Log.WithName("unit-tests")

‎cmd/otel-allocator/allocation/strategy.go ‎cmd/otel-allocator/internal/allocation/strategy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/prometheus/client_golang/prometheus"
1212
"github.com/prometheus/client_golang/prometheus/promauto"
1313

14-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
14+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1515
)
1616

1717
type AllocatorProvider func(log logr.Logger, opts ...Option) Allocator

‎cmd/otel-allocator/allocation/strategy_test.go ‎cmd/otel-allocator/internal/allocation/strategy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99
"testing"
1010

11-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
11+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/diff"
1212
)
1313

1414
func BenchmarkGetAllTargetsByCollectorAndJob(b *testing.B) {

‎cmd/otel-allocator/allocation/testutils.go ‎cmd/otel-allocator/internal/allocation/testutils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/stretchr/testify/require"
1515
logf "sigs.k8s.io/controller-runtime/pkg/log"
1616

17-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
17+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1818
)
1919

2020
func colIndex(index, numCols int) int {

‎cmd/otel-allocator/collector/collector.go ‎cmd/otel-allocator/internal/collector/collector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"k8s.io/client-go/rest"
1818
"k8s.io/client-go/tools/cache"
1919

20-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
20+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
2121
)
2222

2323
const (

‎cmd/otel-allocator/collector/collector_test.go ‎cmd/otel-allocator/internal/collector/collector_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"k8s.io/client-go/kubernetes/fake"
1818
logf "sigs.k8s.io/controller-runtime/pkg/log"
1919

20-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
20+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
2121
)
2222

2323
var logger = logf.Log.WithName("collector-unit-tests")

‎cmd/otel-allocator/config/config.go ‎cmd/otel-allocator/internal/config/config.go

File renamed without changes.

‎cmd/otel-allocator/config/config_test.go ‎cmd/otel-allocator/internal/config/config_test.go

File renamed without changes.

‎cmd/otel-allocator/config/flags.go ‎cmd/otel-allocator/internal/config/flags.go

File renamed without changes.

‎cmd/otel-allocator/config/flags_test.go ‎cmd/otel-allocator/internal/config/flags_test.go

File renamed without changes.

‎cmd/otel-allocator/config/testdata/config_test.yaml ‎cmd/otel-allocator/internal/config/testdata/config_test.yaml

File renamed without changes.

‎cmd/otel-allocator/config/testdata/file_sd_test.json ‎cmd/otel-allocator/internal/config/testdata/file_sd_test.json

File renamed without changes.

‎cmd/otel-allocator/config/testdata/no_config.yaml ‎cmd/otel-allocator/internal/config/testdata/no_config.yaml

File renamed without changes.

‎cmd/otel-allocator/config/testdata/pod_service_selector_camelcase_expressions_test.yaml ‎cmd/otel-allocator/internal/config/testdata/pod_service_selector_camelcase_expressions_test.yaml

File renamed without changes.

‎cmd/otel-allocator/config/testdata/pod_service_selector_camelcase_test.yaml ‎cmd/otel-allocator/internal/config/testdata/pod_service_selector_camelcase_test.yaml

File renamed without changes.

‎cmd/otel-allocator/config/testdata/pod_service_selector_expressions_test.yaml ‎cmd/otel-allocator/internal/config/testdata/pod_service_selector_expressions_test.yaml

File renamed without changes.

‎cmd/otel-allocator/config/testdata/pod_service_selector_test.yaml ‎cmd/otel-allocator/internal/config/testdata/pod_service_selector_test.yaml

File renamed without changes.

‎cmd/otel-allocator/diff/diff.go ‎cmd/otel-allocator/internal/diff/diff.go

File renamed without changes.

‎cmd/otel-allocator/diff/diff_test.go ‎cmd/otel-allocator/internal/diff/diff_test.go

File renamed without changes.

‎cmd/otel-allocator/prehook/prehook.go ‎cmd/otel-allocator/internal/prehook/prehook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/go-logr/logr"
88
"github.com/prometheus/prometheus/model/relabel"
99

10-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
10+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1111
)
1212

1313
type Hook interface {

‎cmd/otel-allocator/prehook/relabel.go ‎cmd/otel-allocator/internal/prehook/relabel.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/go-logr/logr"
88
"github.com/prometheus/prometheus/model/relabel"
99

10-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
10+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1111
)
1212

1313
const (

‎cmd/otel-allocator/prehook/relabel_test.go ‎cmd/otel-allocator/internal/prehook/relabel_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/stretchr/testify/assert"
1717
logf "sigs.k8s.io/controller-runtime/pkg/log"
1818

19-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
19+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2020
)
2121

2222
var (

‎cmd/otel-allocator/server/bench_test.go ‎cmd/otel-allocator/internal/server/bench_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/prometheus/prometheus/model/labels"
1717
"github.com/stretchr/testify/assert"
1818

19-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
20-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
19+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
20+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2121
)
2222

2323
func BenchmarkServerTargetsHandler(b *testing.B) {

‎cmd/otel-allocator/server/mocks_test.go ‎cmd/otel-allocator/internal/server/mocks_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
package server
55

66
import (
7-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
8-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
7+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
8+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
99
)
1010

1111
var _ allocation.Allocator = &mockAllocator{}

‎cmd/otel-allocator/server/server.go ‎cmd/otel-allocator/internal/server/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/prometheus/prometheus/model/labels"
2727
"gopkg.in/yaml.v2"
2828

29-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
30-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
29+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
30+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
3131
)
3232

3333
var (

‎cmd/otel-allocator/server/server_test.go ‎cmd/otel-allocator/internal/server/server_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"gopkg.in/yaml.v2"
2525
logf "sigs.k8s.io/controller-runtime/pkg/log"
2626

27-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
28-
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
29-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
27+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
28+
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
29+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
3030
)
3131

3232
var (

‎cmd/otel-allocator/server/testdata/prom-config-all-actions.yaml ‎cmd/otel-allocator/internal/server/testdata/prom-config-all-actions.yaml

File renamed without changes.

‎cmd/otel-allocator/server/testdata/prom-config-test.yaml ‎cmd/otel-allocator/internal/server/testdata/prom-config-test.yaml

File renamed without changes.

‎cmd/otel-allocator/server/testdata/prom-no-config.yaml ‎cmd/otel-allocator/internal/server/testdata/prom-no-config.yaml

File renamed without changes.

‎cmd/otel-allocator/target/discovery.go ‎cmd/otel-allocator/internal/target/discovery.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"go.uber.org/zap/zapcore"
2222
"gopkg.in/yaml.v3"
2323

24-
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
24+
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
2525
)
2626

2727
var (

‎cmd/otel-allocator/target/discovery_test.go ‎cmd/otel-allocator/internal/target/discovery_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/stretchr/testify/require"
2323
ctrl "sigs.k8s.io/controller-runtime"
2424

25-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
26-
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
25+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
26+
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
2727
)
2828

2929
var defaultScrapeProtocols = []promconfig.ScrapeProtocol{

‎cmd/otel-allocator/target/target.go ‎cmd/otel-allocator/internal/target/target.go

File renamed without changes.

‎cmd/otel-allocator/target/testdata/test.yaml ‎cmd/otel-allocator/internal/target/testdata/test.yaml

File renamed without changes.

‎cmd/otel-allocator/target/testdata/test_update.yaml ‎cmd/otel-allocator/internal/target/testdata/test_update.yaml

File renamed without changes.

‎cmd/otel-allocator/watcher/promOperator.go ‎cmd/otel-allocator/internal/watcher/promOperator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/client-go/tools/cache"
3434
"k8s.io/client-go/util/retry"
3535

36-
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
36+
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
3737
)
3838

3939
const (

‎cmd/otel-allocator/watcher/promOperator_test.go ‎cmd/otel-allocator/internal/watcher/promOperator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
fcache "k8s.io/client-go/tools/cache/testing"
3636
"k8s.io/utils/ptr"
3737

38-
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
38+
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
3939
)
4040

4141
var defaultScrapeProtocols = []promconfig.ScrapeProtocol{

‎cmd/otel-allocator/watcher/watcher.go ‎cmd/otel-allocator/internal/watcher/watcher.go

File renamed without changes.

‎cmd/otel-allocator/main.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import (
1818
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
1919
ctrl "sigs.k8s.io/controller-runtime"
2020

21-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
22-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/collector"
23-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
24-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/prehook"
25-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/server"
26-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
27-
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
21+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
22+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/collector"
23+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
24+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/prehook"
25+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/server"
26+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
27+
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
2828
)
2929

3030
var (

0 commit comments

Comments
 (0)