search

brooklyncentral / clocker

Apache Brooklyn cloud native infrastructure blueprints
Apache License 2.0
428 stars 66 forks source link

Updated k8s version & added prometheus (re-work) #346

Closed m4rkmckenna closed 8 years ago

m4rkmckenna commented 8 years ago

Reworked from #329 @grkvlt

Updated k8s version & added prometheus

Ommited artifact renaming / invalid classpaths

grkvlt commented 8 years ago

Missing other pom.xml changes from #329

m4rkmckenna commented 8 years ago

@grkvlt The pom changes have nothing to with the version bump or the addition of prometheus

This should be in a separate PR

drigodwin commented 8 years ago

Looks good & tested on Karaf/Classic on GCE and AWS

aledsage commented 8 years ago

I've been through it all, comparing it closely with the changes made in https://github.com/brooklyncentral/clocker/pull/329 (which @grkvlt, @andreaturli and @mikezaccardo have tested I believe). It all looks really good. I've added a few very minor comments/questions.

There are two things I'd definitely like addressed or answered before merging:

  1. the version should be 2.1.0-SNAPSHOT
  2. why change hostname-override from HOST_SUBNET_ADDRESS to HOST_ADDRESS?
aledsage commented 8 years ago

Also @m4rkmckenna I see this branch now has merge conflicts that will need to be resolved, before we can hit the merge button.

m4rkmckenna commented 8 years ago

@aledsage

  1. Updated versions in dfdb140
  2. Replied to original comment

We had to swap the ip that the kubelet bound to as the "external" ip wouldnt resolve.

See here

aledsage commented 8 years ago

LGTM - merging now.