changed cilium to 1.0.0-rc7. Set CI to use coreos for cilium test

2026-02-20 12:40:12 -03:30 · 2018-03-20 12:43:26 -07:00
parent 8b6a6a5a28
commit 158d775306
3 changed files with 11 additions and 4 deletions
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -41,7 +41,7 @@ vault_version: 0.8.1
 weave_version: 2.2.0
 pod_infra_version: 3.0
 contiv_version: 1.1.7
-cilium_version: "v1.0.0-rc4"
+cilium_version: "v1.0.0-rc7"

 # Download URLs
 istioctl_download_url: "https://storage.googleapis.com/istio-release/releases/{{ istio_version }}/istioctl/istioctl-linux"
--- a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
@@ -79,6 +79,13 @@ spec:
                optional: true
                key: prometheus-serve-addr
 {% endif %}
+        resources:
+          limits:
+            cpu: {{ cilium_cpu_limit }}
+            memory: {{ cilium_memory_limit }}
+          requests:
+            cpu: {{ cilium_cpu_requests }}
+            memory: {{ cilium_memory_requests }}
        livenessProbe:
          exec:
            command: