Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
158d7753
Commit
158d7753
authored
7 years ago
by
melkosoft
Browse files
Options
Downloads
Patches
Plain Diff
changed cilium to 1.0.0-rc7. Set CI to use coreos for cilium test
parent
8b6a6a5a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
.gitlab-ci.yml
roles/download/defaults/main.yml
+1
-1
1 addition, 1 deletion
roles/download/defaults/main.yml
roles/network_plugin/cilium/templates/cilium-ds.yml.j2
+7
-0
7 additions, 0 deletions
roles/network_plugin/cilium/templates/cilium-ds.yml.j2
with
11 additions
and
4 deletions
.gitlab-ci.yml
+
3
−
3
View file @
158d7753
...
...
@@ -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-.*$/
]
...
...
This diff is collapsed.
Click to expand it.
roles/download/defaults/main.yml
+
1
−
1
View file @
158d7753
...
...
@@ -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-rc
4
"
cilium_version
:
"
v1.0.0-rc
7
"
# Download URLs
istioctl_download_url
:
"
https://storage.googleapis.com/istio-release/releases/{{
istio_version
}}/istioctl/istioctl-linux"
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/cilium/templates/cilium-ds.yml.j2
+
7
−
0
View file @
158d7753
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment