Merge pull request #310 from l1b0k/feature/improve

improve controlplane

Author: l1b0k

Dockerfile

@@ -2,11 +2,11 @@ ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:0147a23fdada32bd51b4f313c645bcb
 ARG CILIUM_BPFTOOL_IMAGE=quay.io/cilium/cilium-bpftool:b5ba881d2a7ec68d88ecd72efd60ac551c720701@sha256:458282e59657b8f779d52ae2be2cdbeecfe68c3d807ff87c97c8d5c6f97820a9
 ARG CILIUM_IPROUTE2_IMAGE=quay.io/cilium/cilium-iproute2:4db2c4bdf00ce461406e1c82aada461356fac935@sha256:e4c9ba92996a07964c1b7cd97c4aac950754ec75d7ac8c626a99c79acd0479ab
 
-FROM ${CILIUM_LLVM_IMAGE} as llvm-dist
-FROM ${CILIUM_BPFTOOL_IMAGE} as bpftool-dist
-FROM ${CILIUM_IPROUTE2_IMAGE} as iproute2-dist
+FROM --platform=$BUILDPLATFORM ${CILIUM_LLVM_IMAGE} as llvm-dist
+FROM --platform=$BUILDPLATFORM ${CILIUM_BPFTOOL_IMAGE} as bpftool-dist
+FROM --platform=$BUILDPLATFORM ${CILIUM_IPROUTE2_IMAGE} as iproute2-dist
 
-FROM golang:1.17.2 as builder
+FROM --platform=$BUILDPLATFORM golang:1.17.2 as builder
 ARG GOPROXY
 ENV GOPROXY $GOPROXY
 WORKDIR /go/src/github.com/AliyunContainerService/terway/
@@ -22,7 +22,7 @@ RUN cd cmd/terway && CGO_ENABLED=0 GOOS=linux go build -tags default_build \
 RUN cd plugin/terway && CGO_ENABLED=0 GOOS=linux go build -o terway .
 RUN cd cmd/terway-cli && CGO_ENABLED=0 GOOS=linux go build -o terway-cli .
 
-FROM calico/go-build:v0.57 as felix-builder
+FROM --platform=$BUILDPLATFORM calico/go-build:v0.57 as felix-builder
 ARG GOPROXY
 ENV GOPROXY $GOPROXY
 ENV GIT_BRANCH=v3.20.2
@@ -44,7 +44,7 @@ RUN cd /go/src/github.com/projectcalico/felix && \
     ( echo "Error: bin/calico-felix was not statically linked"; false ) ) \
     && chmod +x /go/src/github.com/projectcalico/felix/bin/calico-felix
 
-FROM quay.io/cilium/cilium-builder:6ad397fc5d0e2ccba203d5c0fe5a4f0a08f6fb5a@sha256:d760b821c46ce41361a2d54386b12fd9831fbc0ba36539b86604706dd68f05d1 as cilium-builder
+FROM --platform=$BUILDPLATFORM quay.io/cilium/cilium-builder:6ad397fc5d0e2ccba203d5c0fe5a4f0a08f6fb5a@sha256:d760b821c46ce41361a2d54386b12fd9831fbc0ba36539b86604706dd68f05d1 as cilium-builder
 ARG GOPROXY
 ENV GOPROXY $GOPROXY
 ARG CILIUM_SHA=""
@@ -71,7 +71,7 @@ RUN cd cilium && make NOSTRIP=$NOSTRIP LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 V=$V LIB
     SKIP_DOCS=true DESTDIR=/tmp/install clean-container build-container install-container
 RUN cp /tmp/install/opt/cni/bin/cilium-cni /tmp/install/usr/bin/
 
-FROM ubuntu:20.04
+FROM --platform=$BUILDPLATFORM ubuntu:20.04
 RUN apt-get update && apt-get install -y kmod libelf1 libmnl0 iptables nftables kmod curl ipset bash ethtool bridge-utils socat grep findutils jq conntrack iputils-ping && \
     apt-get purge --auto-remove && apt-get clean && rm -rf /var/lib/apt/lists/*
 COPY --from=llvm-dist /usr/local/bin/clang /usr/local/bin/llc /bin/

Dockerfile.controlplane

@@ -1,4 +1,4 @@
-FROM golang:1.17.2 as builder
+FROM --platform=$BUILDPLATFORM golang:1.17.2 as builder
 ARG GOPROXY
 ENV GOPROXY $GOPROXY
 WORKDIR /go/src/github.com/AliyunContainerService/terway/
@@ -12,7 +12,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -tags default_build \
     -X \"k8s.io/client-go/pkg/version.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`\"" \
     -o terway-controlplane  cmd/terway-controlplane/terway-controlplane.go
 
-FROM ubuntu:20.04
+FROM --platform=$BUILDPLATFORM ubuntu:20.04
 RUN apt-get update && apt-get install -y curl jq && \
     apt-get purge --auto-remove && apt-get clean && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /go/src/github.com/AliyunContainerService/terway/terway-controlplane /usr/bin/terway-controlplane

daemon/daemon.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/AliyunContainerService/terway/pkg/aliyun"
 	podENITypes "github.com/AliyunContainerService/terway/pkg/apis/network.alibabacloud.com/v1beta1"
+	"github.com/AliyunContainerService/terway/pkg/backoff"
 	terwayIP "github.com/AliyunContainerService/terway/pkg/ip"
 	"github.com/AliyunContainerService/terway/pkg/ipam"
 	"github.com/AliyunContainerService/terway/pkg/link"
@@ -1293,6 +1294,8 @@ func newNetworkService(configFilePath, kubeconfig, master, daemonMode string) (r
 		return nil, fmt.Errorf("failed parse config: %v", err)
 	}
 
+	backoff.OverrideBackoff(config.BackoffOverride)
+
 	if len(dynamicCfg) == 0 {
 		serviceLog.Infof("got config: %+v from: %+v", config, configFilePath)
 	} else {

daemon/k8s.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/AliyunContainerService/terway/deviceplugin"
 	podENITypes "github.com/AliyunContainerService/terway/pkg/apis/network.alibabacloud.com/v1beta1"
+	"github.com/AliyunContainerService/terway/pkg/backoff"
 	"github.com/AliyunContainerService/terway/pkg/generated/clientset/versioned/typed/network.alibabacloud.com/v1beta1"
 	"github.com/AliyunContainerService/terway/pkg/storage"
 	"github.com/AliyunContainerService/terway/pkg/tracing"
@@ -179,12 +180,7 @@ func (k *k8s) PatchEipInfo(info *types.PodInfo) error {
 }
 
 func (k *k8s) WaitPodENIInfo(info *types.PodInfo) (podEni *podENITypes.PodENI, err error) {
-	err = wait.ExponentialBackoff(wait.Backoff{
-		Duration: time.Second * 5,
-		Factor:   2,
-		Jitter:   0.3,
-		Steps:    3,
-	}, func() (bool, error) {
+	err = wait.ExponentialBackoff(backoff.Backoff(backoff.WaitPodENIStatus), func() (bool, error) {
 		podEni, err = k.podEniClient.PodENIs(info.Namespace).Get(context.TODO(), info.Name, metav1.GetOptions{
 			ResourceVersion: "0",
 		})
@@ -205,12 +201,7 @@ func (k *k8s) WaitPodENIInfo(info *types.PodInfo) (podEni *podENITypes.PodENI, e
 }
 
 func (k *k8s) GetPodENIInfo(info *types.PodInfo) (podEni *podENITypes.PodENI, err error) {
-	err = wait.ExponentialBackoff(wait.Backoff{
-		Duration: time.Second * 1,
-		Factor:   2,
-		Jitter:   0.3,
-		Steps:    3,
-	}, func() (bool, error) {
+	err = wait.ExponentialBackoff(backoff.Backoff(backoff.WaitPodENIStatus), func() (bool, error) {
 		podEni, err = k.podEniClient.PodENIs(info.Namespace).Get(context.TODO(), info.Name, metav1.GetOptions{
 			ResourceVersion: "0",
 		})

docs/terway-trunk.md

@@ -105,7 +105,7 @@ spec:
     namespaceSelector:
       matchLabels:
         foo: bar
-  vSwitchIDs:
+  vSwitchOptions:
     - vsw-aaa
   securityGroupIDs:
     - sg-aaa
@@ -122,12 +122,12 @@ spec:
 - selector: 用于配置标签选择器，同时配置 podSelector、namespaceSelector 时，将全部生效
   - podSelector: 用来匹配 pod 的 labels
   - namespaceSelector: 用来匹配 namespace 的 labels
-- vSwitchIDs: 用于配置 Pod 使用的 vSwitch。多个vSwitchID 之间为或关系。Pod 仅能使用一个 vSwitch ，terway 将根据配置顺序、vSwitch region 选择一个 vSwitch
+- vSwitchOptions: 用于配置 Pod 使用的 vSwitch。多个vSwitchID 之间为或关系。Pod 仅能使用一个 vSwitch ，terway 将根据配置顺序、vSwitch region 选择一个 vSwitch
 - securityGroupIDs: 可配置多个安全组 ID，配置多个安全组时将同时生效。安全组数量小于等于 5个
 
 > 请确保 Pod 可以被唯一的 PodNetworking 配置匹配，避免歧义
 >
-> 我们强烈建议用户主动配置 vSwitchIDs、securityGroupIDs 字段，如果不配置，则使用 kube-system/eni-config 中的默认值
+> 我们强烈建议用户主动配置 vSwitchOptions、securityGroupIDs 字段，如果不配置，则使用 kube-system/eni-config 中的默认值
 
 创建PodNetworking 后，controller 会对 PodNetworking 进行同步，当同步完成 PodNetworking 中  Status 会标记状态 `Ready`
 
@@ -193,7 +193,7 @@ spec:
       matchLabels:
         kind: front
         app: nginx
-  vSwitchIDs:
+  vSwitchOptions:
     - vsw-bp1s5grzef87ikb5zz1px
     - vsw-bp1sx0zhxd6bw6vpt0hbl
   securityGroupIDs:

go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/vishvananda/netlink v1.1.1-0.20210510164352-d17758a128bf
 	golang.org/x/net v0.0.0-20210504132125-bbd867fde50d
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20211013075003-97ac67df715c
 	gomodules.xyz/jsonpatch/v2 v2.1.0
 	google.golang.org/grpc v1.38.0

go.sum

@@ -1068,6 +1068,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

pkg/aliyun/aliyun.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	apiErr "github.com/AliyunContainerService/terway/pkg/aliyun/errors"
+	"github.com/AliyunContainerService/terway/pkg/backoff"
 	"github.com/AliyunContainerService/terway/pkg/ip"
 	"github.com/AliyunContainerService/terway/pkg/ipam"
 	"github.com/AliyunContainerService/terway/pkg/logger"
@@ -87,7 +88,7 @@ func (e *Impl) AllocateENI(ctx context.Context, vSwitch string, securityGroups [
 	}()
 
 	var innerErr error
-	err = wait.ExponentialBackoffWithContext(ctx, ENIOpBackoff, func() (bool, error) {
+	err = wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.WaitENIStatus), func() (bool, error) {
 		innerErr = e.AttachNetworkInterface(ctx, resp.NetworkInterfaceId, instanceID, "")
 		if innerErr != nil {
 			return false, nil
@@ -105,8 +106,8 @@ func (e *Impl) AllocateENI(ctx context.Context, vSwitch string, securityGroups [
 
 	start := time.Now()
 	// bind status is async api, sleep for first bind status inspect
-	time.Sleep(eniStateBackoff.Duration)
-	eniStatus, err := e.WaitForNetworkInterface(ctx, resp.NetworkInterfaceId, ENIStatusInUse, eniStateBackoff, false)
+	time.Sleep(backoff.Backoff(backoff.WaitENIStatus).Duration)
+	eniStatus, err := e.WaitForNetworkInterface(ctx, resp.NetworkInterfaceId, ENIStatusInUse, backoff.Backoff(backoff.WaitENIStatus), false)
 	metric.OpenAPILatency.WithLabelValues("WaitForNetworkInterfaceBind/"+string(ENIStatusInUse), fmt.Sprint(err != nil)).Observe(metric.MsSince(start))
 
 	if err != nil {
@@ -115,8 +116,7 @@ func (e *Impl) AllocateENI(ctx context.Context, vSwitch string, securityGroups [
 
 	var eni *types.ENI
 	// backoff get eni config
-	err = wait.ExponentialBackoffWithContext(ctx,
-		eniStateBackoff,
+	err = wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.WaitENIStatus),
 		func() (done bool, err error) {
 			l, ok := GetLimit(GetInstanceMeta().InstanceType)
 			if !ok {
@@ -147,8 +147,7 @@ func (e *Impl) FreeENI(ctx context.Context, eniID, instanceID string) error {
 
 func (e *Impl) destroyInterface(ctx context.Context, eniID, instanceID, trunkENIID string) error {
 	var innerErr error
-	err := wait.ExponentialBackoffWithContext(ctx,
-		eniReleaseBackoff,
+	err := wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.ENIRelease),
 		func() (done bool, err error) {
 			innerErr = e.DetachNetworkInterface(ctx, eniID, instanceID, trunkENIID)
 			if innerErr != nil {
@@ -163,11 +162,10 @@ func (e *Impl) destroyInterface(ctx context.Context, eniID, instanceID, trunkENI
 			tracing.DisposeResourceFailed, fmtErr)
 	}
 
-	time.Sleep(eniStateBackoff.Duration)
+	time.Sleep(backoff.Backoff(backoff.WaitENIStatus).Duration)
 
 	// backoff delete network interface
-	err = wait.ExponentialBackoffWithContext(ctx,
-		eniReleaseBackoff,
+	err = wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.ENIOps),
 		func() (done bool, err error) {
 			innerErr = e.DeleteNetworkInterface(context.Background(), eniID)
 			if innerErr != nil {
@@ -272,7 +270,7 @@ func (e *Impl) AssignNIPsForENI(ctx context.Context, eniID, mac string, count in
 
 	if e.ipFamily.IPv4 {
 		var innerErr error
-		err = wait.ExponentialBackoffWithContext(ctx, ENIOpBackoff, func() (bool, error) {
+		err = wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.ENIOps), func() (bool, error) {
 			ipv4s, innerErr = e.AssignPrivateIPAddress(ctx, eniID, count)
 			if innerErr != nil {
 				if apiErr.ErrAssert(apiErr.InvalidVSwitchIDIPNotEnough, innerErr) {
@@ -291,8 +289,7 @@ func (e *Impl) AssignNIPsForENI(ctx context.Context, eniID, mac string, count in
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			v4Err = wait.ExponentialBackoffWithContext(ctx,
-				MetadataAssignPrivateIPBackoff,
+			v4Err = wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.MetaAssignPrivateIP),
 				func() (done bool, err error) {
 					remoteIPs, err := e.metadata.GetENIPrivateAddressesByMAC(mac)
 					if err != nil {
@@ -309,7 +306,7 @@ func (e *Impl) AssignNIPsForENI(ctx context.Context, eniID, mac string, count in
 
 	if e.ipFamily.IPv6 {
 		var innerErr error
-		err = wait.ExponentialBackoffWithContext(ctx, ENIOpBackoff, func() (bool, error) {
+		err = wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.ENIOps), func() (bool, error) {
 			ipv6s, innerErr = e.AssignIpv6Addresses(ctx, eniID, count)
 			if innerErr != nil {
 				if apiErr.ErrAssert(apiErr.InvalidVSwitchIDIPNotEnough, innerErr) {
@@ -328,8 +325,7 @@ func (e *Impl) AssignNIPsForENI(ctx context.Context, eniID, mac string, count in
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			v6Err = wait.ExponentialBackoffWithContext(ctx,
-				MetadataAssignPrivateIPBackoff,
+			v6Err = wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.MetaAssignPrivateIP),
 				func() (done bool, err error) {
 					remoteIPs, err := e.metadata.GetENIPrivateIPv6AddressesByMAC(mac)
 					if err != nil {
@@ -365,7 +361,7 @@ func (e *Impl) unAssignIPsForENIUnSafe(ctx context.Context, eniID, mac string, i
 	if len(ipv4s) > 0 {
 		var innerErr error
 
-		err := wait.ExponentialBackoffWithContext(ctx, ENIOpBackoff, func() (bool, error) {
+		err := wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.ENIOps), func() (bool, error) {
 			innerErr = e.UnAssignPrivateIPAddresses(ctx, eniID, ipv4s)
 			if innerErr != nil {
 				return false, nil
@@ -380,7 +376,7 @@ func (e *Impl) unAssignIPsForENIUnSafe(ctx context.Context, eniID, mac string, i
 	if len(ipv6s) > 0 {
 		var innerErr error
 
-		err := wait.ExponentialBackoffWithContext(ctx, ENIOpBackoff, func() (bool, error) {
+		err := wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.ENIOps), func() (bool, error) {
 			innerErr = e.UnAssignIpv6Addresses(ctx, eniID, ipv6s)
 			if innerErr != nil {
 				return false, nil
@@ -402,12 +398,11 @@ func (e *Impl) unAssignIPsForENIUnSafe(ctx context.Context, eniID, mac string, i
 	start := time.Now()
 
 	// unassignPrivateIpAddresses is async api, sleep for first ip addr inspect
-	time.Sleep(MetadataUnAssignPrivateIPBackoff.Duration)
+	time.Sleep(backoff.Backoff(backoff.MetaUnAssignPrivateIP).Duration)
 	// backoff get interface addresses
 	var innerErr error
 
-	err := wait.ExponentialBackoffWithContext(ctx,
-		MetadataUnAssignPrivateIPBackoff,
+	err := wait.ExponentialBackoffWithContext(ctx, backoff.Backoff(backoff.MetaUnAssignPrivateIP),
 		func() (done bool, err error) {
 			if len(ipv4s) > 0 {
 				remoteIPs, err := e.metadata.GetENIPrivateAddressesByMAC(mac)

pkg/aliyun/ecs.go

@@ -222,14 +222,18 @@ func (a *OpenAPI) WaitForNetworkInterface(ctx context.Context, eniID string, sta
 	}
 	err := wait.ExponentialBackoff(backoff,
 		func() (done bool, err error) {
-			eni, err := a.DescribeNetworkInterface(ctx, "", []string{eniID}, "", "", status)
+			eni, err := a.DescribeNetworkInterface(ctx, "", []string{eniID}, "", "", "")
 			if err != nil {
 				return false, nil
 			}
 			if len(eni) == 0 && ignoreNotExist {
 				return true, apiErr.ErrNotFound
 			}
 			if len(eni) == 1 {
+				if string(status) != eni[0].Status {
+					return false, nil
+				}
+
 				eniInfo = &eni[0]
 				return true, nil
 			}

pkg/aliyun/eip.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	apiErr "github.com/AliyunContainerService/terway/pkg/aliyun/errors"
+	"github.com/AliyunContainerService/terway/pkg/backoff"
 	"github.com/AliyunContainerService/terway/pkg/ip"
 	"github.com/AliyunContainerService/terway/pkg/metric"
 	"github.com/AliyunContainerService/terway/types"
@@ -25,7 +26,7 @@ func (e *Impl) AllocateEipAddress(ctx context.Context, bandwidth int, chargeType
 		err     error
 	)
 	var eni *ecs.NetworkInterfaceSet
-	eni, err = e.WaitForNetworkInterface(ctx, eniID, "", ENIOpBackoff, false)
+	eni, err = e.WaitForNetworkInterface(ctx, eniID, "", backoff.Backoff(backoff.ENIOps), false)
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +129,7 @@ func (e *Impl) AllocateEipAddress(ctx context.Context, bandwidth int, chargeType
 			time.Sleep(3 * time.Second)
 
 			start := time.Now()
-			_, err = e.WaitForEIP(eipID, eipStatusAvailable, eniStateBackoff)
+			_, err = e.WaitForEIP(eipID, eipStatusAvailable, backoff.Backoff(backoff.WaitENIStatus))
 			metric.OpenAPILatency.WithLabelValues("UnassociateEipAddress/Async", fmt.Sprint(err != nil)).Observe(metric.MsSince(start))
 			if err != nil {
 				return nil, fmt.Errorf("error wait for eip to status Available: %v", err)
@@ -149,7 +150,7 @@ func (e *Impl) AllocateEipAddress(ctx context.Context, bandwidth int, chargeType
 	time.Sleep(3 * time.Second)
 
 	start := time.Now()
-	_, err = e.WaitForEIP(eipInfo.ID, "InUse", eniStateBackoff)
+	_, err = e.WaitForEIP(eipInfo.ID, "InUse", backoff.Backoff(backoff.WaitENIStatus))
 	metric.OpenAPILatency.WithLabelValues("AssociateEipAddress/Async", fmt.Sprint(err != nil)).Observe(metric.MsSince(start))
 	if err != nil {
 		return nil, fmt.Errorf("wait for eip error: %v", err)
@@ -163,7 +164,7 @@ func (e *Impl) AllocateEipAddress(ctx context.Context, bandwidth int, chargeType
 // 3. if eip is not bind ,return code is IncorrectEipStatus
 func (e *Impl) UnassociateEipAddress(ctx context.Context, eipID, eniID, eniIP string) error {
 	var innerErr error
-	err := wait.ExponentialBackoff(ENIOpBackoff,
+	err := wait.ExponentialBackoff(backoff.Backoff(backoff.ENIOps),
 		func() (done bool, err error) {
 			// we check eip binding is not changed
 			var eips []vpc.EipAddress
@@ -200,7 +201,7 @@ func (e *Impl) UnassociateEipAddress(ctx context.Context, eipID, eniID, eniIP st
 }
 
 func (e *Impl) ReleaseEipAddress(ctx context.Context, eipID, eniID string, eniIP net.IP) error {
-	eip, err := e.WaitForEIP(eipID, "", eniStateBackoff)
+	eip, err := e.WaitForEIP(eipID, "", backoff.Backoff(backoff.WaitENIStatus))
 	if err != nil {
 		return fmt.Errorf("error release eip: %w", err)
 	}
@@ -215,7 +216,7 @@ func (e *Impl) ReleaseEipAddress(ctx context.Context, eipID, eniID string, eniIP
 		if err == nil {
 			time.Sleep(3 * time.Second)
 			start := time.Now()
-			eip, err = e.WaitForEIP(eipID, eipStatusAvailable, eniStateBackoff)
+			eip, err = e.WaitForEIP(eipID, eipStatusAvailable, backoff.Backoff(backoff.WaitENIStatus))
 			metric.OpenAPILatency.WithLabelValues("UnassociateEipAddress/Async", fmt.Sprint(err != nil)).Observe(metric.MsSince(start))
 			if err != nil {
 				logrus.Errorf("wait timeout UnassociateEipAddress for eni: %v, %v, %v", eniID, eniIP, err)
@@ -226,7 +227,7 @@ func (e *Impl) ReleaseEipAddress(ctx context.Context, eipID, eniID string, eniIP
 	}
 	var innerErr error
 	if eip.Status == eipStatusAvailable {
-		err = wait.ExponentialBackoff(eniReleaseBackoff, func() (done bool, err error) {
+		err = wait.ExponentialBackoff(backoff.Backoff(backoff.ENIRelease), func() (done bool, err error) {
 			innerErr = e.releaseEIPAddress(eip.AllocationId)
 			if innerErr != nil {
 				return false, nil