Skip to content

ovn-kubernetes: fix endpoint namespace #335

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 1 commit into from
Oct 6, 2019
Merged

ovn-kubernetes: fix endpoint namespace #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 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 @@ -181,6 +181,7 @@ spec:
--cluster-subnets "${OVN_NET_CIDR}" \
--k8s-service-cidr "${OVN_SVC_CIDR}" \
--k8s-apiserver "{{.K8S_APISERVER}}" \
--ovn-config-namespace openshift-ovn-kubernetes \
Copy link
Contributor

@danwinship danwinship Oct 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--ovn-config-namespace is only relevant if we're using a configmap, which we aren't yet. It seems like this part belongs in #333 and all you need here is the kubectl fix

Copy link
Contributor Author

@dcbw dcbw Oct 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danwinship it will be used for the master creating endpoints in ovn-kubernetes/ovn-kubernetes#763 at some point here too

--nodeport \
--loglevel "${OVN_KUBE_LOG_LEVEL}" \
--logfile /dev/stdout
Expand Down
4 changes: 3 additions & 1 deletion bindata/network/ovn-kubernetes/ovnkube-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,10 @@ spec:
set +o allexport
fi
cp -f /usr/libexec/cni/ovn-k8s-cni-overlay /cni-bin-dir/
ovn_config_namespace=openshift-ovn-kubernetes
retries=0
while true; do
db_ip=$(kubectl get ep ovnkube-db -o jsonpath='{.subsets[0].addresses[0].ip}')
db_ip=$(kubectl get ep -n ${ovn_config_namespace} ovnkube-db -o jsonpath='{.subsets[0].addresses[0].ip}')
if [[ -n "${db_ip}" ]]; then
break
fi
Expand All @@ -181,6 +182,7 @@ spec:
--cluster-subnets "${OVN_NET_CIDR}" \
--k8s-service-cidr "${OVN_SVC_CIDR}" \
--k8s-apiserver "{{.K8S_APISERVER}}" \
--ovn-config-namespace ${ovn_config_namespace} \
--nb-address "tcp://${db_ip}:{{.OVN_NB_PORT}}" \
--sb-address "tcp://${db_ip}:{{.OVN_SB_PORT}}" \
--nodeport --gateway-mode local \
Expand Down