mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Fix release and salt scripts for godep
This commit is contained in:
parent
9355fae71e
commit
70c6c75ae3
@ -24,24 +24,6 @@
|
|||||||
- group
|
- group
|
||||||
- mode
|
- 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 }}:
|
{{ environment_file }}:
|
||||||
file.managed:
|
file.managed:
|
||||||
- source: salt://apiserver/default
|
- source: salt://apiserver/default
|
||||||
@ -57,7 +39,7 @@ apiserver-build:
|
|||||||
- go build {{ package }}/cmd/apiserver
|
- go build {{ package }}/cmd/apiserver
|
||||||
- env:
|
- env:
|
||||||
- PATH: {{ grains['path'] }}:/usr/local/bin
|
- PATH: {{ grains['path'] }}:/usr/local/bin
|
||||||
- GOPATH: {{ root }}
|
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace
|
||||||
- require:
|
- require:
|
||||||
- file: {{ package_dir }}
|
- file: {{ package_dir }}
|
||||||
|
|
||||||
|
@ -24,24 +24,6 @@
|
|||||||
- group
|
- group
|
||||||
- mode
|
- 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 }}:
|
{{ environment_file }}:
|
||||||
file.managed:
|
file.managed:
|
||||||
- source: salt://controller-manager/default
|
- source: salt://controller-manager/default
|
||||||
@ -57,7 +39,7 @@ controller-manager-build:
|
|||||||
- go build {{ package }}/cmd/controller-manager
|
- go build {{ package }}/cmd/controller-manager
|
||||||
- env:
|
- env:
|
||||||
- PATH: {{ grains['path'] }}:/usr/local/bin
|
- PATH: {{ grains['path'] }}:/usr/local/bin
|
||||||
- GOPATH: {{ root }}
|
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace
|
||||||
- require:
|
- require:
|
||||||
- file: {{ package_dir }}
|
- file: {{ package_dir }}
|
||||||
|
|
||||||
|
@ -24,24 +24,6 @@
|
|||||||
- group
|
- group
|
||||||
- mode
|
- 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:
|
kube-proxy-build:
|
||||||
cmd.run:
|
cmd.run:
|
||||||
- cwd: {{ root }}
|
- cwd: {{ root }}
|
||||||
@ -49,7 +31,7 @@ kube-proxy-build:
|
|||||||
- go build {{ package }}/cmd/proxy
|
- go build {{ package }}/cmd/proxy
|
||||||
- env:
|
- env:
|
||||||
- PATH: {{ grains['path'] }}:/usr/local/bin
|
- PATH: {{ grains['path'] }}:/usr/local/bin
|
||||||
- GOPATH: {{ root }}
|
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace
|
||||||
- require:
|
- require:
|
||||||
- file: {{ package_dir }}
|
- file: {{ package_dir }}
|
||||||
|
|
||||||
|
@ -24,24 +24,6 @@
|
|||||||
- group
|
- group
|
||||||
- mode
|
- 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}}:
|
{{ environment_file}}:
|
||||||
file.managed:
|
file.managed:
|
||||||
- source: salt://kubelet/default
|
- source: salt://kubelet/default
|
||||||
@ -57,7 +39,7 @@ kubelet-build:
|
|||||||
- go build {{ package }}/cmd/kubelet
|
- go build {{ package }}/cmd/kubelet
|
||||||
- env:
|
- env:
|
||||||
- PATH: {{ grains['path'] }}:/usr/local/bin
|
- PATH: {{ grains['path'] }}:/usr/local/bin
|
||||||
- GOPATH: {{ root }}
|
- GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace
|
||||||
- require:
|
- require:
|
||||||
- file: {{ package_dir }}
|
- file: {{ package_dir }}
|
||||||
|
|
||||||
|
@ -39,7 +39,6 @@ rm -rf $KUBE_DIR/output/release/*
|
|||||||
MASTER_RELEASE_DIR=$KUBE_DIR/output/release/master-release
|
MASTER_RELEASE_DIR=$KUBE_DIR/output/release/master-release
|
||||||
mkdir -p $MASTER_RELEASE_DIR/bin
|
mkdir -p $MASTER_RELEASE_DIR/bin
|
||||||
mkdir -p $MASTER_RELEASE_DIR/src/scripts
|
mkdir -p $MASTER_RELEASE_DIR/src/scripts
|
||||||
mkdir -p $MASTER_RELEASE_DIR/third_party/go
|
|
||||||
|
|
||||||
echo "Building release tree"
|
echo "Building release tree"
|
||||||
cp $KUBE_DIR/release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh
|
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
|
instance_prefix: $INSTANCE_PREFIX-minion
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cp -r $KUBE_DIR/third_party/src $MASTER_RELEASE_DIR/third_party/go/src
|
|
||||||
|
|
||||||
function find_go_files() {
|
function find_go_files() {
|
||||||
find * -not \( \
|
find * -not \( \
|
||||||
\( \
|
\( \
|
||||||
-wholename 'third_party' \
|
-wholename 'release' \
|
||||||
-o -wholename 'release' \
|
|
||||||
\) -prune \
|
\) -prune \
|
||||||
\) -name '*.go'
|
\) -name '*.go'
|
||||||
}
|
}
|
||||||
# find_go_files is directory dependant
|
# find_go_files is directory dependent
|
||||||
pushd $KUBE_DIR
|
pushd $KUBE_DIR
|
||||||
for f in $(find_go_files); do
|
for f in $(find_go_files); do
|
||||||
mkdir -p $MASTER_RELEASE_DIR/src/go/$(dirname ${f})
|
mkdir -p $MASTER_RELEASE_DIR/src/go/$(dirname ${f})
|
||||||
|
@ -40,7 +40,3 @@ cp -R --preserve=mode $RELEASE_BASE/src/go/* /srv/salt/controller-manager/go
|
|||||||
mkdir -p /srv/salt/kubelet/go
|
mkdir -p /srv/salt/kubelet/go
|
||||||
cp -R --preserve=mode $RELEASE_BASE/src/go/* /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
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user