Skip to content
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

Jump to bottom

contrib/vagrant: Use CRDs instead of kvstore if K8S=1 #15913

Merged
merged 1 commit into from
May 10, 2021
Merged

contrib/vagrant: Use CRDs instead of kvstore if K8S=1 #15913

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions contrib/vagrant/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,18 @@ function write_cilium_cfg() {
cilium_options+=" --enable-ipv6-ndp"
cilium_options+=" --ipv6-mcast-device enp0s8"

cilium_options+=" ${TUNNEL_MODE_STRING}"

if [ -n "${K8S}" ]; then
cilium_kvstore_options="--kvstore etcd --kvstore-opt etcd.config=/var/lib/cilium/etcd-config.yml"
cilium_options+=" --k8s-kubeconfig-path /var/lib/cilium/cilium.kubeconfig"
cilium_options+=" --kvstore etcd"
cilium_options+=" --kvstore-opt etcd.config=/var/lib/cilium/etcd-config.yml"
cilium_options_with_kvstore="${cilium_options} ${cilium_kvstore_options}"
cilium_options+=" --identity-allocation-mode=crd --enable-k8s-event-handover=false"
pchaigno marked this conversation as resolved.
Show resolved Hide resolved
cilium_operator_options+=" --k8s-kubeconfig-path /var/lib/cilium/cilium.kubeconfig"
cilium_operator_options+=" --kvstore etcd"
cilium_operator_options+=" --kvstore-opt etcd.config=/var/lib/cilium/etcd-config.yml"
cilium_operator_options+=" --cluster-pool-ipv4-cidr=10.${master_ipv4_suffix}.0.0/16"
cilium_operator_options+=" --cluster-pool-ipv6-cidr=fd00::/104"
cilium_operator_options_with_kvstore="${cilium_operator_options} ${cilium_kvstore_options}"
cilium_operator_options+=" --identity-allocation-mode=crd"
else
if [[ "${IPV4}" -eq "1" ]]; then
cilium_options+=" --kvstore-opt consul.address=${MASTER_IPV4}:8500"
Expand All @@ -340,12 +343,14 @@ function write_cilium_cfg() {
cilium_operator_options+=" --kvstore consul"
fi

cilium_options+=" ${TUNNEL_MODE_STRING}"

cat <<EOF >> "$filename"
sleep 2s
if [ -n "\${K8S}" ]; then
echo "K8S_NODE_NAME=\$(hostname)" >> /etc/sysconfig/cilium
echo '# Cilium configuration with kvstore.' >> /etc/sysconfig/cilium
echo 'CILIUM_OPTS="${cilium_options_with_kvstore}"' >> /etc/sysconfig/cilium
echo 'CILIUM_OPERATOR_OPTS="${cilium_operator_options_with_kvstore}"' >> /etc/sysconfig/cilium
echo '# Cilium configuration without kvstore.' >> /etc/sysconfig/cilium
fi
echo 'CILIUM_OPTS="${cilium_options}"' >> /etc/sysconfig/cilium
echo 'CILIUM_OPERATOR_OPTS="${cilium_operator_options}"' >> /etc/sysconfig/cilium
Expand Down