Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hook up operator build, testing, docker #20128

Merged
merged 5 commits into from
Jan 14, 2020
Merged

Hook up operator build, testing, docker #20128

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0a16ed
Hook up operator build, testing, docker
howardjohn Jan 13, 2020
ef1fc22
gen
howardjohn Jan 13, 2020
de65329
Fix release and tracing tests
howardjohn Jan 13, 2020
ddd2836
Disable go-generate
howardjohn Jan 13, 2020
dd02038
Fix telemetry test
howardjohn Jan 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions Makefile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ BINARIES:=./istioctl/cmd/istioctl \
./pkg/test/echo/cmd/server \
./mixer/test/policybackend \
./tools/istio-iptables \
./tools/istio-clean-iptables
./tools/istio-clean-iptables \
./operator/cmd/manager

# List of binaries included in releases
RELEASE_BINARIES:=pilot-discovery pilot-agent sidecar-injector mixc mixs mixgen node_agent node_agent_k8s istio_ca istioctl galley sdsclient
Expand Down Expand Up @@ -399,7 +400,7 @@ with_junit_report: | $(JUNIT_REPORT)

# Run coverage tests
ifeq ($(WHAT),)
TEST_OBJ = common-test pilot-test mixer-test security-test galley-test istioctl-test
TEST_OBJ = common-test pilot-test mixer-test security-test galley-test istioctl-test operator-test
else
TEST_OBJ = selected-pkg-test
endif
Expand All @@ -418,6 +419,10 @@ pilot-test:
istioctl-test:
go test ${T} ./istioctl/...

.PHONY: operator-test
operator-test:
go test ${T} ./operator/...

.PHONY: mixer-test
MIXER_TEST_T ?= ${T} ${GOTEST_PARALLEL}
mixer-test:
Expand Down Expand Up @@ -488,7 +493,7 @@ common-coverage:

.PHONY: racetest

RACE_TESTS ?= pilot-racetest mixer-racetest security-racetest galley-test common-racetest istioctl-racetest
RACE_TESTS ?= pilot-racetest mixer-racetest security-racetest galley-test common-racetest istioctl-racetest operator-racetest
racetest: $(JUNIT_REPORT)
$(MAKE) -e -f Makefile.core.mk --keep-going $(RACE_TESTS) \
2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
Expand All @@ -501,6 +506,10 @@ pilot-racetest:
istioctl-racetest:
RACE_TEST=true go test ${T} -race ./istioctl/...

.PHONY: operator-racetest
operator-racetest:
RACE_TEST=true go test ${T} -race ./operator/...

.PHONY: mixer-racetest
mixer-racetest:
# Some tests use relative path "testdata", must be run from mixer dir
Expand Down
1 change: 0 additions & 1 deletion bin/update_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ function getSha() {
make update-common

export GO111MODULE=on
go get -u "istio.io/operator@${UPDATE_BRANCH}"
go get -u "istio.io/api@${UPDATE_BRANCH}"
go get -u "istio.io/gogo-genproto@${UPDATE_BRANCH}"
go get -u "istio.io/pkg@${UPDATE_BRANCH}"
Expand Down
24 changes: 22 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ require (
fortio.org/fortio v1.3.1
github.com/DataDog/datadog-go v2.2.0+incompatible
github.com/Masterminds/semver v1.4.2
github.com/Masterminds/sprig v2.14.1+incompatible // indirect
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/SAP/go-hdb v0.14.1 // indirect
github.com/SermoDigital/jose v0.9.1 // indirect
github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect
github.com/alicebob/miniredis v0.0.0-20180201100744-9d52b1fc8da9
github.com/aokoli/goutils v1.0.1 // indirect
github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.16.36
Expand All @@ -39,13 +41,16 @@ require (
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
github.com/coreos/etcd v3.3.15+incompatible
github.com/coreos/go-oidc v2.1.0+incompatible
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/d4l3k/messagediff v1.2.1 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/dchest/siphash v1.1.0 // indirect
github.com/denisenkom/go-mssqldb v0.0.0-20190423183735-731ef375ac02 // indirect
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v1.13.1
github.com/docker/go-connections v0.4.0
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74 // indirect
github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect
github.com/elazarl/goproxy v0.0.0-20190630181448-f1e96bc0f4c5 // indirect
Expand All @@ -55,16 +60,21 @@ require (
github.com/evanphx/json-patch v4.5.0+incompatible
github.com/fatih/structs v1.1.0 // indirect
github.com/fluent/fluent-logger-golang v1.3.0
github.com/frankban/quicktest v1.4.1 // indirect
github.com/fsnotify/fsnotify v1.4.7
github.com/garyburd/redigo v1.6.0 // indirect
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v0.1.0
github.com/go-logr/zapr v0.1.1 // indirect
github.com/go-redis/redis v6.10.2+incompatible
github.com/go-sql-driver/mysql v1.4.1 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gocql/gocql v0.0.0-20190423091413-b99afaf3b163 // indirect
github.com/gogo/protobuf v1.3.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/golang/protobuf v1.3.2
github.com/golang/snappy v0.0.1 // indirect
github.com/golang/sync v0.0.0-20180314180146-1d60e4601c6f
github.com/google/cel-go v0.2.0
github.com/google/go-cmp v0.3.1
Expand All @@ -88,21 +98,28 @@ require (
github.com/hashicorp/go-plugin v1.0.0 // indirect
github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect
github.com/hashicorp/go-uuid v1.0.1 // indirect
github.com/hashicorp/go-version v1.2.0
github.com/hashicorp/memberlist v0.1.3 // indirect
github.com/hashicorp/serf v0.8.1 // indirect
github.com/hashicorp/vault v0.10.0
github.com/howeyc/fsnotify v0.9.0
github.com/huandu/xstrings v1.2.0 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/jefferai/jsonx v1.0.0 // indirect
github.com/keybase/go-crypto v0.0.0-20190416182011-b785b22cc757 // indirect
github.com/kr/pretty v0.1.0
github.com/kylelemons/godebug v1.1.0
github.com/lestrrat-go/jwx v0.9.0
github.com/lib/pq v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.10
github.com/mholt/archiver v3.1.1+incompatible
github.com/mitchellh/copystructure v1.0.0
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/nwaples/rardecode v1.0.0 // indirect
github.com/onsi/gomega v1.7.0
github.com/open-policy-agent/opa v0.8.2
github.com/opencontainers/image-spec v1.0.1 // indirect
Expand Down Expand Up @@ -133,6 +150,7 @@ require (
github.com/tinylib/msgp v1.0.2 // indirect
github.com/uber/jaeger-client-go v0.0.0-20190228190846-ecf2d03a9e80
github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/yashtewari/glob-intersection v0.0.0-20180206001645-7af743e8ec84 // indirect
github.com/yl2chen/cidranger v0.0.0-20180214081945-928b519e5268
github.com/yuin/gopher-lua v0.0.0-20180316054350-84ea3a3c79b3 // indirect
Expand All @@ -152,16 +170,18 @@ require (
gopkg.in/ory-am/dockertest.v3 v3.3.4 // indirect
gopkg.in/square/go-jose.v2 v2.3.1
gopkg.in/yaml.v2 v2.2.4
istio.io/api v0.0.0-20200110220949-660e8ea29996
istio.io/api v0.0.0-20200111000814-80fb3f4c4923
istio.io/gogo-genproto v0.0.0-20191024203824-d079cc8b1d55
istio.io/operator v0.0.0-20200107172028-2cf0bae531b7
istio.io/pkg v0.0.0-20191113122952-4f521de9c8ca
k8s.io/api v0.17.0
k8s.io/apiextensions-apiserver v0.17.0
k8s.io/apimachinery v0.17.0
k8s.io/cli-runtime v0.17.0
k8s.io/client-go v0.17.0
k8s.io/helm v2.14.3+incompatible
k8s.io/kubectl v0.17.0
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/yaml v1.1.0
)

Expand Down
Loading