From dd9e12a268aa99fb8721d474d21959bd88d7d850 Mon Sep 17 00:00:00 2001 From: Tomasz Mielech Date: Thu, 29 Jul 2021 09:11:25 +0200 Subject: [PATCH 1/2] Use new arangosync-client dependency --- CHANGELOG.md | 1 + go.mod | 5 +++-- go.sum | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b80ceb11f..8ce3380ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Allow to define Member Recreation Policy within group - Replace 'github.com/dgrijalva/jwt-go' with 'github.com/golang-jwt/jwt' - Update 'github.com/gin-gonic/gin' dependency to v1.7.2 +- Update 'github.com/arangodb/arangosync-client' dependency to v0.7.0 ## [1.2.0](https://github.com/arangodb/kube-arangodb/tree/1.2.0) (2021-07-16) - Enable "Operator Internal Metrics Exporter" by default diff --git a/go.mod b/go.mod index 3ce5416ac..85d391089 100644 --- a/go.mod +++ b/go.mod @@ -25,10 +25,10 @@ replace ( require ( github.com/aktau/github-release v0.10.0 // indirect github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680 - github.com/arangodb/arangosync-client v0.6.3 + github.com/arangodb/arangosync-client v0.7.0 github.com/arangodb/go-driver v0.0.0-20210621075908-e7a6fa0cbd18 github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21 - github.com/cenkalti/backoff v2.1.1+incompatible + github.com/cenkalti/backoff v2.2.1+incompatible github.com/coreos/go-semver v0.3.0 github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9 github.com/evanphx/json-patch v4.9.0+incompatible @@ -61,6 +61,7 @@ require ( github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect github.com/ugorji/go/codec v1.2.6 // indirect github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect + github.com/zenazn/goji v0.9.0 // indirect golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c golang.org/x/tools v0.1.1-0.20210504181558-0bb7e5c47b1a // indirect diff --git a/go.sum b/go.sum index 821e376d8..53283f3bc 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,8 @@ github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680 h1 github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680/go.mod h1:xDyzBwyYzcEhsaDXtmxCNM4p5BrtuoVYYsRTuJqmCeg= github.com/arangodb/arangosync-client v0.6.3 h1:CJL9IxjCNVci2HNuWncZdVzHBeYTz0CeqqTf5Kpj2Ac= github.com/arangodb/arangosync-client v0.6.3/go.mod h1:C0DmhtoPKJGm2PO18FrfZf4mVWcG7qW2YPBTFMR2P1g= +github.com/arangodb/arangosync-client v0.7.0 h1:3vLOVnMyr5vGlPA0OHxJL9Wyy49JJwN0uBYU1HDk0qk= +github.com/arangodb/arangosync-client v0.7.0/go.mod h1:g+JcxH3C63wKaJPnPr9nggYoGbt/bYCWpfcRG0NSodY= github.com/arangodb/go-driver v0.0.0-20200617115956-9dac4c7fed22 h1:3Ken6Y1Qs+VLCTEiv1+807Gx2ToiuRCo8Dd1mPE5FC0= github.com/arangodb/go-driver v0.0.0-20200617115956-9dac4c7fed22/go.mod h1:JG79qtPYRxUB6CdGWSH1XwpolSBjthuZX+Iaz/H38rA= github.com/arangodb/go-driver v0.0.0-20210517114204-8cc084268066 h1:NneOFWxfa7rhNXIfEYWgxytudmgj2KPZfYSnKXSVGcw= @@ -75,6 +77,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY= github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= From b443c0dc11295221799bb7e19ae055262e0efede Mon Sep 17 00:00:00 2001 From: Tomasz Mielech Date: Fri, 6 Aug 2021 07:21:16 +0200 Subject: [PATCH 2/2] Fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ce3380ed..35666f9e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ # Change Log ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A) +- Update 'github.com/arangodb/arangosync-client' dependency to v0.7.0 ## [1.2.1](https://github.com/arangodb/kube-arangodb/tree/1.2.1) (2021-07-28) - Fix ArangoMember race with multiple ArangoDeployments within single namespace - Allow to define Member Recreation Policy within group - Replace 'github.com/dgrijalva/jwt-go' with 'github.com/golang-jwt/jwt' - Update 'github.com/gin-gonic/gin' dependency to v1.7.2 -- Update 'github.com/arangodb/arangosync-client' dependency to v0.7.0 ## [1.2.0](https://github.com/arangodb/kube-arangodb/tree/1.2.0) (2021-07-16) - Enable "Operator Internal Metrics Exporter" by default