Skip to content

Commit 6ff0fd7

Browse files
MLE-14939: e2e test poc for MarkLogic Operator using e2e-framework (#10)
* e2e test for operator using e2e-framework
1 parent de3e9ff commit 6ff0fd7

File tree

6 files changed

+383
-271
lines changed

6 files changed

+383
-271
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ test: manifests generate fmt vet envtest ## Run tests.
116116
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -v $$(go list ./... | grep -v /e2e) -coverprofile cover.out
117117

118118
# Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
119-
.PHONY: test-e2e # Run the e2e tests against a Kind k8s instance that is spun up.
120-
test-e2e:
121-
go test ./test/e2e/ -v -ginkgo.v
119+
.PHONY: e2e-test # Run the e2e tests against a Kind k8s instance that is spun up.
120+
e2e-test:
121+
go test -v ./test/e2e
122122

123123
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
124124
GOLANGCI_LINT_VERSION ?= v1.54.2

go.mod

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,84 @@
11
module github.com/marklogic/marklogic-kubernetes-operator
22

3-
go 1.22.0
3+
go 1.22.3
44

55
toolchain go1.22.4
66

77
require (
88
github.com/cisco-open/k8s-objectmatcher v1.10.0
9-
github.com/go-logr/logr v1.2.4
10-
github.com/onsi/ginkgo/v2 v2.11.0
11-
github.com/onsi/gomega v1.27.10
12-
k8s.io/api v0.28.3
13-
k8s.io/apimachinery v0.28.3
14-
k8s.io/client-go v0.28.3
15-
sigs.k8s.io/controller-runtime v0.16.3
9+
github.com/go-logr/logr v1.4.1
10+
github.com/onsi/ginkgo/v2 v2.17.1
11+
github.com/onsi/gomega v1.32.0
12+
k8s.io/api v0.30.1
13+
k8s.io/apiextensions-apiserver v0.30.0
14+
k8s.io/apimachinery v0.30.1
15+
k8s.io/client-go v0.30.1
16+
sigs.k8s.io/controller-runtime v0.18.2
17+
sigs.k8s.io/e2e-framework v0.4.0
1618
)
1719

1820
require (
1921
emperror.dev/errors v0.8.1 // indirect
2022
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/blang/semver/v4 v4.0.0 // indirect
2124
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2225
github.com/davecgh/go-spew v1.1.1 // indirect
2326
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2427
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
25-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
26-
github.com/fsnotify/fsnotify v1.6.0 // indirect
27-
github.com/go-logr/zapr v1.2.4 // indirect
28+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
29+
github.com/fsnotify/fsnotify v1.7.0 // indirect
30+
github.com/go-logr/zapr v1.3.0 // indirect
2831
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2932
github.com/go-openapi/jsonreference v0.20.2 // indirect
3033
github.com/go-openapi/swag v0.22.3 // indirect
3134
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3235
github.com/gogo/protobuf v1.3.2 // indirect
3336
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
34-
github.com/golang/protobuf v1.5.3 // indirect
37+
github.com/golang/protobuf v1.5.4 // indirect
3538
github.com/google/gnostic-models v0.6.8 // indirect
36-
github.com/google/go-cmp v0.5.9 // indirect
39+
github.com/google/go-cmp v0.6.0 // indirect
3740
github.com/google/gofuzz v1.2.0 // indirect
3841
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
3942
github.com/google/uuid v1.3.0 // indirect
40-
github.com/imdario/mergo v0.3.6 // indirect
43+
github.com/gorilla/websocket v1.5.0 // indirect
44+
github.com/imdario/mergo v0.3.15 // indirect
4145
github.com/josharian/intern v1.0.0 // indirect
4246
github.com/json-iterator/go v1.1.12 // indirect
4347
github.com/mailru/easyjson v0.7.7 // indirect
44-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
48+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
49+
github.com/moby/spdystream v0.2.0 // indirect
4550
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4651
github.com/modern-go/reflect2 v1.0.2 // indirect
4752
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
53+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
4854
github.com/pkg/errors v0.9.1 // indirect
49-
github.com/prometheus/client_golang v1.16.0 // indirect
50-
github.com/prometheus/client_model v0.4.0 // indirect
51-
github.com/prometheus/common v0.44.0 // indirect
52-
github.com/prometheus/procfs v0.10.1 // indirect
55+
github.com/prometheus/client_golang v1.18.0 // indirect
56+
github.com/prometheus/client_model v0.5.0 // indirect
57+
github.com/prometheus/common v0.45.0 // indirect
58+
github.com/prometheus/procfs v0.12.0 // indirect
5359
github.com/spf13/pflag v1.0.5 // indirect
60+
github.com/vladimirvivien/gexe v0.2.0 // indirect
5461
go.uber.org/multierr v1.11.0 // indirect
55-
go.uber.org/zap v1.25.0 // indirect
62+
go.uber.org/zap v1.26.0 // indirect
5663
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
57-
golang.org/x/net v0.17.0 // indirect
58-
golang.org/x/oauth2 v0.8.0 // indirect
59-
golang.org/x/sys v0.13.0 // indirect
60-
golang.org/x/term v0.13.0 // indirect
61-
golang.org/x/text v0.13.0 // indirect
64+
golang.org/x/net v0.23.0 // indirect
65+
golang.org/x/oauth2 v0.12.0 // indirect
66+
golang.org/x/sys v0.18.0 // indirect
67+
golang.org/x/term v0.18.0 // indirect
68+
golang.org/x/text v0.14.0 // indirect
6269
golang.org/x/time v0.3.0 // indirect
63-
golang.org/x/tools v0.9.3 // indirect
70+
golang.org/x/tools v0.18.0 // indirect
6471
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6572
google.golang.org/appengine v1.6.7 // indirect
66-
google.golang.org/protobuf v1.30.0 // indirect
73+
google.golang.org/protobuf v1.33.0 // indirect
6774
gopkg.in/inf.v0 v0.9.1 // indirect
6875
gopkg.in/yaml.v2 v2.4.0 // indirect
6976
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
71-
k8s.io/component-base v0.28.3 // indirect
72-
k8s.io/klog/v2 v2.100.1 // indirect
73-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
74-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
77+
k8s.io/component-base v0.30.1 // indirect
78+
k8s.io/klog/v2 v2.120.1 // indirect
79+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
80+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
7581
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
76-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
77-
sigs.k8s.io/yaml v1.3.0 // indirect
82+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
83+
sigs.k8s.io/yaml v1.4.0 // indirect
7884
)

0 commit comments

Comments
 (0)