Merge pull request #521 from xdu31/fix-e2e-release-0.5

Cherry pick for e2e kind test & using EKS-Distro Golang image & bumpup aws-sdk-go version

Dockerfile

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
+ARG golang_image=public.ecr.aws/eks-distro-build-tooling/golang:1.19-gcc
 
-FROM --platform=$BUILDPLATFORM golang:1.19 AS builder
+FROM --platform=$BUILDPLATFORM $golang_image AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-iam-authenticator
 COPY . .
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make bin

Makefile

@@ -19,6 +19,11 @@ BIN_ARCH_LINUX ?= amd64 arm64
 BIN_ARCH_WINDOWS ?= amd64
 BIN_ARCH_DARWIN ?= amd64
 
+#CI is defined in test-infra https://github.com/kubernetes/test-infra/blob/2e3dd84399745eb49cef69afc3ed5bded8a6580c/prow/pod-utils/downwardapi/jobspec.go#L89
+# and passed in when running on github prow
+CI ?= false
+RUNNER ?= kops
+
 ALL_LINUX_BIN_TARGETS = $(foreach arch,$(BIN_ARCH_LINUX),$(OUTPUT)/bin/aws-iam-authenticator_$(VERSION)_linux_$(arch))
 ALL_WINDOWS_BIN_TARGETS = $(foreach arch,$(BIN_ARCH_WINDOWS),$(OUTPUT)/bin/aws-iam-authenticator_$(VERSION)_windows_$(arch).exe)
 ALL_DARWIN_BIN_TARGETS = $(foreach arch,$(BIN_ARCH_DARWIN),$(OUTPUT)/bin/aws-iam-authenticator_$(VERSION)_darwin_$(arch))
@@ -102,9 +107,10 @@ integration:
 .PHONY: e2e
 e2e: bin
 ifeq ($(RUNNER),kops)
-	./hack/e2e/run.sh
+	CI=$(CI) ./hack/e2e/run.sh
 else ifeq ($(RUNNER),kind)
 	./hack/start-dev-env-dynamicfile.sh
+	CI=$(CI) ./hack/e2e-dynamicfile.sh
 	./hack/stop-dev-env.sh
 else
 	echo "make e2e RUNNER=[kops|kind]"

go.mod

@@ -3,55 +3,21 @@ module sigs.k8s.io/aws-iam-authenticator
 go 1.16
 
 require (
-    github.com/aws/aws-sdk-go v1.44.107
-    github.com/fsnotify/fsnotify v1.4.9
-    github.com/gofrs/flock v0.7.0
-    github.com/manifoldco/promptui v0.9.0
-    github.com/onsi/ginkgo v1.14.0
-    github.com/onsi/gomega v1.10.1
-    github.com/prometheus/client_golang v1.11.0
-    github.com/sirupsen/logrus v1.8.1
-    github.com/spf13/cobra v1.1.3
-    github.com/spf13/viper v1.7.0
-    golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
-    gopkg.in/yaml.v2 v2.4.0
-    k8s.io/api v0.22.1
-    k8s.io/apimachinery v0.22.1
-    k8s.io/client-go v0.22.1
-    k8s.io/code-generator v0.22.1
-    k8s.io/component-base v0.22.1
-    k8s.io/kubernetes v1.22.0
-    k8s.io/sample-controller v0.22.1
-    sigs.k8s.io/yaml v1.2.0
-)
-
-replace (
-	k8s.io.client-go => k8s.io/client-go v0.20.0
-	k8s.io/api => k8s.io/api v0.22.0
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.23.0-alpha.0
-	k8s.io/apiserver => k8s.io/apiserver v0.22.0
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.0
-	k8s.io/client-go => k8s.io/client-go v0.22.0
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.0
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0
-	k8s.io/code-generator => k8s.io/code-generator v0.22.2-rc.0
-	k8s.io/component-base => k8s.io/component-base v0.22.0
-	k8s.io/component-helpers => k8s.io/component-helpers v0.22.0
-	k8s.io/controller-manager => k8s.io/controller-manager v0.22.0
-	k8s.io/cri-api => k8s.io/cri-api v0.23.0-alpha.0
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.0
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.0
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.0
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.0
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.0
-	k8s.io/kubectl => k8s.io/kubectl v0.22.0
-	k8s.io/kubelet => k8s.io/kubelet v0.22.0
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.0
-	k8s.io/metrics => k8s.io/metrics v0.22.0
-	k8s.io/mount-utils => k8s.io/mount-utils v0.22.1-rc.0
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.0
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.22.0
-	k8s.io/sample-controller => k8s.io/sample-controller v0.22.0
+	github.com/aws/aws-sdk-go v1.44.145
+	github.com/fsnotify/fsnotify v1.4.9
+	github.com/gofrs/flock v0.7.0
+	github.com/manifoldco/promptui v0.9.0
+	github.com/prometheus/client_golang v1.11.0
+	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/cobra v1.1.3
+	github.com/spf13/viper v1.7.0
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/api v0.22.1
+	k8s.io/apimachinery v0.22.1
+	k8s.io/client-go v0.22.1
+	k8s.io/code-generator v0.22.1
+	k8s.io/component-base v0.22.1
+	k8s.io/sample-controller v0.22.1
+	sigs.k8s.io/yaml v1.2.0
 )