github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/cluster
History
Kubernetes Submit Queue af8124c7bf Merge pull request #31609 from rhcarvalho/fix-bash 
Automatic merge from submit-queue

Fix Bash script

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**: `cluster/mesos/docker/socat/build.sh` had two lines mixed together.

Old command output:

```
$ ./cluster/mesos/docker/socat/build.sh 
./cluster/mesos/docker/socat/build.sh: line 21: set: pipefailscript_dir=/home/rodolfo/src/k8s.io/kubernetes/cluster/mesos/docker/socat: invalid option name
```

**Special notes for your reviewer**: probably nobody is using that script? @sttts PTAL.

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
NONE
```
 		2016-09-05 18:10:24 -07:00
..
addons Merge pull request #31518 from bryk/release-v1.4.0-beta1 2016-09-02 09:50:09 -07:00
aws AWS: Fix unbound SSH_CIDR 2016-08-29 19:12:16 -07:00
azure azure kube-up respects AZURE_RESOURCE_GROUP 2016-07-08 11:59:32 -07:00
azure-legacy [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
centos Revert "Remove deprecated Namespace admission plug-ins" 2016-08-28 10:20:44 -07:00
gce Merge pull request #31294 from mml/federated-oops 2016-09-05 13:01:12 -07:00
gke cluster/gke: reword package docs 2016-08-14 22:12:51 +03:00
images Merge pull request #31242 from wojtek-t/attach_ttls 2016-08-29 12:57:57 -07:00
juju Fixes the master messaging 2016-09-02 16:57:07 -05:00
kubemark Allow for configuring max inflight requests in kubemark 2016-09-01 11:46:37 +02:00
lib Add a verbosity concept to kubernetes scripts 2016-08-04 22:01:22 -07:00
libvirt-coreos [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
local Fix running e2e against local cluster 2016-08-29 17:16:13 -04:00
mesos/docker Fix Bash script 2016-08-29 14:01:44 +02:00
openstack-heat [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
ovirt
…
photon-controller [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
rackspace Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
saltbase Bump ClusterAutoscaler to 0.3.0-beta6 2016-09-02 22:15:35 +02:00
skeleton Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
ubuntu [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
vagrant [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
vsphere [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
OWNERS Remove myself from a bunch of OWNERS files, as I am too overloaded 2016-05-11 13:34:51 -07:00
README.md add maintenance notice to cluster/README 2016-06-13 11:47:30 -07:00
common.sh fix feature_gates salt plumbing 2016-08-25 17:34:41 -07:00
get-kube-local.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
get-kube.sh Merge pull request #25473 from andreykurilin/get_kube 2016-07-05 11:27:47 -07:00
kube-down.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
kube-push.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
kube-up.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
kube-util.sh Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set 2016-07-11 18:43:37 +02:00
kubectl.sh Make releases work 2016-07-12 21:52:54 -07:00
log-dump.sh Store startupscript from GKE clusters too 2016-09-01 13:48:50 +02:00
options.md
…
test-e2e.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
test-network.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
test-smoke.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-storage-objects.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
validate-cluster.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00

README.md

Cluster Configuration

Deprecation Notice: This directory has entered maintainence mode and will not be accepting new providers. Please submit new automation deployments to kube-deploy. Deployments in this directory will continue to be maintained and supported at their current level of support.

The scripts and data in this directory automate creation and configuration of a Kubernetes cluster, including networking, DNS, nodes, and master components.

See the getting-started guides for examples of how to use the scripts.

cloudprovider/config-default.sh contains a set of tweakable definitions/parameters for the cluster.

The heavy lifting of configuring the VMs is done by SaltStack.

Analytics