[ upstream commit 29f0b34 ]

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>

[ upstream commit 5cdde10 ]

kubectl is guaranteed to be compatible with limited number of earlier
releases:

> kubectl is supported within one minor version (older or newer) of
> kube-apiserver.

So far we have been using the latest kubectl in the host (now 1.18) to
control clusters from K8s 1.11 to 1.18. This did not work any more
with 'istioctl', which complained about "kubectl not being found in
$PATH". When pairing istioctl with the same version of kubectl as the
cluster this started working again.

Downgrading kubectl in the test hosts may not be practical, but the CI
infra also supports running kubectl in the cluster's master node
(k8s1). This is triggered via the value of the Ginkgo
'cilium.kubeconfig' option. When 'cilium.kubeconfig' is non-empty, it
is assumed to be a path to a valid kubeconfig for connecting kubectl
in the host to the test cluster. When 'cilium.kubeconfig' is empty, CI
Ginkgo helpers assume that kubectl should be run on
"k8s1". 'test/vagrant-ci-start.sh' expects KUBECONFIG environment
variable to be set to the path to the file into which the kubeconfig
fetched from the test cluster should be stored. Modify
'test/vagrant-ci-start.sh' to accept undefined KUBECONFIG to signify
the need to run kubectl in the test cluster's master node (k8s1).

Finally, remove setting of both the KUBECONFIG environment variable
before calling 'vagrant-ci-start.sh' and the Ginkgo option
'cilium.kubeconfig' in 'ginkgo-kubernetes-all.Jenkinsfile' which is
used to run the CI K8s test suite on k8s versions from 1.11 to
1.17. This way we always use the kubectl installed as part of the
testing cluster itself, in the master node. This solves the
compatibility problem with istioctl and should help guard that we have
not introduced any kubectl syntax that would not be compatible with
the target k8s version.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>

[ upstream commit 19c3f5a ]

Running preflight daemonset can fail due to image pull error, if trying to pull the "cilium" image:

$ kubectl get pods --all-namespaces
kube-system   cilium-pre-flight-check-8d4qw     0/1     Init:ErrImagePull   0          56s
kube-system   cilium-pre-flight-check-p9945     0/1     Init:ErrImagePull   0          56s

$ kubectl describe ds cilium-pre-flight-check -n kube-system
Name:           cilium-pre-flight-check
Pod Template:
  Init Containers:
   clean-cilium-state:
    Image:      k8s1:5000/cilium/cilium:latest

Dev builds of the latest cilium images are named "cilium-dev":

$ docker image ls
REPOSITORY                               TAG                                        IMAGE ID            CREATED             SIZE
k8s1:5000/cilium/cilium-dev              latest                                     b8fc4648be0f        32 minutes ago      658MB

Fix this by using "cilium-dev" also for 'preflight.image' by default.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>