C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
melkosoft 2018-03-20 12:43:26 -07:00
parent 8b6a6a5a28
commit 158d775306
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -257,7 +257,7 @@ before_script:
# stage: deploy-special # stage: deploy-special
MOVED_TO_GROUP_VARS: "true" MOVED_TO_GROUP_VARS: "true"
.ubuntu_cilium_sep_variables: &ubuntu_cilium_sep_variables .coreos_cilium_variables: &coreos_cilium_variables
# stage: deploy-special # stage: deploy-special
MOVED_TO_GROUP_VARS: "true" MOVED_TO_GROUP_VARS: "true"
@ -459,13 +459,13 @@ gce_ubuntu-contiv-sep:
except: ['triggers'] except: ['triggers']
only: ['master', /^pr-.*$/] only: ['master', /^pr-.*$/]
gce_ubuntu-cilium-sep: gce_coreos-cilium:
stage: deploy-special stage: deploy-special
<<: *job <<: *job
<<: *gce <<: *gce
variables: variables:
<<: *gce_variables <<: *gce_variables
<<: *ubuntu_cilium_sep_variables <<: *coreos_cilium_variables
when: manual when: manual
except: ['triggers'] except: ['triggers']
only: ['master', /^pr-.*$/] only: ['master', /^pr-.*$/]

2
roles/download/defaults/main.yml
View file

@ -41,7 +41,7 @@ vault_version: 0.8.1
weave_version: 2.2.0 weave_version: 2.2.0
pod_infra_version: 3.0 pod_infra_version: 3.0
contiv_version: 1.1.7 contiv_version: 1.1.7
cilium_version: "v1.0.0-rc4" cilium_version: "v1.0.0-rc7"
# Download URLs # Download URLs
istioctl_download_url: "https://storage.googleapis.com/istio-release/releases/{{ istio_version }}/istioctl/istioctl-linux" istioctl_download_url: "https://storage.googleapis.com/istio-release/releases/{{ istio_version }}/istioctl/istioctl-linux"

7
roles/network_plugin/cilium/templates/cilium-ds.yml.j2
View file

@ -79,6 +79,13 @@ spec:
optional: true optional: true
key: prometheus-serve-addr key: prometheus-serve-addr
{% endif %} {% endif %}
resources:
limits:
cpu: {{ cilium_cpu_limit }}
memory: {{ cilium_memory_limit }}
requests:
cpu: {{ cilium_cpu_requests }}
memory: {{ cilium_memory_requests }}
livenessProbe: livenessProbe:
exec: exec:
command: command: