Skip to content

Commit c83a7a4

Browse files
authored
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
2 parents 501a11c + 1472e7d commit c83a7a4

File tree

13 files changed

+1272
-398
lines changed

13 files changed

+1272
-398
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
ARG image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
15+
ARG golang_image=public.ecr.aws/eks-distro-build-tooling/golang:1.19-gcc
1516

16-
FROM --platform=$BUILDPLATFORM golang:1.19 AS builder
17+
FROM --platform=$BUILDPLATFORM $golang_image AS builder
1718
WORKDIR /go/src/github.com/kubernetes-sigs/aws-iam-authenticator
1819
COPY . .
1920
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make bin

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ BIN_ARCH_LINUX ?= amd64 arm64
1919
BIN_ARCH_WINDOWS ?= amd64
2020
BIN_ARCH_DARWIN ?= amd64
2121

22+
#CI is defined in test-infra https://github.com/kubernetes/test-infra/blob/2e3dd84399745eb49cef69afc3ed5bded8a6580c/prow/pod-utils/downwardapi/jobspec.go#L89
23+
# and passed in when running on github prow
24+
CI ?= false
25+
RUNNER ?= kops
26+
2227
ALL_LINUX_BIN_TARGETS = $(foreach arch,$(BIN_ARCH_LINUX),$(OUTPUT)/bin/aws-iam-authenticator_$(VERSION)_linux_$(arch))
2328
ALL_WINDOWS_BIN_TARGETS = $(foreach arch,$(BIN_ARCH_WINDOWS),$(OUTPUT)/bin/aws-iam-authenticator_$(VERSION)_windows_$(arch).exe)
2429
ALL_DARWIN_BIN_TARGETS = $(foreach arch,$(BIN_ARCH_DARWIN),$(OUTPUT)/bin/aws-iam-authenticator_$(VERSION)_darwin_$(arch))
@@ -102,9 +107,10 @@ integration:
102107
.PHONY: e2e
103108
e2e: bin
104109
ifeq ($(RUNNER),kops)
105-
./hack/e2e/run.sh
110+
CI=$(CI) ./hack/e2e/run.sh
106111
else ifeq ($(RUNNER),kind)
107112
./hack/start-dev-env-dynamicfile.sh
113+
CI=$(CI) ./hack/e2e-dynamicfile.sh
108114
./hack/stop-dev-env.sh
109115
else
110116
echo "make e2e RUNNER=[kops|kind]"

go.mod

Lines changed: 17 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,21 @@ module sigs.k8s.io/aws-iam-authenticator
33
go 1.16
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.107
7-
github.com/fsnotify/fsnotify v1.4.9
8-
github.com/gofrs/flock v0.7.0
9-
github.com/manifoldco/promptui v0.9.0
10-
github.com/onsi/ginkgo v1.14.0
11-
github.com/onsi/gomega v1.10.1
12-
github.com/prometheus/client_golang v1.11.0
13-
github.com/sirupsen/logrus v1.8.1
14-
github.com/spf13/cobra v1.1.3
15-
github.com/spf13/viper v1.7.0
16-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
17-
gopkg.in/yaml.v2 v2.4.0
18-
k8s.io/api v0.22.1
19-
k8s.io/apimachinery v0.22.1
20-
k8s.io/client-go v0.22.1
21-
k8s.io/code-generator v0.22.1
22-
k8s.io/component-base v0.22.1
23-
k8s.io/kubernetes v1.22.0
24-
k8s.io/sample-controller v0.22.1
25-
sigs.k8s.io/yaml v1.2.0
26-
)
27-
28-
replace (
29-
k8s.io.client-go => k8s.io/client-go v0.20.0
30-
k8s.io/api => k8s.io/api v0.22.0
31-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0
32-
k8s.io/apimachinery => k8s.io/apimachinery v0.23.0-alpha.0
33-
k8s.io/apiserver => k8s.io/apiserver v0.22.0
34-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.0
35-
k8s.io/client-go => k8s.io/client-go v0.22.0
36-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.0
37-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0
38-
k8s.io/code-generator => k8s.io/code-generator v0.22.2-rc.0
39-
k8s.io/component-base => k8s.io/component-base v0.22.0
40-
k8s.io/component-helpers => k8s.io/component-helpers v0.22.0
41-
k8s.io/controller-manager => k8s.io/controller-manager v0.22.0
42-
k8s.io/cri-api => k8s.io/cri-api v0.23.0-alpha.0
43-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.0
44-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.0
45-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.0
46-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.0
47-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.0
48-
k8s.io/kubectl => k8s.io/kubectl v0.22.0
49-
k8s.io/kubelet => k8s.io/kubelet v0.22.0
50-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.0
51-
k8s.io/metrics => k8s.io/metrics v0.22.0
52-
k8s.io/mount-utils => k8s.io/mount-utils v0.22.1-rc.0
53-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.0
54-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0
55-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.22.0
56-
k8s.io/sample-controller => k8s.io/sample-controller v0.22.0
6+
github.com/aws/aws-sdk-go v1.44.145
7+
github.com/fsnotify/fsnotify v1.4.9
8+
github.com/gofrs/flock v0.7.0
9+
github.com/manifoldco/promptui v0.9.0
10+
github.com/prometheus/client_golang v1.11.0
11+
github.com/sirupsen/logrus v1.8.1
12+
github.com/spf13/cobra v1.1.3
13+
github.com/spf13/viper v1.7.0
14+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
15+
gopkg.in/yaml.v2 v2.4.0
16+
k8s.io/api v0.22.1
17+
k8s.io/apimachinery v0.22.1
18+
k8s.io/client-go v0.22.1
19+
k8s.io/code-generator v0.22.1
20+
k8s.io/component-base v0.22.1
21+
k8s.io/sample-controller v0.22.1
22+
sigs.k8s.io/yaml v1.2.0
5723
)

0 commit comments

Comments
 (0)