Skip to content

Commit 416d83a

Browse files
committed
ipam: Move metrics and stats to operator/pkg
`pkg/ipam/metrics` and `pkg/ipam/stats` are only imported by operator code. This commit continues work started in afbcb75 and moves those packages under `operator/pkg/ipam/` so the agent/operator boundary becomes more clear. Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
1 parent 80aa4bb commit 416d83a

18 files changed

Lines changed: 15 additions & 15 deletions

File tree

operator/pkg/ipam/alibabacloud.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
operatorOption "github.com/cilium/cilium/operator/option"
1717
"github.com/cilium/cilium/operator/pkg/ipam/allocator/alibabacloud"
18-
ipamMetrics "github.com/cilium/cilium/pkg/ipam/metrics"
18+
ipamMetrics "github.com/cilium/cilium/operator/pkg/ipam/metrics"
1919
ipamOption "github.com/cilium/cilium/pkg/ipam/option"
2020
k8sClient "github.com/cilium/cilium/pkg/k8s/client"
2121
"github.com/cilium/cilium/pkg/metrics"

operator/pkg/ipam/aws.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/spf13/pflag"
1515

1616
"github.com/cilium/cilium/operator/pkg/ipam/allocator/aws"
17-
ipamMetrics "github.com/cilium/cilium/pkg/ipam/metrics"
17+
ipamMetrics "github.com/cilium/cilium/operator/pkg/ipam/metrics"
1818
ipamOption "github.com/cilium/cilium/pkg/ipam/option"
1919
k8sClient "github.com/cilium/cilium/pkg/k8s/client"
2020
"github.com/cilium/cilium/pkg/metrics"

operator/pkg/ipam/azure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
operatorOption "github.com/cilium/cilium/operator/option"
1717
"github.com/cilium/cilium/operator/pkg/ipam/allocator/azure"
18-
ipamMetrics "github.com/cilium/cilium/pkg/ipam/metrics"
18+
ipamMetrics "github.com/cilium/cilium/operator/pkg/ipam/metrics"
1919
ipamOption "github.com/cilium/cilium/pkg/ipam/option"
2020
k8sClient "github.com/cilium/cilium/pkg/k8s/client"
2121
"github.com/cilium/cilium/pkg/metrics"

operator/pkg/ipam/cell.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/cilium/cilium/operator/option"
1212
"github.com/cilium/cilium/operator/pkg/ipam/allocator"
13-
ipamMetrics "github.com/cilium/cilium/pkg/ipam/metrics"
13+
ipamMetrics "github.com/cilium/cilium/operator/pkg/ipam/metrics"
1414
"github.com/cilium/cilium/pkg/metrics"
1515
)
1616

operator/pkg/ipam/clusterpool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/spf13/pflag"
1515

1616
"github.com/cilium/cilium/operator/pkg/ipam/allocator/clusterpool"
17-
ipamMetrics "github.com/cilium/cilium/pkg/ipam/metrics"
17+
ipamMetrics "github.com/cilium/cilium/operator/pkg/ipam/metrics"
1818
ipamOption "github.com/cilium/cilium/pkg/ipam/option"
1919
k8sClient "github.com/cilium/cilium/pkg/k8s/client"
2020
"github.com/cilium/cilium/pkg/option"
File renamed without changes.

pkg/alibabacloud/eni/node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/cilium/cilium/pkg/alibabacloud/utils"
1515
"github.com/cilium/cilium/pkg/defaults"
1616
"github.com/cilium/cilium/pkg/ipam"
17-
"github.com/cilium/cilium/pkg/ipam/stats"
17+
"github.com/cilium/cilium/operator/pkg/ipam/stats"
1818
ipamTypes "github.com/cilium/cilium/pkg/ipam/types"
1919
v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
2020
"github.com/cilium/cilium/pkg/lock"

0 commit comments

Comments
 (0)