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

Conversation

Zogg
Copy link
Contributor

@Zogg Zogg commented Jun 9, 2016

After a long period, with issues resolved, we finally have the Calico and Mesos and Kubernetes working together.

Champagne popping sound

Calico: 0.15.0
Kubernetes: 1.2.0
Mesos: 0.27.0
Marathon: 1.0.0_RC1

Components version upgrades are to be supplied through their respective PRs.

@langston-barrett
Copy link
Contributor

Fixes #1514

@@ -0,0 +1,138 @@
---
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this was probably checked in accidentally

@langston-barrett
Copy link
Contributor

@Zogg Awesome job! Do we need to update/create any documentation around this?

@@ -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

@langston-barrett
Copy link
Contributor

@Zogg Also, have you been able to test with more recent versions of Mesos and Marathon? Marathon is at v1.1.1, and they recommend Mesos 0.28.0 to go with it.

@Zogg
Copy link
Contributor Author

Zogg commented Jun 9, 2016

A lot of testing has been done with various mesos/marathon/calico/kube versions. The exact versions that will go into 1.2 will be resolved in respective component PRs.

@Zogg Zogg merged commit 0e3b74f into master Jun 9, 2016
@langston-barrett langston-barrett deleted the feature/mkc-combo-working branch June 9, 2016 13:46
@ryane ryane modified the milestone: 1.2 Jun 9, 2016
@langston-barrett langston-barrett mentioned this pull request Jun 21, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants