Skip to content
Snippets Groups Projects
Commit 81e6877b authored by Matthew Mosesohn's avatar Matthew Mosesohn Committed by Kubernetes Prow Robot
Browse files

Make cilium tests pass (#4660)

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

Change-Id: Ib1bffa45b8f9ed0ba500f751714372b3a3f7878b
parent 3722acee
No related branches found
No related tags found
No related merge requests found
......@@ -146,7 +146,7 @@ gce_coreos-cilium:
except: ['triggers']
only: ['master', /^pr-.*$/]
gce_ubuntu-cilium-sep:
gce_ubuntu18-cilium-sep:
stage: deploy-special
<<: *gce
when: manual
......
......@@ -73,7 +73,7 @@ packet_ubuntu-contiv-sep:
except: ['triggers']
only: ['master', /^pr-.*$/]
packet_ubuntu-cilium-sep:
packet_ubuntu18-cilium-sep:
stage: deploy-special
<<: *packet
when: manual
......@@ -108,20 +108,6 @@ packet_centos7-calico-ha:
except: ['triggers']
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:
stage: deploy-special
<<: *packet
......
---
# 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
---
# 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
---
# Instance settings
cloud_image_family: ubuntu-1604-lts
cloud_image_family: ubuntu-1804-lts
cloud_region: us-central1-b
mode: separate
......
---
# 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
---
# 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
---
# Instance settings
cloud_image: ubuntu-1604
cloud_image: ubuntu-1804
mode: separate
# Kubespray settings
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment