Merge pull request kubernetes#890 from jbeda/godep-cluster-fix

Fix release and salt scripts for godep
mattf · Aug 13, 2014 · e1998e5 · e1998e5
2 parents 9355fae + 70c6c75
commit e1998e5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 86 deletions.
diff --git 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
@@ -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
@@ -24,32 +24,14 @@
       - 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 }}
     - names:
       - 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
@@ -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
@@ -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
@@ -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
-
-