From 50244666ef625c5dd8e450f9f7527f91d7c4b709 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Thu, 8 Feb 2018 15:14:17 -0800 Subject: [PATCH 1/2] Fix minor typo in Changelog for 1.10 --- CHANGELOG-1.10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-1.10.md b/CHANGELOG-1.10.md index 6914da682ec..1aeb06748d5 100644 --- a/CHANGELOG-1.10.md +++ b/CHANGELOG-1.10.md @@ -95,7 +95,7 @@ filename | sha256 hash * CRI: Add a call to reopen log file for a container. ([#58899](https://github.com/kubernetes/kubernetes/pull/58899), [@yujuhong](https://github.com/yujuhong)) * The alpha KubeletConfigFile feature gate has been removed, because it was redundant with the Kubelet's --config flag. It is no longer necessary to set this gate to use the flag. The --config flag is still considered alpha. ([#58978](https://github.com/kubernetes/kubernetes/pull/58978), [@mtaufen](https://github.com/mtaufen)) * `kubectl scale` can now scale any resource (kube, CRD, aggregate) conforming to the standard scale endpoint ([#58298](https://github.com/kubernetes/kubernetes/pull/58298), [@p0lyn0mial](https://github.com/p0lyn0mial)) -* kube-apiserver flag --tls-ca-file has had no effect for some time. It is now deprecated and slated for removal in 1.11. If you are specifying this flag, you must remove it from your launch config before ugprading to 1.11. ([#58968](https://github.com/kubernetes/kubernetes/pull/58968), [@deads2k](https://github.com/deads2k)) +* kube-apiserver flag --tls-ca-file has had no effect for some time. It is now deprecated and slated for removal in 1.11. If you are specifying this flag, you must remove it from your launch config before uprading to 1.11. ([#58968](https://github.com/kubernetes/kubernetes/pull/58968), [@deads2k](https://github.com/deads2k)) * Fix regression in the CRI: do not add a default hostname on short image names ([#58955](https://github.com/kubernetes/kubernetes/pull/58955), [@runcom](https://github.com/runcom)) * Get windows kernel version directly from registry ([#58498](https://github.com/kubernetes/kubernetes/pull/58498), [@feiskyer](https://github.com/feiskyer)) * Remove deprecated --require-kubeconfig flag, remove default --kubeconfig value ([#58367](https://github.com/kubernetes/kubernetes/pull/58367), [@zhangxiaoyu-zidif](https://github.com/zhangxiaoyu-zidif)) From 72b4e17e7231fb4dc62883a79c2999c81b0d4cbd Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Thu, 8 Feb 2018 15:20:13 -0800 Subject: [PATCH 2/2] Fixing minor typos in comments --- CHANGELOG-1.10.md | 2 +- build/copy-output.sh | 2 +- cluster/gce/gci/configure-helper.sh | 2 +- cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py | 2 +- .../layers/kubernetes-master/reactive/kubernetes_master.py | 4 ++-- .../kubernetes-worker/templates/default-http-backend.yaml | 2 +- cluster/restore-from-backup.sh | 2 +- cluster/validate-cluster.sh | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG-1.10.md b/CHANGELOG-1.10.md index 1aeb06748d5..52e7ba668e0 100644 --- a/CHANGELOG-1.10.md +++ b/CHANGELOG-1.10.md @@ -95,7 +95,7 @@ filename | sha256 hash * CRI: Add a call to reopen log file for a container. ([#58899](https://github.com/kubernetes/kubernetes/pull/58899), [@yujuhong](https://github.com/yujuhong)) * The alpha KubeletConfigFile feature gate has been removed, because it was redundant with the Kubelet's --config flag. It is no longer necessary to set this gate to use the flag. The --config flag is still considered alpha. ([#58978](https://github.com/kubernetes/kubernetes/pull/58978), [@mtaufen](https://github.com/mtaufen)) * `kubectl scale` can now scale any resource (kube, CRD, aggregate) conforming to the standard scale endpoint ([#58298](https://github.com/kubernetes/kubernetes/pull/58298), [@p0lyn0mial](https://github.com/p0lyn0mial)) -* kube-apiserver flag --tls-ca-file has had no effect for some time. It is now deprecated and slated for removal in 1.11. If you are specifying this flag, you must remove it from your launch config before uprading to 1.11. ([#58968](https://github.com/kubernetes/kubernetes/pull/58968), [@deads2k](https://github.com/deads2k)) +* kube-apiserver flag --tls-ca-file has had no effect for some time. It is now deprecated and slated for removal in 1.11. If you are specifying this flag, you must remove it from your launch config before upgrading to 1.11. ([#58968](https://github.com/kubernetes/kubernetes/pull/58968), [@deads2k](https://github.com/deads2k)) * Fix regression in the CRI: do not add a default hostname on short image names ([#58955](https://github.com/kubernetes/kubernetes/pull/58955), [@runcom](https://github.com/runcom)) * Get windows kernel version directly from registry ([#58498](https://github.com/kubernetes/kubernetes/pull/58498), [@feiskyer](https://github.com/feiskyer)) * Remove deprecated --require-kubeconfig flag, remove default --kubeconfig value ([#58367](https://github.com/kubernetes/kubernetes/pull/58367), [@zhangxiaoyu-zidif](https://github.com/zhangxiaoyu-zidif)) diff --git a/build/copy-output.sh b/build/copy-output.sh index c4429cfbf04..842cf0a5fbf 100755 --- a/build/copy-output.sh +++ b/build/copy-output.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Copies any built binaries (and other generated files) out of the Docker build contianer. +# Copies any built binaries (and other generated files) out of the Docker build container. set -o errexit set -o nounset set -o pipefail diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index b80d868f261..868f4001a9f 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1934,7 +1934,7 @@ function start-cluster-autoscaler { # # $1: addon category under /etc/kubernetes # $2: manifest source dir -# $3: (optional) auxilary manifest source dir +# $3: (optional) auxiliary manifest source dir function setup-addon-manifests { local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty" local -r dst_dir="/etc/kubernetes/$1/$2" diff --git a/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py b/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py index 0cede674399..c573ef78eb3 100644 --- a/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py +++ b/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py @@ -48,7 +48,7 @@ def report_status(): def messaging(): - ''' Probe our relations to determine the propper messaging to the + ''' Probe our relations to determine the proper messaging to the end user ''' missing_services = [] diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index c5becf00c9f..45c88dbc0ff 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -463,7 +463,7 @@ def start_master(etcd): def etcd_data_change(etcd): ''' Etcd scale events block master reconfiguration due to the kubernetes-master.components.started state. We need a way to - handle these events consistenly only when the number of etcd + handle these events consistently only when the number of etcd units has actually changed ''' # key off of the connection string @@ -1169,7 +1169,7 @@ def configure_controller_manager(): layer_options = layer.options('tls-client') ca_cert_path = layer_options.get('ca_certificate_path') - # Default to 3 minute resync. TODO: Make this configureable? + # Default to 3 minute resync. TODO: Make this configurable? controller_opts['min-resync-period'] = '3m' controller_opts['v'] = '2' controller_opts['root-ca-file'] = ca_cert_path diff --git a/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml b/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml index 91b800ab753..dbef52093c3 100644 --- a/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml +++ b/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml @@ -14,7 +14,7 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: default-http-backend - # Any image is permissable as long as: + # Any image is permissible as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint image: {{ defaultbackend_image }} diff --git a/cluster/restore-from-backup.sh b/cluster/restore-from-backup.sh index d4283fcef1f..1ef4d861952 100755 --- a/cluster/restore-from-backup.sh +++ b/cluster/restore-from-backup.sh @@ -217,7 +217,7 @@ mkdir -p "${MNT_DISK}/var/etcd-corrupted" echo "Saving corrupted data to ${MNT_DISK}/var/etcd-corrupted" mv /var/etcd/data "${MNT_DISK}/var/etcd-corrupted" -# Replace the corrupted data dir with the resotred data. +# Replace the corrupted data dir with the restored data. echo "Copying restored data to /var/etcd/data" mv "${BACKUP_DIR}" /var/etcd/data diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh index 77e2755c0d0..ec495069fe8 100755 --- a/cluster/validate-cluster.sh +++ b/cluster/validate-cluster.sh @@ -97,7 +97,7 @@ while true; do # available and then get restarted as the kubelet configures the docker bridge. # # We are assigning the result of kubectl_retry get nodes operation to the res - # varaible in that way, to prevent stopping the whole script on an error. + # variable in that way, to prevent stopping the whole script on an error. node=$(kubectl_retry get nodes) && res="$?" || res="$?" if [ "${res}" -ne "0" ]; then if [[ "${attempt}" -gt "${last_run:-$MAX_ATTEMPTS}" ]]; then