[ upstream commit 76aad59 ]

[ backporter's notes: hit minor conflict due to the presence
  of 8cf3df4 ("Makefile fix kind-install-cilium-fast target"),
  resolved ignoring the associated hunk, as already up-to-date. ]

The Make targets to deploy Cilium into a kind cluster are
using the following Helm values files.

* contrib/testing/kind-values.yaml
* contrib/testing/kind-fast.yaml

These contain reasonable defaults. Nevertheless, it would be
great to be able to define additional helm values without
having to modify the existing files.

Therefore, this commit introduces the possibilitiy to define a
user-defined values file that is added to the list of helm values
files.

* contrib/testing/kind-custom.yaml

To prevent users from committing the file, it's ignored by Git.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>

[ upstream commit 535e7f1 ]

[ backporter's notes: applied equivalent changes to the Conformance E2E
  workflow, as the upgrade/downgrade one does not exist in v1.14. ]

Modify a few matrix entries of the Cilium E2E Upgrade workflow to
configure Cilium in kvstore mode, to cover this functionality here
as well in addition to the clustermesh workflows. In detail, the
etcd instance is executed as a pod running in host network, which
is setup via the `kind-kvstore-start` makefile target. The matrix
entries are selected trying to cover the most common combinations,
that is native-routing/tunneling, KPR off/on and wireguard off/on,
and avoiding incompatible options (mainly Egress Gateway).

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>