Skip to content

Remove some unwanted logging. Fix an error message #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Jan 7, 2020
Merged

Remove some unwanted logging. Fix an error message #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bda7b7
Remove some unwanted logging and a bad check
danwinship Jan 6, 2020
a520900
Revert OVN_KUBE_LOG_LEVEL-setting change
danwinship Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions bindata/network/ovn-kubernetes/ovnkube-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -407,7 +383,7 @@ spec:
memory: 300Mi
env:
- name: OVN_KUBE_LOG_LEVEL
value: "{{.OvnkubeLogLevel}}"
value: 4
- name: K8S_NODE
valueFrom:
fieldRef:
Expand Down
14 changes: 1 addition & 13 deletions bindata/network/ovn-kubernetes/ovnkube-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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}" \
Expand Down Expand Up @@ -252,7 +240,7 @@ spec:
- name: KUBERNETES_SERVICE_HOST
value: "{{.KUBERNETES_SERVICE_HOST}}"
- name: OVN_KUBE_LOG_LEVEL
value: "{{.OvnkubeLogLevel}}"
value: 4
- name: K8S_NODE
valueFrom:
fieldRef:
Expand Down
7 changes: 0 additions & 7 deletions pkg/network/ovn_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo
}
data.Data["OVN_service_cidr"] = svcpools

// ovnkube config file
data.Data["OvnkubeLogLevel"] = 4

if c.HybridOverlayConfig != nil {
data.Data["OVNHybridOverlayNetCIDR"] = c.HybridOverlayConfig.HybridClusterNetwork[0].CIDR
data.Data["OVNHybridOverlayEnable"] = "true"
Expand Down Expand Up @@ -178,10 +175,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)
Expand Down