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

merged 28 commits into from
Jun 9, 2016

Commits on May 26, 2016

  1. GCE has dedicated workers for kubernetes

    @Zogg
    Zogg committed May 26, 2016
    Configuration menu
    Copy the full SHA
    50a6b65 View commit details
    Browse the repository at this point in the history

  2. Kubernetes-with-mesos ansible playbook

    @Zogg
    Zogg committed May 26, 2016
    Configuration menu
    Copy the full SHA
    8f276fe View commit details
    Browse the repository at this point in the history

Commits on May 27, 2016

  1. patch ansible's 'kube' state

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    3586930 View commit details
    Browse the repository at this point in the history

  2. Use new kubernetes roles in sample ansible playbook

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    ab0e723 View commit details
    Browse the repository at this point in the history

  3. Calico working with mesos

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    b79aa5e View commit details
    Browse the repository at this point in the history

  4. Calico ip pools must be added before calico is started

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    039f59f View commit details
    Browse the repository at this point in the history

  5. Allow GCE to route ipip traffic in internal network

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    a36a6a3 View commit details
    Browse the repository at this point in the history

  6. Use packaged calico

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    3cbd090 View commit details
    Browse the repository at this point in the history

  7. dont forget mesos modules config

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    da23949 View commit details
    Browse the repository at this point in the history

  8. Update with latest from mantl-kubernetes repo

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    460ec46 View commit details
    Browse the repository at this point in the history

  9. newer calico plugin

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    ff7d65e View commit details
    Browse the repository at this point in the history

  10. Better ansible roles usage/separation

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    2bb3df8 View commit details
    Browse the repository at this point in the history

  11. Calico fixes

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    a3f375c View commit details
    Browse the repository at this point in the history

  12. Calico plugin conf

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    1ce05e8 View commit details
    Browse the repository at this point in the history

  13. k8s dont need environment vars files in systemd 

    Enabled calico support fr k8s
    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    94c9edb View commit details
    Browse the repository at this point in the history

  14. Calico-kube integration

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    c2db75c View commit details
    Browse the repository at this point in the history

  15. Calico plugins packaged into rpm

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    0bb9ac5 View commit details
    Browse the repository at this point in the history

  16. Merge cleanup

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    0387f69 View commit details
    Browse the repository at this point in the history

  17. Proper calico rpm repo

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    414b8e4 View commit details
    Browse the repository at this point in the history

  18. Share calico profile between kube and mesos

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    6f79c17 View commit details
    Browse the repository at this point in the history

  19. Cleanup

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    6f467e4 View commit details
    Browse the repository at this point in the history

  20. Use mesos 0.27.1 by default

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    de4f5b6 View commit details
    Browse the repository at this point in the history

  21. Use Marathon 0.15.3 by default

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    50fdbc7 View commit details
    Browse the repository at this point in the history

  22. Testing with marathon 1.0.0-RC1 and mesos .27

    @Zogg
    Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    dba08f4 View commit details
    Browse the repository at this point in the history

  23. Remove MESOS_ADVERTISE_IP from mesos-agent configuration 

    Setting this environment variable causes the libprocess library that
Mesos uses to overwrite all IP information for a process spawned by
the Mesos agent.
    @ChrisAubuchon @Zogg
    ChrisAubuchon authored and Zogg committed May 27, 2016
    Configuration menu
    Copy the full SHA
    383d7f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. fixes after rebase

    @Zogg
    Zogg committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    5cc276e View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. Merge branch 'master' of github.com:CiscoCloud/microservices-infrastr… 

    …ucture into feature/mkc-combo-working
    @Zogg
    Zogg committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    41c3000 View commit details
    Browse the repository at this point in the history

  2. Calico enabled by default

    @Zogg
    Zogg committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    ddc293c View commit details
    Browse the repository at this point in the history