Skip to content

Commit 3033807

Browse files
atoulmeatoulme
committed
[chore] move all target-allocator code to internal
1 parent a36367b commit 3033807

Some content is hidden

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

43 files changed

+37
-37
lines changed

‎cmd/otel-allocator/benchmark_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import (
3333
ctrl "sigs.k8s.io/controller-runtime"
3434
"sigs.k8s.io/controller-runtime/pkg/log"
3535

36-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
37-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/prehook"
38-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/server"
39-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
36+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
37+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/prehook"
38+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/server"
39+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
4040
)
4141

4242
// 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
@@ -21,8 +21,8 @@ import (
2121
"github.com/go-logr/logr"
2222
"github.com/prometheus/client_golang/prometheus"
2323

24-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
25-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
24+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/diff"
25+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2626
)
2727

2828
/*

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

File renamed without changes.

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

File renamed without changes.

‎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
@@ -15,7 +15,7 @@
1515
package allocation
1616

1717
import (
18-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
18+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
1919
)
2020

2121
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

File renamed without changes.

‎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
@@ -21,7 +21,7 @@ import (
2121
"github.com/stretchr/testify/assert"
2222
logf "sigs.k8s.io/controller-runtime/pkg/log"
2323

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

2727
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
@@ -23,7 +23,7 @@ import (
2323
"github.com/prometheus/client_golang/prometheus"
2424
"github.com/prometheus/client_golang/prometheus/promauto"
2525

26-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
26+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2727
)
2828

2929
type AllocatorProvider func(log logr.Logger, opts ...AllocationOption) 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
@@ -19,7 +19,7 @@ import (
1919
"reflect"
2020
"testing"
2121

22-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
22+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/diff"
2323
)
2424

2525
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
@@ -25,7 +25,7 @@ import (
2525
"github.com/stretchr/testify/require"
2626
logf "sigs.k8s.io/controller-runtime/pkg/log"
2727

28-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
28+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2929
)
3030

3131
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
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/client-go/rest"
2929
"k8s.io/client-go/tools/cache"
3030

31-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
31+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
3232
)
3333

3434
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
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/client-go/kubernetes/fake"
2929
logf "sigs.k8s.io/controller-runtime/pkg/log"
3030

31-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
31+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
3232
)
3333

3434
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_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
@@ -20,7 +20,7 @@ import (
2020
"github.com/go-logr/logr"
2121
"github.com/prometheus/prometheus/model/relabel"
2222

23-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
23+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2424
)
2525

2626
const (

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/go-logr/logr"
1919
"github.com/prometheus/prometheus/model/relabel"
2020

21-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
21+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
2222
)
2323

2424
type RelabelConfigTargetFilter struct {

‎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
@@ -27,7 +27,7 @@ import (
2727
"github.com/stretchr/testify/assert"
2828
logf "sigs.k8s.io/controller-runtime/pkg/log"
2929

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

3333
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
@@ -27,8 +27,8 @@ import (
2727
"github.com/prometheus/prometheus/model/labels"
2828
"github.com/stretchr/testify/assert"
2929

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

3434
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
@@ -15,8 +15,8 @@
1515
package server
1616

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

2222
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
@@ -38,8 +38,8 @@ import (
3838
"github.com/prometheus/prometheus/model/labels"
3939
"gopkg.in/yaml.v2"
4040

41-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
42-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
41+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
42+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
4343
)
4444

4545
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
@@ -35,9 +35,9 @@ import (
3535
"gopkg.in/yaml.v2"
3636
logf "sigs.k8s.io/controller-runtime/pkg/log"
3737

38-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
39-
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
40-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
38+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
39+
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
40+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
4141
)
4242

4343
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
@@ -32,7 +32,7 @@ import (
3232
"go.uber.org/zap/zapcore"
3333
"gopkg.in/yaml.v3"
3434

35-
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
35+
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
3636
)
3737

3838
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
@@ -33,8 +33,8 @@ import (
3333
"github.com/stretchr/testify/require"
3434
ctrl "sigs.k8s.io/controller-runtime"
3535

36-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
37-
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
36+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
37+
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
3838
)
3939

4040
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
@@ -44,7 +44,7 @@ import (
4444
"k8s.io/client-go/tools/cache"
4545
"k8s.io/client-go/util/retry"
4646

47-
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
47+
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
4848
)
4949

5050
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
@@ -46,7 +46,7 @@ import (
4646
fcache "k8s.io/client-go/tools/cache/testing"
4747
"k8s.io/utils/ptr"
4848

49-
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
49+
allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
5050
)
5151

5252
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
@@ -29,13 +29,13 @@ import (
2929
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
3030
ctrl "sigs.k8s.io/controller-runtime"
3131

32-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
33-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/collector"
34-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
35-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/prehook"
36-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/server"
37-
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
38-
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
32+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
33+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/collector"
34+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
35+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/prehook"
36+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/server"
37+
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
38+
allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
3939
)
4040

4141
var (

0 commit comments

Comments
 (0)