From 70c6c75ae3df14f76955738a8b2c5429da1cb209 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Wed, 13 Aug 2014 15:43:34 -0700 Subject: [PATCH] Fix release and salt scripts for godep --- cluster/saltbase/salt/apiserver/init.sls | 20 +------------------ .../saltbase/salt/controller-manager/init.sls | 20 +------------------ cluster/saltbase/salt/kube-proxy/init.sls | 20 +------------------ cluster/saltbase/salt/kubelet/init.sls | 20 +------------------ release/build-release.sh | 8 ++------ release/master-release-install.sh | 4 ---- 6 files changed, 6 insertions(+), 86 deletions(-) diff --git a/cluster/saltbase/salt/apiserver/init.sls b/cluster/saltbase/salt/apiserver/init.sls index 4fac05257bb..cb6ac9b2b6f 100644 --- a/cluster/saltbase/salt/apiserver/init.sls +++ b/cluster/saltbase/salt/apiserver/init.sls @@ -24,24 +24,6 @@ - group - mode -apiserver-third-party-go: - file.recurse: - - name: {{ root }}/src - - source: salt://third-party/go/src - - user: root - {% if grains['os_family'] == 'RedHat' %} - - group: root - {% else %} - - group: staff - {% endif %} - - dir_mode: 775 - - file_mode: 664 - - makedirs: True - - recurse: - - user - - group - - mode - {{ environment_file }}: file.managed: - source: salt://apiserver/default @@ -57,7 +39,7 @@ apiserver-build: - go build {{ package }}/cmd/apiserver - env: - PATH: {{ grains['path'] }}:/usr/local/bin - - GOPATH: {{ root }} + - GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace - require: - file: {{ package_dir }} diff --git a/cluster/saltbase/salt/controller-manager/init.sls b/cluster/saltbase/salt/controller-manager/init.sls index faf8a9d3898..342372c7746 100644 --- a/cluster/saltbase/salt/controller-manager/init.sls +++ b/cluster/saltbase/salt/controller-manager/init.sls @@ -24,24 +24,6 @@ - group - mode -controller-manager-third-party-go: - file.recurse: - - name: {{ root }}/src - - source: salt://third-party/go/src - - user: root - {% if grains['os_family'] == 'RedHat' %} - - group: root - {% else %} - - group: staff - {% endif %} - - dir_mode: 775 - - file_mode: 664 - - makedirs: True - - recurse: - - user - - group - - mode - {{ environment_file }}: file.managed: - source: salt://controller-manager/default @@ -57,7 +39,7 @@ controller-manager-build: - go build {{ package }}/cmd/controller-manager - env: - PATH: {{ grains['path'] }}:/usr/local/bin - - GOPATH: {{ root }} + - GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace - require: - file: {{ package_dir }} diff --git a/cluster/saltbase/salt/kube-proxy/init.sls b/cluster/saltbase/salt/kube-proxy/init.sls index c61034291d9..985264a8a55 100644 --- a/cluster/saltbase/salt/kube-proxy/init.sls +++ b/cluster/saltbase/salt/kube-proxy/init.sls @@ -24,24 +24,6 @@ - group - mode -third-party-go: - file.recurse: - - name: {{ root }}/src - - source: salt://third-party/go/src - - user: root - {% if grains['os_family'] == 'RedHat' %} - - group: root - {% else %} - - group: staff - {% endif %} - - dir_mode: 775 - - file_mode: 664 - - makedirs: True - - recurse: - - user - - group - - mode - kube-proxy-build: cmd.run: - cwd: {{ root }} @@ -49,7 +31,7 @@ kube-proxy-build: - go build {{ package }}/cmd/proxy - env: - PATH: {{ grains['path'] }}:/usr/local/bin - - GOPATH: {{ root }} + - GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace - require: - file: {{ package_dir }} diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls index 9d680063217..41895454b81 100644 --- a/cluster/saltbase/salt/kubelet/init.sls +++ b/cluster/saltbase/salt/kubelet/init.sls @@ -24,24 +24,6 @@ - group - mode -kubelet-third-party-go: - file.recurse: - - name: {{ root }}/src - - source: salt://third-party/go/src - - user: root - {% if grains['os_family'] == 'RedHat' %} - - group: root - {% else %} - - group: staff - {% endif %} - - dir_mode: 775 - - file_mode: 664 - - makedirs: True - - recurse: - - user - - group - - mode - {{ environment_file}}: file.managed: - source: salt://kubelet/default @@ -57,7 +39,7 @@ kubelet-build: - go build {{ package }}/cmd/kubelet - env: - PATH: {{ grains['path'] }}:/usr/local/bin - - GOPATH: {{ root }} + - GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace - require: - file: {{ package_dir }} diff --git a/release/build-release.sh b/release/build-release.sh index 200cd26bd25..198b9c6b443 100755 --- a/release/build-release.sh +++ b/release/build-release.sh @@ -39,7 +39,6 @@ rm -rf $KUBE_DIR/output/release/* MASTER_RELEASE_DIR=$KUBE_DIR/output/release/master-release mkdir -p $MASTER_RELEASE_DIR/bin mkdir -p $MASTER_RELEASE_DIR/src/scripts -mkdir -p $MASTER_RELEASE_DIR/third_party/go echo "Building release tree" cp $KUBE_DIR/release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh @@ -49,17 +48,14 @@ cat << EOF > $MASTER_RELEASE_DIR/src/saltbase/pillar/common.sls instance_prefix: $INSTANCE_PREFIX-minion EOF -cp -r $KUBE_DIR/third_party/src $MASTER_RELEASE_DIR/third_party/go/src - function find_go_files() { find * -not \( \ \( \ - -wholename 'third_party' \ - -o -wholename 'release' \ + -wholename 'release' \ \) -prune \ \) -name '*.go' } -# find_go_files is directory dependant +# find_go_files is directory dependent pushd $KUBE_DIR for f in $(find_go_files); do mkdir -p $MASTER_RELEASE_DIR/src/go/$(dirname ${f}) diff --git a/release/master-release-install.sh b/release/master-release-install.sh index 0f6dcdacdc1..be87e17a838 100755 --- a/release/master-release-install.sh +++ b/release/master-release-install.sh @@ -40,7 +40,3 @@ cp -R --preserve=mode $RELEASE_BASE/src/go/* /srv/salt/controller-manager/go mkdir -p /srv/salt/kubelet/go cp -R --preserve=mode $RELEASE_BASE/src/go/* /srv/salt/kubelet/go -mkdir -p /srv/salt/third-party/go -cp -R --preserve=mode $RELEASE_BASE/third_party/go/* /srv/salt/third-party/go - -