Skip to content

Commit 7235ff3

Browse files
committed
aws: Rename eni package to ipam
Rename `pkg/aws/eni` to `pkg/aws/ipam` so the operator-side IPAM allocator (the `ipamTypes.NodeOperations` implementation that runs in the Cilium Operator) lives under a name that describes its role and is consistent with other cloud provider packages (`pkg/$cloud/{api,metadata,types,ipam}` layout). Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
1 parent ec1db93 commit 7235ff3

14 files changed

Lines changed: 18 additions & 18 deletions

File tree

operator/pkg/ipam/allocator/aws/aws.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/cilium/cilium/operator/pkg/ipam/allocator"
1616
"github.com/cilium/cilium/operator/pkg/ipam/nodemanager"
1717
"github.com/cilium/cilium/pkg/aws/api"
18-
"github.com/cilium/cilium/pkg/aws/eni"
18+
"github.com/cilium/cilium/pkg/aws/ipam"
1919
"github.com/cilium/cilium/pkg/aws/metadata"
2020
"github.com/cilium/cilium/pkg/defaults"
2121
"github.com/cilium/cilium/pkg/logging/logfields"
@@ -133,7 +133,7 @@ func (a *AllocatorAWS) Start(ctx context.Context, getterUpdater allocator.Cilium
133133
if err != nil {
134134
return nil, fmt.Errorf("unable to initialize metadata client: %w", err)
135135
}
136-
instances, err := eni.NewInstancesManager(ctx, a.rootLogger, a.client, imds)
136+
instances, err := ipam.NewInstancesManager(ctx, a.rootLogger, a.client, imds)
137137
if err != nil {
138138
return nil, fmt.Errorf("unable to initialize ENI instances manager: %w", err)
139139
}
@@ -149,7 +149,7 @@ func (a *AllocatorAWS) Start(ctx context.Context, getterUpdater allocator.Cilium
149149
}
150150

151151
if a.ENIGarbageCollectionInterval > 0 {
152-
eni.StartENIGarbageCollector(ctx, a.rootLogger, a.client, eni.GarbageCollectionParams{
152+
ipam.StartENIGarbageCollector(ctx, a.rootLogger, a.client, ipam.GarbageCollectionParams{
153153
RunInterval: a.ENIGarbageCollectionInterval,
154154
MaxPerInterval: defaults.ENIGarbageCollectionMaxPerInterval,
155155
ENITags: a.eniGCTags,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright Authors of Cilium
33

4-
// Package eni implements AWS ENI allocation logic
5-
package eni
4+
// Package ipam implements AWS ENI allocation logic
5+
package ipam
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright Authors of Cilium
33

4-
package eni
4+
package ipam
55

66
import (
77
"context"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright Authors of Cilium
33

4-
package eni
4+
package ipam
55

66
import (
77
"context"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Copyright 2017 Lyft, Inc.
55

6-
package eni
6+
package ipam
77

88
import (
99
"context"
@@ -16,7 +16,7 @@ import (
1616
ec2_types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
1717

1818
"github.com/cilium/cilium/operator/pkg/ipam/nodemanager"
19-
"github.com/cilium/cilium/pkg/aws/eni/limits"
19+
"github.com/cilium/cilium/pkg/aws/ipam/limits"
2020
"github.com/cilium/cilium/pkg/aws/metadata"
2121
"github.com/cilium/cilium/pkg/aws/types"
2222
iputil "github.com/cilium/cilium/pkg/ip"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright Authors of Cilium
33

4-
package eni
4+
package ipam
55

66
import (
77
"net/netip"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright Authors of Cilium
33

4-
package eni
4+
package ipam
55

66
import (
77
"github.com/cilium/cilium/pkg/logging/logfields"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Copyright 2017 Lyft, Inc.
55

6-
package eni
6+
package ipam
77

88
import (
99
"context"

0 commit comments

Comments
 (0)