Merge pull request #17577 from hakman/simplify-nodeup-template

nodeup: Simplify the template by removing split-commas

Author: k8s-ci-robot

pkg/model/resources/nodeup.go

@@ -74,7 +74,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -125,10 +125,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

pkg/model/tests/data/bootstrapscript_0.txt

@@ -52,7 +52,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -103,10 +103,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

pkg/model/tests/data/bootstrapscript_1.txt

@@ -52,7 +52,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -103,10 +103,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

pkg/model/tests/data/bootstrapscript_2.txt

@@ -52,7 +52,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -103,10 +103,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

pkg/model/tests/data/bootstrapscript_3.txt

@@ -52,7 +52,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -103,10 +103,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

pkg/model/tests/data/bootstrapscript_4.txt

@@ -52,7 +52,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -103,10 +103,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

pkg/model/tests/data/bootstrapscript_5.txt

@@ -52,7 +52,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -103,10 +103,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data

@@ -36,7 +36,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -87,10 +87,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data

@@ -36,7 +36,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -87,10 +87,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)

tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data

@@ -36,7 +36,7 @@ download-or-bust() {
   local -r file="$1"
   local -r hash="$2"
   local -a urls
-  mapfile -t urls < <(split-commas "$3")
+  IFS=, read -r -a urls <<< "$3"
 
   if [[ -f "${file}" ]]; then
     if ! validate-hash "${file}" "${hash}"; then
@@ -87,10 +87,6 @@ validate-hash() {
   fi
 }
 
-function split-commas() {
-  echo "$1" | tr "," "\n"
-}
-
 function download-release() {
   case "$(uname -m)" in
   x86_64*|i?86_64*|amd64*)