Remove some unwanted logging and a bad check

openshift · Jan 6, 2020 · 4bda7b7 · 4bda7b7
1 parent 501fa97
commit 4bda7b7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 40 deletions.
diff --git a/bindata/network/ovn-kubernetes/ovnkube-master.yaml b/bindata/network/ovn-kubernetes/ovnkube-master.yaml
@@ -82,12 +82,6 @@ spec:
             nb_addr_list="${nb_addr_list}ssl:${host}:{{.OVN_NB_PORT}}"
             sb_addr_list="${sb_addr_list}ssl:${host}:{{.OVN_SB_PORT}}"
           done
-          echo /ovn-cert/tls.key
-          cat /ovn-cert/tls.key
-          echo /ovn-cert/tls.crt
-          cat /ovn-cert/tls.crt
-          echo /ovn-ca/ca-bundle.crt
-          cat /ovn-ca/ca-bundle.crt
           
           exec ovn-northd \
             --no-chdir "-vconsole:${OVN_LOG_LEVEL}" -vfile:off \
@@ -136,12 +130,6 @@ spec:
           OVN_NODES_ARRAY=({{.OVN_NODES}})
           MASTER_NODE=$(getent ahostsv4 "${OVN_NODES_ARRAY[0]}" | grep RAW | awk '{print $1}')
           LOCALHOST=$(getent ahostsv4 "${K8S_NODE}" | grep RAW | awk '{print $1}')
-          echo /ovn-cert/tls.key
-          cat /ovn-cert/tls.key
-          echo /ovn-cert/tls.crt
-          cat /ovn-cert/tls.crt
-          echo /ovn-ca/ca-bundle.crt
-          cat /ovn-ca/ca-bundle.crt
 
           if [[ "$LOCALHOST" == "$MASTER_NODE" ]]; then
             exec /usr/share/openvswitch/scripts/ovn-ctl \
@@ -240,12 +228,6 @@ spec:
           OVN_NODES_ARRAY=({{.OVN_NODES}})
           MASTER_NODE=$(getent ahostsv4 "${OVN_NODES_ARRAY[0]}" | grep RAW | awk '{print $1}')
           LOCALHOST=$(getent ahostsv4 "${K8S_NODE}" | grep RAW | awk '{print $1}')
-          echo /ovn-cert/tls.key
-          cat /ovn-cert/tls.key
-          echo /ovn-cert/tls.crt
-          cat /ovn-cert/tls.crt
-          echo /ovn-ca/ca-bundle.crt
-          cat /ovn-ca/ca-bundle.crt
 
           if [[ "$LOCALHOST" == "$MASTER_NODE" ]]; then
             exec /usr/share/openvswitch/scripts/ovn-ctl \
@@ -358,12 +340,6 @@ spec:
             nb_addr_list="${nb_addr_list}ssl:${host}:{{.OVN_NB_PORT}}"
             sb_addr_list="${sb_addr_list}ssl://${host}:{{.OVN_SB_PORT}}"
           done
-          echo /ovn-cert/tls.key
-          cat /ovn-cert/tls.key
-          echo /ovn-cert/tls.crt
-          cat /ovn-cert/tls.crt
-          echo /ovn-ca/ca-bundle.crt
-          cat /ovn-ca/ca-bundle.crt
           
           # start nbctl daemon for caching
           export OVN_NB_DAEMON=$(ovn-nbctl --pidfile=/run/openvswitch/ovnk-nbctl.pid \

diff --git a/bindata/network/ovn-kubernetes/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/ovnkube-node.yaml
@@ -128,12 +128,6 @@ spec:
             source "/env/${K8S_NODE}"
             set +o allexport
           fi
-          echo /ovn-cert/tls.key
-          cat /ovn-cert/tls.key
-          echo /ovn-cert/tls.crt
-          cat /ovn-cert/tls.crt
-          echo /ovn-ca/ca-bundle.crt
-          cat /ovn-ca/ca-bundle.crt
           exec ovn-controller unix:/var/run/openvswitch/db.sock -vfile:off \
             --no-chdir --pidfile=/var/run/openvswitch/ovn-controller.pid \
             -p /ovn-cert/tls.key -c /ovn-cert/tls.crt -C /ovn-ca/ca-bundle.crt \
@@ -216,12 +210,6 @@ spec:
             nb_addr_list="${nb_addr_list}ssl://${host}:{{.OVN_NB_PORT}}"
             sb_addr_list="${sb_addr_list}ssl://${host}:{{.OVN_SB_PORT}}"
           done
-          echo /ovn-cert/tls.key
-          cat /ovn-cert/tls.key
-          echo /ovn-cert/tls.crt
-          cat /ovn-cert/tls.crt
-          echo /ovn-ca/ca-bundle.crt
-          cat /ovn-ca/ca-bundle.crt
 
           exec /usr/bin/ovnkube --init-node "${K8S_NODE}" \
             --cluster-subnets "${OVN_NET_CIDR}" \

diff --git a/pkg/network/ovn_kubernetes.go b/pkg/network/ovn_kubernetes.go
@@ -178,10 +178,6 @@ func boostrapOVN(kubeClient client.Client) (*bootstrap.BootstrapResult, error) {
 		return nil, fmt.Errorf("unable to bootstrap OVN, no master nodes found")
 	}
 
-	if len(masterNodeList.Items) < 3 {
-		return nil, fmt.Errorf("PHIL Need at least 3 nodes, have %d", len(masterNodeList.Items))
-	}
-
 	ovnMasterNodes := []string{}
 	for _, masterNode := range masterNodeList.Items {
 		ovnMasterNodes = append(ovnMasterNodes, masterNode.Name)