Skip to content

Commit

Permalink
Fixes syndesisio#6905, fixed error when building with go 1.13.1, fixe…
Browse files Browse the repository at this point in the history
…d openshift_funcs to handle new version string from crc oc client
  • Loading branch information
dhirajsb committed Oct 11, 2019
1 parent e485efe commit 43e9c9e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion install/operator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,6 @@ replace (
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
)

replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

go 1.13
1 change: 1 addition & 0 deletions install/operator/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 h1:Kn3rqvbUFqSepE2OqVu0Pn1CbDw9IuMlONapol0zuwk=
github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30/go.mod h1:4AJxUpXUhv4N+ziTvIcWWXgeorXpxPZOfk9HdEVr96M=
Expand Down
2 changes: 2 additions & 0 deletions tools/bin/commands/util/openshift_funcs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ check_oc_version()
if [ "$test" = "" ]; then
local test=$(oc version | grep 'Client Version' | sed "s/^.*GitVersion:\"v\(.*\)\", GitCommit.*$/\1/")
fi
# make sure version only has numbers and periods
test=`echo "$test" | sed -E "s/[^0-9]*([0-9]+[0-9.]+).*/\1/"`

echo $(compare_version $test $minimum)
}
Expand Down

0 comments on commit 43e9c9e

Please sign in to comment.