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

Make cilium tests pass (#4660)

Browse source 
Cilium requires a high kernel. rhel7 and centos7 are too low, so they are removed.
Bumping ubuntu to ubuntu-1804

Change-Id: Ib1bffa45b8f9ed0ba500f751714372b3a3f7878b
This commit is contained in:
Matthew Mosesohn 2019-04-26 15:54:37 +03:00 committed by Kubernetes Prow Robot
parent 3722acee85
commit 81e6877b02
8 changed files with 4 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/gce.yml
View file

@ -146,7 +146,7 @@ gce_coreos-cilium:
except: ['triggers'] except: ['triggers']
only: ['master', /^pr-.*$/] only: ['master', /^pr-.*$/]
gce_ubuntu-cilium-sep: gce_ubuntu18-cilium-sep:
stage: deploy-special stage: deploy-special
<<: *gce <<: *gce
when: manual when: manual

16
.gitlab-ci/packet.yml
View file

@ -73,7 +73,7 @@ packet_ubuntu-contiv-sep:
except: ['triggers'] except: ['triggers']
only: ['master', /^pr-.*$/] only: ['master', /^pr-.*$/]
packet_ubuntu-cilium-sep: packet_ubuntu18-cilium-sep:
stage: deploy-special stage: deploy-special
<<: *packet <<: *packet
when: manual when: manual
@ -108,20 +108,6 @@ packet_centos7-calico-ha:
except: ['triggers'] except: ['triggers']
only: ['master', /^pr-.*$/] only: ['master', /^pr-.*$/]
packet_centos7-cilium:
stage: deploy-special
<<: *packet
when: manual
except: ['triggers']
only: ['master', /^pr-.*$/]
packet_rhel7-cilium:
stage: deploy-special
<<: *packet
when: manual
except: ['triggers']
only: ['master', /^pr-.*$/]
packet_centos7-kube-router: packet_centos7-kube-router:
stage: deploy-special stage: deploy-special
<<: *packet <<: *packet

13
tests/files/gce_centos7-cilium.yml
View file

@ -1,13 +0,0 @@
---
# Instance settings
cloud_image_family: centos-7
cloud_region: us-central1-c
cloud_machine_type: "n1-standard-1"
mode: default
# Deployment settings
kube_network_plugin: cilium
deploy_netchecker: true
enable_network_policy: true
dns_min_replicas: 1
cloud_provider: gce

12
tests/files/gce_rhel7-cilium.yml
View file

@ -1,12 +0,0 @@
---
# Instance settings
cloud_image_family: rhel-7
cloud_region: us-central1-b
mode: default
# Deployment settings
kube_network_plugin: cilium
deploy_netchecker: true
enable_network_policy: true
dns_min_replicas: 1
cloud_provider: gce

2
tests/files/gce_ubuntu-cilium-sep.yml → tests/files/gce_ubuntu18-cilium-sep.yml
View file

@ -1,6 +1,6 @@
--- ---
# Instance settings # Instance settings
cloud_image_family: ubuntu-1604-lts cloud_image_family: ubuntu-1804-lts
cloud_region: us-central1-b cloud_region: us-central1-b
mode: separate mode: separate

10
tests/files/packet_centos7-cilium.yml
View file

@ -1,10 +0,0 @@
---
# Instance settings
cloud_image: centos-7
mode: default
# Kubespray settings
kube_network_plugin: cilium
deploy_netchecker: true
enable_network_policy: true
dns_min_replicas: 1

10
tests/files/packet_rhel7-cilium.yml
View file

@ -1,10 +0,0 @@
---
# Instance settings
cloud_image: rhel-server-7
mode: default
# Kubespray settings
kube_network_plugin: cilium
deploy_netchecker: true
enable_network_policy: true
dns_min_replicas: 1

2
tests/files/packet_ubuntu-cilium-sep.yml → tests/files/packet_ubuntu18-cilium-sep.yml
View file

@ -1,6 +1,6 @@
--- ---
# Instance settings # Instance settings
cloud_image: ubuntu-1604 cloud_image: ubuntu-1804
mode: separate mode: separate
# Kubespray settings # Kubespray settings