From d5d3b74348d9a0548ddd9911c0137aeff51016e0 Mon Sep 17 00:00:00 2001 From: Submariner Bot <58605119+submariner-bot@users.noreply.github.com> Date: Tue, 15 Jun 2021 17:37:05 +0200 Subject: [PATCH] Update Operator to use version v0.10.0-m2 (#1423) Signed-off-by: Automated Release Co-authored-by: Automated Release --- go.mod | 10 +++++----- go.sum | 28 ++++++++++------------------ pkg/versions/versions.go | 6 +++--- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 7f95e56d6..28f33ecb4 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/AlecAivazis/survey/v2 v2.2.12 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect - github.com/aws/aws-sdk-go v1.38.57 + github.com/aws/aws-sdk-go v1.38.60 github.com/coreos/go-semver v0.3.0 github.com/go-errors/errors v1.2.0 // indirect github.com/go-logr/logr v0.4.0 @@ -32,12 +32,12 @@ require ( github.com/rivo/uniseg v0.2.0 // indirect github.com/spf13/cobra v1.1.3 github.com/submariner-io/admiral v0.10.0-m2 - github.com/submariner-io/cloud-prepare v0.10.0-m1.0.20210609164526-e3506b211821 - github.com/submariner-io/lighthouse v0.10.0-m1 + github.com/submariner-io/cloud-prepare v0.10.0-m2 + github.com/submariner-io/lighthouse v0.10.0-m2 github.com/submariner-io/shipyard v0.10.0-m2 - github.com/submariner-io/submariner v0.10.0-m1.0.20210603162033-dfea1b48c717 + github.com/submariner-io/submariner v0.10.0-m2 github.com/ulikunitz/xz v0.5.10 // indirect - github.com/uw-labs/lichen v0.1.3 + github.com/uw-labs/lichen v0.1.4 github.com/xlab/treeprint v1.1.0 // indirect go.starlark.net v0.0.0-20210506034541-84642328b1f0 // indirect golang.org/x/crypto v0.0.0-20210505212654-3497b51f5e64 // indirect diff --git a/go.sum b/go.sum index d9ff8ef3f..5f38df8e3 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,8 @@ github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.38.57 h1:Jo6uOnWNbj4jL/8t/XUrHOKm1J6pPcYFhGzda20UcUk= -github.com/aws/aws-sdk-go v1.38.57/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.38.60 h1:MgyEsX0IMwivwth1VwEnesBpH0vxbjp5a0w1lurMOXY= +github.com/aws/aws-sdk-go v1.38.60/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -1014,7 +1014,6 @@ github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.12.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -1099,7 +1098,6 @@ github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeD github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= -github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU= github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1121,8 +1119,6 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.23.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q= github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1252,19 +1248,16 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/submariner-io/admiral v0.10.0-m1/go.mod h1:2kkQieEpnEAMHDw4e1wSKUQ5Z3ArycrfD3B6gXaSTDo= -github.com/submariner-io/admiral v0.10.0-m1.0.20210602113843-3b8dfd67945b/go.mod h1:oE3hQZJMvB8j9wHyLBZYmupCZK/G83z36QMgTn2vUlE= github.com/submariner-io/admiral v0.10.0-m2 h1:udiPxHOZSxhi0xnLcFqUfb5vmqIKSyTX+PQPVU0nOB8= github.com/submariner-io/admiral v0.10.0-m2/go.mod h1:UP2oUxGyHdcixfPXI/1JMaASI38ILSyytb1b+pn/ru8= -github.com/submariner-io/cloud-prepare v0.10.0-m1.0.20210609164526-e3506b211821 h1:m0LbbWQdCstRmcDrgw0zAh9SNPp5f/+8xX5CT8kLwJU= -github.com/submariner-io/cloud-prepare v0.10.0-m1.0.20210609164526-e3506b211821/go.mod h1:MIyklqMw+8oWO8j15BKbBPZULB1PR8iwFtZL8kwQnvE= -github.com/submariner-io/lighthouse v0.10.0-m1 h1:VyXJYe1M4YqIG55WdIs4wXzVswcn6yvoviNSY6CJ2TU= -github.com/submariner-io/lighthouse v0.10.0-m1/go.mod h1:PFTllbjAkX40X97yQxT53dMGd6wOxL+Aya306OPLaSg= -github.com/submariner-io/shipyard v0.10.0-m1/go.mod h1:xzQRVCfdpFNqyRvjsj9c7/uhm1JZS0/Zce/0bt++tOg= +github.com/submariner-io/cloud-prepare v0.10.0-m2 h1:hAPO6RzJ+ANUnrWiehjbaPQhY0BFYC/mClZS6egBlDo= +github.com/submariner-io/cloud-prepare v0.10.0-m2/go.mod h1:AWdiItVQQhazz368QKt+/xr7qxUkHeL+fOT4Qgj984g= +github.com/submariner-io/lighthouse v0.10.0-m2 h1:H4Zq9xIdBw3/nop8M36D5sXbpBQvwsMZ9s4fMgXE3is= +github.com/submariner-io/lighthouse v0.10.0-m2/go.mod h1:vExXIKwLjCWNyV1tJPnbiqLJZFL+y87aPVwYbJbsl8Q= github.com/submariner-io/shipyard v0.10.0-m2 h1:ZE1x6FW2I21O+koM/FTuj8RuZtB4kzevasuZJSlEEj4= github.com/submariner-io/shipyard v0.10.0-m2/go.mod h1:V1PwrxWoEphrHjMjtYjWKYmI9DHDNH8gV3LscuraYJw= -github.com/submariner-io/submariner v0.10.0-m1.0.20210603162033-dfea1b48c717 h1:9A4dMbM+2nnl0mlMk23zmfxwZUChFSyRBcrnNsy87u0= -github.com/submariner-io/submariner v0.10.0-m1.0.20210603162033-dfea1b48c717/go.mod h1:glqqhrsNJrIjXUpgBXZllIjdzo6wHsul4Lz2fZEwHe0= +github.com/submariner-io/submariner v0.10.0-m2 h1:4jL3g6EPffWKRVNr2gaX9rMfpF7DdRyZhcZjSI7mxwQ= +github.com/submariner-io/submariner v0.10.0-m2/go.mod h1:F1+2rj6IqNgWUcihtdWOrARvS2vF/fu7CxJFNVFFBoU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/thanos-io/thanos v0.11.0/go.mod h1:N/Yes7J68KqvmY+xM6J5CJqEvWIvKSR5sqGtmuD6wDc= @@ -1294,8 +1287,8 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= -github.com/uw-labs/lichen v0.1.3 h1:hWfa9q3vKbYybracKILuvc0ZYj7qZ2UAKHIRuDRsHiA= -github.com/uw-labs/lichen v0.1.3/go.mod h1:Fljba7ubiwHbEp1nzUjth+cWUbyQe73WUyL1++5HRNY= +github.com/uw-labs/lichen v0.1.4 h1:ZdTT7u0I3MI65CCDaNpMBh3VzhOf1Xbw0gF2VRKQ7/4= +github.com/uw-labs/lichen v0.1.4/go.mod h1:Fljba7ubiwHbEp1nzUjth+cWUbyQe73WUyL1++5HRNY= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= @@ -1621,7 +1614,6 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210309040221-94ec62e08169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 h1:JWgyZ1qgdTaF3N3oxC+MdTV7qvEEgHo3otj+HB5CM7Q= diff --git a/pkg/versions/versions.go b/pkg/versions/versions.go index c29124271..f1f9665cf 100644 --- a/pkg/versions/versions.go +++ b/pkg/versions/versions.go @@ -19,7 +19,7 @@ package versions var ( DefaultRepo = "quay.io/submariner" - DefaultSubmarinerOperatorVersion = "0.10.0-m1" - DefaultSubmarinerVersion = "0.10.0-m1" - DefaultLighthouseVersion = "0.10.0-m1" + DefaultSubmarinerOperatorVersion = "0.10.0-m2" + DefaultSubmarinerVersion = "0.10.0-m2" + DefaultLighthouseVersion = "0.10.0-m2" )