fix merge conflict

Signed-off-by: utam0k <k0ma@utam0k.jp>

Signed-off-by: utam0k <k0ma@utam0k.jp>

Signed-off-by: Fiala, JiriX <jirix.fiala@intel.com>

Cilium 1.13.1 changed how the cilium-cni binary gets placed in /opt/cni/bin,
so that it takes place in an init container rather than in the main agent.

* Fix ciliums hubble relay configuration

* Fixed the tls from code review

* Updated to dna_domain instead of hardcoding

Signed-off-by: tu1h <lihai.tu@daocloud.io>

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

Signed-off-by: bo.jiang <bo.jiang@daocloud.io>

Signed-off-by: hang.jiang <hang.jiang@daocloud.io>

Signed-off-by: dcwbq <biqiang.wu@daocloud.io>

Signed-off-by: hang.jiang <hang.jiang@daocloud.io>

Signed-off-by: bo.jiang <bo.jiang@daocloud.io>

Signed-off-by: panguicai008 <guicai.pan@daocloud.io>

Signed-off-by: cyclinder <qifeng.guo@daocloud.io>

Signed-off-by: cyclinder <qifeng.guo@daocloud.io>

This commit removes the variable `use_localhost_as_kubeapi_loadbalancer`
and rather detects that we are in a situation where we can use the
localhost apiserver loadbalancer (meaning that we use the localhost load
balancer and that the same ports are used for both the load balancer and
the kube-apiserver).

This also cleanups the calico code to use `kube_apiserver_global_endpoint`
rather than implementing the same logic all over again.

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

Signed-off-by: panguicai008 <1121906548@qq.com>