github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Review update

Browse Source 
Signed-off-by: Joakim Roubert <joakim.roubert@axis.com>
This commit is contained in:
Joakim Roubert 2020-06-25 08:27:24 +02:00 committed by Joakim Roubert
parent 605be2216b
commit b529485f65
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/gce/gci/configure-helper.sh
View File

@ -393,7 +393,7 @@ function ensure-local-ssds() {
for ssd in /dev/disk/by-id/google-local-ssd-*; do for ssd in /dev/disk/by-id/google-local-ssd-*; do
if [ -e "${ssd}" ]; then if [ -e "${ssd}" ]; then
local devicenum local devicenum
devicenum="${ssd##*google-local-ssd-}" devicenum=$(echo "${ssd}" | sed -e 's/\/dev\/disk\/by-id\/google-local-ssd-\([0-9]*\)/\1/')
if [[ "${i}" -lt "${scsiblocknum}" ]]; then if [[ "${i}" -lt "${scsiblocknum}" ]]; then
mount-ext "${ssd}" "${devicenum}" "scsi" "block" mount-ext "${ssd}" "${devicenum}" "scsi" "block"
else else
@ -424,7 +424,7 @@ function ensure-local-ssds() {
# the existing Google images does not expose NVMe devices in /dev/disk/by-id # the existing Google images does not expose NVMe devices in /dev/disk/by-id
if [[ $(udevadm info --query=property --name="${ssd}" | grep DEVTYPE | sed "s/DEVTYPE=//") == "disk" ]]; then if [[ $(udevadm info --query=property --name="${ssd}" | grep DEVTYPE | sed "s/DEVTYPE=//") == "disk" ]]; then
local devicenum local devicenum
devicenum="${ssd##*nvme0n}" devicenum=$(echo "${ssd}" | sed -e 's/\/dev\/nvme0n\([0-9]*\)/\1/')
if [[ "${i}" -lt "${nvmeblocknum}" ]]; then if [[ "${i}" -lt "${nvmeblocknum}" ]]; then
mount-ext "${ssd}" "${devicenum}" "nvme" "block" mount-ext "${ssd}" "${devicenum}" "nvme" "block"
else else
@ -1802,7 +1802,7 @@ function compute-master-manifest-variables {
FLEXVOLUME_HOSTPATH_VOLUME="{ \"name\": \"flexvolumedir\", \"hostPath\": {\"path\": \"${VOLUME_PLUGIN_DIR}\"}}," FLEXVOLUME_HOSTPATH_VOLUME="{ \"name\": \"flexvolumedir\", \"hostPath\": {\"path\": \"${VOLUME_PLUGIN_DIR}\"}},"
fi fi
INSECURE_PORT_MAPPING='' INSECURE_PORT_MAPPING=""
if [[ "${ENABLE_APISERVER_INSECURE_PORT:-false}" == "true" ]]; then if [[ "${ENABLE_APISERVER_INSECURE_PORT:-false}" == "true" ]]; then
# INSECURE_PORT_MAPPING is used by sed # INSECURE_PORT_MAPPING is used by sed
# shellcheck disable=SC2089 # shellcheck disable=SC2089
@ -2664,7 +2664,7 @@ function reset-motd {
# or the git hash that's in the build info. # or the git hash that's in the build info.
local gitref local gitref
gitref="$(echo "${version}" | sed -r "s/(v[0-9]+\.[0-9]+\.[0-9]+)(-[a-z]+\.[0-9]+)?.*/\1\2/g")" gitref="$(echo "${version}" | sed -r "s/(v[0-9]+\.[0-9]+\.[0-9]+)(-[a-z]+\.[0-9]+)?.*/\1\2/g")"
local devel='' local devel=""
if [[ "${gitref}" != "${version}" ]]; then if [[ "${gitref}" != "${version}" ]]; then
devel=" devel="
Note: This looks like a development version, which might not be present on GitHub. Note: This looks like a development version, which might not be present on GitHub.