Propagate version info into salt config and use to build.

Fixes #1043.
This commit is contained in:
Joe Beda
2014-08-26 16:00:34 -07:00
parent 169e6f079a
commit 5722eba780
7 changed files with 27 additions and 5 deletions

View File

@@ -1,6 +1,7 @@
{% set root = '/var/src/apiserver' %}
{% set package = 'github.com/GoogleCloudPlatform/kubernetes' %}
{% set package_dir = root + '/src/' + package %}
{% set go_opt = pillar['go_opt'] %}
{% if grains['os_family'] == 'RedHat' %}
{% set environment_file = '/etc/sysconfig/apiserver' %}
{% else %}
@@ -36,7 +37,7 @@ apiserver-build:
cmd.run:
- cwd: {{ root }}
- names:
- go build {{ package }}/cmd/apiserver
- go build {{ go_opt }} {{ package }}/cmd/apiserver
- env:
- PATH: {{ grains['path'] }}:/usr/local/bin
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace

View File

@@ -1,6 +1,7 @@
{% set root = '/var/src/controller-manager' %}
{% set package = 'github.com/GoogleCloudPlatform/kubernetes' %}
{% set package_dir = root + '/src/' + package %}
{% set go_opt = pillar['go_opt'] %}
{% if grains['os_family'] == 'RedHat' %}
{% set environment_file = '/etc/sysconfig/controller-manager' %}
{% else %}
@@ -36,7 +37,7 @@ controller-manager-build:
cmd.run:
- cwd: {{ root }}
- names:
- go build {{ package }}/cmd/controller-manager
- go build {{ go_opt }} {{ package }}/cmd/controller-manager
- env:
- PATH: {{ grains['path'] }}:/usr/local/bin
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace

View File

@@ -1,6 +1,7 @@
{% set root = '/var/src/kube-proxy' %}
{% set package = 'github.com/GoogleCloudPlatform/kubernetes' %}
{% set package_dir = root + '/src/' + package %}
{% set go_opt = pillar['go_opt'] %}
{% if grains['os_family'] == 'RedHat' %}
{% set environment_file = '/etc/sysconfig/kube-proxy' %}
{% else %}
@@ -28,7 +29,7 @@ kube-proxy-build:
cmd.run:
- cwd: {{ root }}
- names:
- go build {{ package }}/cmd/proxy
- go build {{ go_opt }} {{ package }}/cmd/proxy
- env:
- PATH: {{ grains['path'] }}:/usr/local/bin
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace

View File

@@ -1,6 +1,7 @@
{% set root = '/var/src/kubelet' %}
{% set package = 'github.com/GoogleCloudPlatform/kubernetes' %}
{% set package_dir = root + '/src/' + package %}
{% set go_opt = pillar['go_opt'] %}
{% if grains['os_family'] == 'RedHat' %}
{% set environment_file = '/etc/sysconfig/kubelet' %}
{% else %}
@@ -36,7 +37,7 @@ kubelet-build:
cmd.run:
- cwd: {{ root }}
- names:
- go build {{ package }}/cmd/kubelet
- go build {{ go_opt }} {{ package }}/cmd/kubelet
- env:
- PATH: {{ grains['path'] }}:/usr/local/bin
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace

View File

@@ -1,6 +1,7 @@
{% set root = '/var/src/scheduler' %}
{% set package = 'github.com/GoogleCloudPlatform/kubernetes' %}
{% set package_dir = root + '/src/' + package %}
{% set go_opt = pillar['go_opt'] %}
{% if grains['os_family'] == 'RedHat' %}
{% set environment_file = '/etc/sysconfig/scheduler' %}
{% else %}
@@ -36,7 +37,7 @@ scheduler-build:
cmd.run:
- cwd: {{ root }}
- names:
- go build {{ package }}/plugin/cmd/scheduler
- go build {{ go_opt }} {{ package }}/plugin/cmd/scheduler
- env:
- PATH: {{ grains['path'] }}:/usr/local/bin
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace