Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Calico with Mesos and Kubernetes integrated #1521

Merged
merged 28 commits into from
Jun 9, 2016
Merged

Calico with Mesos and Kubernetes integrated #1521

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
50a6b65
GCE has dedicated workers for kubernetes
Zogg Dec 1, 2015
8f276fe
Kubernetes-with-mesos ansible playbook
Zogg Dec 1, 2015
3586930
patch ansible's 'kube' state
Zogg Dec 21, 2015
ab0e723
Use new kubernetes roles in sample ansible playbook
Zogg Dec 21, 2015
b79aa5e
Calico working with mesos
Zogg Jan 13, 2016
039f59f
Calico ip pools must be added before calico is started
Zogg Jan 14, 2016
a36a6a3
Allow GCE to route ipip traffic in internal network
Zogg Jan 14, 2016
3cbd090
Use packaged calico
Zogg Jan 21, 2016
da23949
dont forget mesos modules config
Zogg Jan 21, 2016
460ec46
Update with latest from mantl-kubernetes repo
Zogg Jan 27, 2016
ff7d65e
newer calico plugin
Zogg Jan 27, 2016
2bb3df8
Better ansible roles usage/separation
Zogg Jan 27, 2016
a3f375c
Calico fixes
Zogg Jan 29, 2016
1ce05e8
Calico plugin conf
Zogg Jan 29, 2016
94c9edb
k8s dont need environment vars files in systemd
Zogg Jan 29, 2016
c2db75c
Calico-kube integration
Zogg Feb 3, 2016
0bb9ac5
Calico plugins packaged into rpm
Zogg Feb 3, 2016
0387f69
Merge cleanup
Zogg Feb 10, 2016
414b8e4
Proper calico rpm repo
Zogg Feb 16, 2016
6f79c17
Share calico profile between kube and mesos
Zogg Feb 16, 2016
6f467e4
Cleanup
Zogg Feb 16, 2016
de4f5b6
Use mesos 0.27.1 by default
Zogg Mar 16, 2016
50fdbc7
Use Marathon 0.15.3 by default
Zogg Mar 16, 2016
dba08f4
Testing with marathon 1.0.0-RC1 and mesos .27
Zogg Apr 12, 2016
383d7f8
Remove MESOS_ADVERTISE_IP from mesos-agent configuration
ChrisAubuchon May 25, 2016
5cc276e
fixes after rebase
Zogg Jun 1, 2016
41c3000
Merge branch 'master' of github.com:CiscoCloud/microservices-infrastr…
Zogg Jun 9, 2016
ddc293c
Calico enabled by default
Zogg Jun 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions terraform/gce/gce.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,10 @@ resource "google_compute_instance" "mi-worker-nodes" {
}
}


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably just drop this commit

resource "google_compute_instance" "mi-kubeworker-nodes" {
name = "${var.short_name}-kubeworker-${format("%03d", count.index+1)}"

description = "${var.long_name} kube worker node #${format("%03d", count.index+1)}"
machine_type = "${var.worker_type}"
zone = "${var.zone}"
Expand Down