Skip to content

dind-ovn: use golang binaries instead of python ones #17541

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
merged 2 commits into from
Jan 11, 2018
Merged

dind-ovn: use golang binaries instead of python ones #17541

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
7697cb9
With upstream PR: https://github.com/openvswitch/ovn-kubernetes/pull/…
Nov 30, 2017
96d39c4
reflect the new install procedure as in https://github.com/openvswitc…
Jan 11, 2018
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
6 changes: 2 additions & 4 deletions hack/dind-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,13 +551,11 @@ function copy-ovn-runtime() {
local ovn_go_controller_built_binaries_path="${ovn_root}/go-controller/_output/go/bin"
cp "${ovn_go_controller_built_binaries_path}/ovnkube" "${target}"
cp "${ovn_go_controller_built_binaries_path}/ovn-kube-util" "${target}"
cp "${ovn_go_controller_built_binaries_path}/ovn-k8s-overlay" "${target}"
cp "${ovn_go_controller_built_binaries_path}/ovn-k8s-cni-overlay" "${target}"

local ovn_k8s_binaries_path="${ovn_root}/bin"
cp "${ovn_k8s_binaries_path}/ovn-k8s-cni-overlay" "${target}"
cp "${ovn_k8s_binaries_path}/ovn-k8s-gateway-helper" "${target}"
cp "${ovn_k8s_binaries_path}/ovn-k8s-overlay" "${target}"
cp "${ovn_k8s_binaries_path}/ovn-k8s-util" "${target}"
cp "${ovn_k8s_binaries_path}/ovn-k8s-watcher" "${target}"

local ovn_k8s_python_module_path="${ovn_root}/ovn_k8s"
cp -R "${ovn_k8s_python_module_path}" "${target}/"
Expand Down
2 changes: 1 addition & 1 deletion images/dind/node/ovn-kubernetes-node-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function ovn-kubernetes-node-setup() {

ln -sf /data/ovnkube /usr/local/bin/
ln -sf /data/ovn-kube-util /usr/local/bin/
ln -sf /data/ovn-k8s-cni-overlay /usr/local/bin/
ln -sf /data/ovn-k8s-cni-overlay /opt/cni/bin/
ln -sf /data/ovn-k8s-gateway-helper /usr/local/bin/
ln -sf /data/ovn-k8s-overlay /usr/local/bin
ln -sf /data/ovn-k8s-util /usr/local/bin/
Expand Down
2 changes: 1 addition & 1 deletion images/dind/node/ovn-kubernetes-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function ovn-kubernetes-node() {

cat >"/etc/openvswitch/ovn_k8s.conf" <<EOF
[default]
k8s_ca_certificate=${config_dir}/ca.crt
k8s-ca-certificate=${config_dir}/ca.crt
EOF

local host
Expand Down