mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-06 11:42:14 +00:00
Rename output/
directory to _output/
go build ./... will ignore any directory starting with an underscore.
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
source $(dirname $0)/kube-env.sh
|
||||
source $(dirname $0)/$KUBERNETES_PROVIDER/util.sh
|
||||
|
||||
CLOUDCFG=$(dirname $0)/../output/go/bin/kubecfg
|
||||
CLOUDCFG=$(dirname $0)/../_output/go/bin/kubecfg
|
||||
if [ ! -x $CLOUDCFG ]; then
|
||||
echo "Could not find kubecfg binary. Run hack/build-go.sh to build it."
|
||||
exit 1
|
||||
|
@@ -49,7 +49,7 @@ EOF
|
||||
cat <<EOF >/etc/salt/master.d/salt-output.conf
|
||||
# Minimize the amount of output to terminal
|
||||
state_verbose: False
|
||||
state_output: mixed
|
||||
state_output: mixed
|
||||
EOF
|
||||
|
||||
# Configure nginx authorization
|
||||
@@ -83,8 +83,8 @@ EOF
|
||||
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -M
|
||||
|
||||
# Install salt-api
|
||||
#
|
||||
# This is used to inform the cloud provider used in the vagrant cluster
|
||||
#
|
||||
# This is used to inform the cloud provider used in the vagrant cluster
|
||||
yum install -y salt-api
|
||||
systemctl enable salt-api
|
||||
systemctl start salt-api
|
||||
@@ -98,7 +98,7 @@ pushd /vagrant
|
||||
popd
|
||||
|
||||
echo "Running release install script"
|
||||
pushd /vagrant/output/release/master-release/src/scripts
|
||||
pushd /vagrant/_output/release/master-release/src/scripts
|
||||
./master-release-install.sh
|
||||
popd
|
||||
|
||||
|
@@ -180,7 +180,7 @@ function kube-up {
|
||||
govc guest.upload \
|
||||
-vm ${MASTER_NAME} \
|
||||
-f \
|
||||
./output/release/master-release.tgz \
|
||||
./_output/release/master-release.tgz \
|
||||
/home/kube/master-release.tgz
|
||||
|
||||
# Kickstart start script
|
||||
@@ -248,7 +248,7 @@ function kube-push {
|
||||
govc guest.upload \
|
||||
-vm ${MASTER_NAME} \
|
||||
-f \
|
||||
./output/release/master-release.tgz \
|
||||
./_output/release/master-release.tgz \
|
||||
/home/kube/master-release.tgz
|
||||
|
||||
(
|
||||
|
Reference in New Issue
Block a user