Fix(GH-6918): Updates required for crc

install/operator/build/conf/config.yaml

@@ -24,7 +24,7 @@ spec-defaults:
       image: docker.io/syndesis/syndesis-meta:latest
     db:
       imageStreamNamespace: openshift
-      image: postgresql:9.5
+      image: postgresql:9.6
     komodo:
       image: docker.io/teiid/syndesis-dv:latest
     oauth:

tools/bin/commands/util/openshift_funcs

@@ -9,9 +9,15 @@ SETUP_MINISHIFT="setup-minishift"
 check_oc_version()
 {
     local minimum=${OC_MIN_VERSION}
-    local test=$(oc version | grep "^oc" | tr -d oc\ v | cut -f1 -d "+")
-    if [ "$test" = "" ]; then
-        local test=$(oc version | grep 'Client Version' | sed "s/^.*GitVersion:\"v\(.*\)\", GitCommit.*$/\1/")
+    #
+    # Removes any lines containing kubernetes or server
+    # Extracts any version number of the format dd.dd.dd, eg. 3.10.0 or 4.1.0
+    #
+    local test=$(oc version | grep -Eiv 'kubernetes|server' | grep -o '[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\?')
+
+    if [ -z "$test" ]; then
+      echo "ERROR: 'Version of oc could not be found'"
+      return
     fi
 
     echo $(compare_version $test $minimum)

tools/bin/commands/util/openshift_funcs.bats

@@ -0,0 +1,65 @@
+#!/usr/bin/env bats
+
+source ./common_funcs
+source ./openshift_funcs
+
+@test "test output from a minishift oc command, it should compare correctly and return OK" {
+    function oc() {
+      printf "oc v3.10.0+dd10d17
+kubernetes v1.10.0+b81c8f8
+features: Basic-Auth GSSAPI Kerberos SPNEGO
+
+Server https://api.crc.testing:6443
+kubernetes v1.14.6+73b5d76";
+    }
+    export -f oc
+
+    result=$(check_oc_version)
+    echo "Result: $result"
+
+    unset oc
+    [ "$result" == "OK" ]
+}
+
+@test "test output from a crc oc command, it should compare correctly and return OK" {
+    function oc() {
+      printf "Client Version: v4.3.0
+Server Version: 4.2.0-0.nightly-2019-09-26-192831
+Kubernetes Version: v1.14.6+73b5d76";
+    }
+    export -f oc
+
+    result=$(check_oc_version)
+    echo "Result: $result"
+
+    unset oc
+    [ "$result" == "OK" ]
+}
+
+@test "test output from a oc 4.2.0 command, it should compare correctly and return OK" {
+    function oc() {
+      printf "Client Version: openshift-clients-4.2.0-201910041700
+Kubernetes Version: v1.11.0+d4cacc0";
+    }
+    export -f oc
+
+    result=$(check_oc_version)
+    echo "Result: $result"
+
+    unset oc
+    [ "$result" == "OK" ]
+}
+
+@test "test output from a oc theoretical command (3-digit minor version), it should compare correctly and return OK" {
+    function oc() {
+      printf "Client Version: openshift-clients-4.101.0-201910041700
+Kubernetes Version: v1.11.0+d4cacc0";
+    }
+    export -f oc
+
+    result=$(check_oc_version)
+    echo "Result: $result"
+
+    unset oc
+    [ "$result" == "OK" ]
+}