Use 'calico/cni' image to get CNI binaries (kargo)
Align system tests with recent change to kargo: https://github.com/kubernetes-incubator/kargo/pull/600 Currently, custom Calico CNI binaries can be taken from Docker image only, direct download links aren't used anymore. Change-Id: Ifafda828a6307d9a81c667c0f830bc65624580af
This commit is contained in:
parent
28b1e600c0
commit
0f25a78987
|
@ -103,11 +103,8 @@ CALICO = {
|
||||||
"calicoctl_image_repo": os.environ.get('CALICOCTL_IMAGE_REPO'),
|
"calicoctl_image_repo": os.environ.get('CALICOCTL_IMAGE_REPO'),
|
||||||
"calicoctl_image_tag": os.environ.get('CALICOCTL_IMAGE_TAG'),
|
"calicoctl_image_tag": os.environ.get('CALICOCTL_IMAGE_TAG'),
|
||||||
"calico_version": os.environ.get('CALICO_VERSION'),
|
"calico_version": os.environ.get('CALICO_VERSION'),
|
||||||
"calico_cni_download_url": os.environ.get('CALICO_CNI_DOWNLOAD_URL'),
|
"calico_cni_image_repo": os.environ.get('CALICO_CNI_IMAGE_REPO'),
|
||||||
"calico_cni_checksum": os.environ.get('CALICO_CNI_CHECKSUM'),
|
"calico_cni_image_tag": os.environ.get('CALICO_CNI_IMAGE_TAG'),
|
||||||
"calico_cni_ipam_download_url": os.environ.get(
|
|
||||||
'CALICO_CNI_IPAM_DOWNLOAD_URL'),
|
|
||||||
"calico_cni_ipam_checksum": os.environ.get('CALICO_CNI_IPAM_CHECKSUM'),
|
|
||||||
"ipip": get_var_as_bool('IPIP_USAGE', None),
|
"ipip": get_var_as_bool('IPIP_USAGE', None),
|
||||||
"overwrite_hyperkube_cni": get_var_as_bool('OVERWRITE_HYPERKUBE_CNI',
|
"overwrite_hyperkube_cni": get_var_as_bool('OVERWRITE_HYPERKUBE_CNI',
|
||||||
None),
|
None),
|
||||||
|
|
Loading…
Reference in New Issue