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

ooeyoshinori · Mar 20, 2018 · 158d775 · 158d775
1 parent 8b6a6a5
commit 158d775
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -257,7 +257,7 @@ before_script:
 # stage: deploy-special
   MOVED_TO_GROUP_VARS: "true"
 
-.ubuntu_cilium_sep_variables: &ubuntu_cilium_sep_variables
+.coreos_cilium_variables: &coreos_cilium_variables
 # stage: deploy-special
   MOVED_TO_GROUP_VARS: "true"
 
@@ -459,13 +459,13 @@ gce_ubuntu-contiv-sep:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-gce_ubuntu-cilium-sep:
+gce_coreos-cilium:
   stage: deploy-special
   <<: *job
   <<: *gce
   variables:
     <<: *gce_variables
-    <<: *ubuntu_cilium_sep_variables
+    <<: *coreos_cilium_variables
   when: manual
   except: ['triggers']
   only: ['master', /^pr-.*$/]

diff --git 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"

diff --git 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: