Skip to content

Commit 5572272

Browse files
luthermonsonluthermonson
authored
Merge pull request #163 from luthermonson/fix-e2e
getting e2e tests working against LKE
2 parents 5103be6 + e783bbd commit 5572272

File tree

8 files changed

+343
-183
lines changed

8 files changed

+343
-183
lines changed

‎Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
IMG ?= linode/linode-cloud-controller-manager:canary
22
RELEASE_DIR ?= release
33
GOLANGCI_LINT_IMG := golangci/golangci-lint:v1.55-alpine
4+
PLATFORM ?= linux/amd64
45

56
export GO111MODULE=on
67

@@ -64,8 +65,9 @@ imgname:
6465
echo IMG=${IMG}
6566

6667
.PHONY: docker-build
67-
docker-build:
68-
docker build --platform=linux/amd64 --tag=${IMG} .
68+
# we cross compile the binary for linux, then build a container
69+
docker-build: build-linux
70+
DOCKER_BUILDKIT=1 docker build --platform=$(PLATFORM) --tag ${IMG} .
6971

7072
.PHONY: docker-push
7173
# must run the docker build before pushing the image

‎e2e/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ endif
1010
.PHONY: test reuse-and-test clean
1111

1212
${GINKGO_PATH}:
13-
go install github.com/onsi/ginkgo/v2/ginkgo@v2.3.1
13+
go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.2
1414

1515
reuse-and-test: SUITE_ARGS='--reuse'
1616

1717
test reuse-and-test: ${GINKGO_PATH} check-token
1818
go list -m; \
19-
ginkgo -r --v --trace --cover $(TEST_ARGS) -- --v=3 --image=${IMG} $(SUITE_ARGS)
19+
ginkgo -r --vv --trace $(TEST_ARGS) -- --image=${IMG} $(SUITE_ARGS)
2020

2121
clean: check-token
2222
cd test; \

‎e2e/go.mod‎

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,76 @@
11
module e2e_test
22

3-
go 1.17
3+
go 1.20
44

55
require (
66
github.com/appscode/go v0.0.0-20200323182826-54e98e09185a
7-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
8-
github.com/linode/linodego v0.21.1
9-
github.com/onsi/ginkgo/v2 v2.3.1
10-
github.com/onsi/gomega v1.22.0
11-
k8s.io/api v0.19.2
12-
k8s.io/apimachinery v0.19.2
13-
k8s.io/client-go v0.19.2
7+
github.com/linode/linodego v1.26.0
8+
github.com/onsi/ginkgo/v2 v2.13.2
9+
github.com/onsi/gomega v1.30.0
10+
k8s.io/api v0.23.17
11+
k8s.io/apimachinery v0.23.17
12+
k8s.io/client-go v0.23.17
1413
)
1514

1615
require (
1716
github.com/davecgh/go-spew v1.1.1 // indirect
18-
github.com/go-logr/logr v0.2.0 // indirect
19-
github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
20-
github.com/gogo/protobuf v1.3.1 // indirect
21-
github.com/golang/protobuf v1.5.2 // indirect
22-
github.com/google/go-cmp v0.5.8 // indirect
17+
github.com/go-logr/logr v1.3.0 // indirect
18+
github.com/go-resty/resty/v2 v2.9.1 // indirect
19+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
20+
github.com/gogo/protobuf v1.3.2 // indirect
21+
github.com/golang/protobuf v1.5.3 // indirect
22+
github.com/google/go-cmp v0.6.0 // indirect
2323
github.com/google/gofuzz v1.1.0 // indirect
24-
github.com/googleapis/gnostic v0.4.1 // indirect
24+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
25+
github.com/googleapis/gnostic v0.5.5 // indirect
2526
github.com/imdario/mergo v0.3.5 // indirect
26-
github.com/json-iterator/go v1.1.10 // indirect
27+
github.com/json-iterator/go v1.1.12 // indirect
2728
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
28-
github.com/modern-go/reflect2 v1.0.1 // indirect
29+
github.com/modern-go/reflect2 v1.0.2 // indirect
2930
github.com/spf13/pflag v1.0.5 // indirect
30-
github.com/stretchr/testify v1.5.1 // indirect
31-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
32-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
33-
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
34-
golang.org/x/sys v0.1.0 // indirect
35-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
36-
golang.org/x/text v0.3.7 // indirect
37-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
38-
google.golang.org/appengine v1.6.5 // indirect
31+
golang.org/x/net v0.19.0 // indirect
32+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
33+
golang.org/x/sys v0.15.0 // indirect
34+
golang.org/x/term v0.15.0 // indirect
35+
golang.org/x/text v0.14.0 // indirect
36+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
37+
golang.org/x/tools v0.14.0 // indirect
38+
google.golang.org/appengine v1.6.7 // indirect
3939
google.golang.org/protobuf v1.28.0 // indirect
4040
gopkg.in/inf.v0 v0.9.1 // indirect
41+
gopkg.in/ini.v1 v1.66.6 // indirect
42+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
4143
gopkg.in/yaml.v2 v2.4.0 // indirect
4244
gopkg.in/yaml.v3 v3.0.1 // indirect
43-
k8s.io/klog/v2 v2.2.0 // indirect
44-
k8s.io/utils v0.0.0-20201005171033-6301aaf42dc7 // indirect
45-
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 // indirect
45+
k8s.io/klog/v2 v2.30.0 // indirect
46+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
47+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
48+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
49+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
4650
sigs.k8s.io/yaml v1.2.0 // indirect
4751
)
4852

4953
replace (
50-
k8s.io/api => k8s.io/api v0.19.2
51-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.2
52-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.2
53-
k8s.io/apiserver => k8s.io/apiserver v0.19.2
54-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.2
55-
k8s.io/client-go => k8s.io/client-go v0.19.2
56-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.2
57-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.2
58-
k8s.io/code-generator => k8s.io/code-generator v0.19.2
59-
k8s.io/component-base => k8s.io/component-base v0.19.2
60-
k8s.io/cri-api => k8s.io/cri-api v0.19.2
61-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.2
62-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.2
63-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.2
64-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.2
65-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.2
66-
k8s.io/kubectl => k8s.io/kubectl v0.19.2
67-
k8s.io/kubelet => k8s.io/kubelet v0.19.2
68-
k8s.io/kubernetes => k8s.io/kubernetes v1.19.2
69-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.2
70-
k8s.io/metrics => k8s.io/metrics v0.19.2
71-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.2
54+
k8s.io/api => k8s.io/api v0.23.17
55+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.17
56+
k8s.io/apimachinery => k8s.io/apimachinery v0.23.17
57+
k8s.io/apiserver => k8s.io/apiserver v0.23.17
58+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.17
59+
k8s.io/client-go => k8s.io/client-go v0.23.17
60+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.17
61+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.17
62+
k8s.io/code-generator => k8s.io/code-generator v0.23.17
63+
k8s.io/component-base => k8s.io/component-base v0.23.17
64+
k8s.io/cri-api => k8s.io/cri-api v0.23.17
65+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.17
66+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.17
67+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.17
68+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.17
69+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.17
70+
k8s.io/kubectl => k8s.io/kubectl v0.23.17
71+
k8s.io/kubelet => k8s.io/kubelet v0.23.17
72+
k8s.io/kubernetes => k8s.io/kubernetes v0.23.17
73+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.17
74+
k8s.io/metrics => k8s.io/metrics v0.23.17
75+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.17
7276
)

0 commit comments

Comments
 (0)