Revert commit d57c4436e868106e3d7fc7e46f84e4e31af2c46e

[dshehbaj]

Revert commit matches with this:
https://github.com/aws/amazon-vpc-cni-k8s/pull/3147/commits

Testing:

go mod tidy # passes

make # passes

make multi-arch-cni-build # passes (logs below)

docker buildx build --build-arg golang_image="public.ecr.aws/eks-distro-build-tooling/golang:1.22.5-gcc-al2" --build-arg base_image="public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2" --network=host  \
		-f scripts/dockerfiles/Dockerfile.release \
		--platform "linux/amd64,linux/arm64"\
		--cache-from=type=gha \
		--cache-to=type=gha,mode=max \
		.
[+] Building 273.3s (24/24) FINISHED                                                                                                                                                                                            docker:desktop-linux
 => [internal] load build definition from Dockerfile.release                                                                                                                                                                                    0.0s
 => => transferring dockerfile: 988B                                                                                                                                                                                                            0.0s
 => WARN: FromAsCasing: 'as' and 'FROM' keywords' casing do not match (line 4)                                                                                                                                                                  0.0s
 => WARN: InvalidDefaultArgInFrom: Default value for ARG $golang_image results in empty or invalid base image name (line 4)                                                                                                                     0.0s
 => WARN: InvalidDefaultArgInFrom: Default value for ARG $base_image results in empty or invalid base image name (line 15)                                                                                                                      0.0s
 => [linux/arm64 internal] load metadata for public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2                                                                                                                  0.1s
 => [linux/arm64 internal] load metadata for public.ecr.aws/eks-distro-build-tooling/golang:1.22.5-gcc-al2                                                                                                                                      0.1s
 => [linux/amd64 internal] load metadata for public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2                                                                                                                  0.1s
 => [linux/amd64 internal] load metadata for public.ecr.aws/eks-distro-build-tooling/golang:1.22.5-gcc-al2                                                                                                                                      0.1s
 => [internal] load .dockerignore                                                                                                                                                                                                               0.0s
 => => transferring context: 185B                                                                                                                                                                                                               0.0s
 => [linux/amd64 builder 1/4] FROM public.ecr.aws/eks-distro-build-tooling/golang:1.22.5-gcc-al2@sha256:461dff837b3c329347af1eb162acc6d0a0d88794ea2b64db5ab97ab8da640d02                                                                        1.2s
 => => resolve public.ecr.aws/eks-distro-build-tooling/golang:1.22.5-gcc-al2@sha256:461dff837b3c329347af1eb162acc6d0a0d88794ea2b64db5ab97ab8da640d02                                                                                            1.2s
 => [internal] load build context                                                                                                                                                                                                               0.3s
 => => transferring context: 65.67MB                                                                                                                                                                                                            0.3s
 => [linux/arm64 stage-1 1/4] FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2@sha256:38671d6b390b662ff06def57d163d8162403e80abddb51209bf8a0904bce068c                                                    1.2s
 => => resolve public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2@sha256:38671d6b390b662ff06def57d163d8162403e80abddb51209bf8a0904bce068c                                                                        1.2s
 => [linux/arm64 builder 1/4] FROM public.ecr.aws/eks-distro-build-tooling/golang:1.22.5-gcc-al2@sha256:461dff837b3c329347af1eb162acc6d0a0d88794ea2b64db5ab97ab8da640d02                                                                        1.2s
 => => resolve public.ecr.aws/eks-distro-build-tooling/golang:1.22.5-gcc-al2@sha256:461dff837b3c329347af1eb162acc6d0a0d88794ea2b64db5ab97ab8da640d02                                                                                            1.2s
 => [linux/amd64 stage-1 1/4] FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2@sha256:38671d6b390b662ff06def57d163d8162403e80abddb51209bf8a0904bce068c                                                    1.2s
 => => resolve public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-iptables:latest.2@sha256:38671d6b390b662ff06def57d163d8162403e80abddb51209bf8a0904bce068c                                                                        1.2s
 => CACHED [linux/amd64 builder 2/4] WORKDIR /go/src/github.com/aws/amazon-vpc-cni-k8s                                                                                                                                                          0.0s
 => [linux/amd64 builder 3/4] COPY . ./                                                                                                                                                                                                         0.2s
 => CACHED [linux/arm64 builder 2/4] WORKDIR /go/src/github.com/aws/amazon-vpc-cni-k8s                                                                                                                                                          0.0s
 => [linux/arm64 builder 3/4] COPY . ./                                                                                                                                                                                                         0.2s
 => [linux/arm64 builder 4/4] RUN make build-aws-vpc-cni && make build-linux                                                                                                                                                                  204.2s
 => [linux/amd64 builder 4/4] RUN make build-aws-vpc-cni && make build-linux                                                                                                                                                                  268.4s
 => CACHED [linux/arm64 stage-1 2/4] WORKDIR /app                                                                                                                                                                                               0.0s
 => [linux/arm64 stage-1 3/4] COPY --from=builder /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-cni     /go/src/github.com/aws/amazon-vpc-cni-k8s/misc/10-aws.conflist     /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-k8s-agent     /go/src  0.1s
 => [linux/arm64 stage-1 4/4] RUN ["update-alternatives", "--set", "iptables", "/usr/sbin/iptables-wrapper"]                                                                                                                                    0.0s
 => CACHED [linux/amd64 stage-1 2/4] WORKDIR /app                                                                                                                                                                                               0.0s
 => [linux/amd64 stage-1 3/4] COPY --from=builder /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-cni     /go/src/github.com/aws/amazon-vpc-cni-k8s/misc/10-aws.conflist     /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-k8s-agent     /go/src  0.1s
 => [linux/amd64 stage-1 4/4] RUN ["update-alternatives", "--set", "iptables", "/usr/sbin/iptables-wrapper"]                                                                                                                                    0.0s
 => exporting to image                                                                                                                                                                                                                          2.9s
 => => exporting layers                                                                                                                                                                                                                         2.6s
 => => exporting manifest sha256:587ec50d267aca516aac91b824d2522157f2b0f901e643136223d41b70e3c84c                                                                                                                                               0.0s
 => => exporting config sha256:9ecd0004cddb9e1d7b3dfb361d47198985e4703d9a9f2fce4e6447853ea488f2                                                                                                                                                 0.0s
 => => exporting attestation manifest sha256:061f2c0a33ef5552d33180f2c79b82a617864894962c90de7c4605a9f9a2f422                                                                                                                                   0.0s
 => => exporting manifest sha256:791abc6d5089eec95725eec8ff501e5767e5adb209612e5bd0248e34c679886c                                                                                                                                               0.0s
 => => exporting config sha256:ba11f35e444ed41f8f3dde34a09e9e5ad70bc1fe5e5b5bf96083d8c89c8fc80a                                                                                                                                                 0.0s
 => => exporting attestation manifest sha256:44ce6a0084f48bc896589435ffa1298ffe0634b6d7ca2f00825ed62a03ab46d0                                                                                                                                   0.0s
 => => exporting manifest list sha256:adaa5c1bfa768872d907b51a482dbb7adc742ba8aff02c32fd6be29a996b03b4                                                                                                                                          0.0s
 => => naming to moby-dangling@sha256:adaa5c1bfa768872d907b51a482dbb7adc742ba8aff02c32fd6be29a996b03b4                                                                                                                                          0.0s
 => => unpacking to moby-dangling@sha256:adaa5c1bfa768872d907b51a482dbb7adc742ba8aff02c32fd6be29a996b03b4                                                                                                                                       0.3s

View build details: docker-desktop://dashboard/build/desktop-linux/desktop-linux/piuhbeo6zw6vd6lv9f1kgybv0

 3 warnings found (use docker --debug to expand):
 - FromAsCasing: 'as' and 'FROM' keywords' casing do not match (line 4)
 - InvalidDefaultArgInFrom: Default value for ARG $golang_image results in empty or invalid base image name (line 4)
 - InvalidDefaultArgInFrom: Default value for ARG $base_image results in empty or invalid base image name (line 15)

What's next:
    View a summary of image vulnerabilities and recommendations → docker scout quickview

[orsenthil]

Please hold merging this. The change is reverted in release branch.