Merge pull request #2508 from melkosoft/cilium

Cilium v.1.0.0-rc8
2026-03-09 21:49:30 -02:30 · 2018-03-21 20:25:43 -05:00
parent bc68188209 6425c837d5
commit bbb6e7b3da
8 changed files with 30 additions and 2 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-rc8"

 # Download URLs
 istioctl_download_url: "https://storage.googleapis.com/istio-release/releases/{{ istio_version }}/istioctl/istioctl-linux"
--- a/roles/network_plugin/cilium/templates/cilium-cr.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium-cr.yml.j2
@@ -54,9 +54,11 @@ rules:
  - get
  - list
  - watch
+  - update
 - apiGroups:
  - cilium.io
  resources:
  - ciliumnetworkpolicies
+  - ciliumendpoints
  verbs:
  - "*"
--- 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: