Browse Source

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
Artem Panchenko 2 years ago
parent
commit
0f25a78987
1 changed files with 2 additions and 5 deletions
  1. 2
    5
      fuel_ccp_tests/settings.py

+ 2
- 5
fuel_ccp_tests/settings.py View File

@@ -103,11 +103,8 @@ CALICO = {
103 103
     "calicoctl_image_repo": os.environ.get('CALICOCTL_IMAGE_REPO'),
104 104
     "calicoctl_image_tag": os.environ.get('CALICOCTL_IMAGE_TAG'),
105 105
     "calico_version": os.environ.get('CALICO_VERSION'),
106
-    "calico_cni_download_url": os.environ.get('CALICO_CNI_DOWNLOAD_URL'),
107
-    "calico_cni_checksum": os.environ.get('CALICO_CNI_CHECKSUM'),
108
-    "calico_cni_ipam_download_url": os.environ.get(
109
-        'CALICO_CNI_IPAM_DOWNLOAD_URL'),
110
-    "calico_cni_ipam_checksum": os.environ.get('CALICO_CNI_IPAM_CHECKSUM'),
106
+    "calico_cni_image_repo": os.environ.get('CALICO_CNI_IMAGE_REPO'),
107
+    "calico_cni_image_tag": os.environ.get('CALICO_CNI_IMAGE_TAG'),
111 108
     "ipip": get_var_as_bool('IPIP_USAGE', None),
112 109
     "overwrite_hyperkube_cni": get_var_as_bool('OVERWRITE_HYPERKUBE_CNI',
113 110
                                                None),

Loading…
Cancel
Save