Merge pull request #5698 from nojnhuh/e2e-storage-account-name

Use more entropy for random WI storage account names

Author: k8s-ci-robot

Makefile

@@ -200,7 +200,7 @@ LDFLAGS := $(shell hack/version.sh)
 CLUSTER_TEMPLATE ?= cluster-template.yaml
 
 export KIND_CLUSTER_NAME ?= capz
-export RANDOM_SUFFIX := $(shell /bin/bash -c "echo $$RANDOM")
+export RANDOM_SUFFIX := $(shell od -An -N8 -tx8 /dev/urandom | tr -d ' ' | head -c 16)
 export AZWI_RESOURCE_GROUP ?= capz-wi-$(RANDOM_SUFFIX)
 export CI_RG ?= $(AZWI_RESOURCE_GROUP)
 export USER_IDENTITY ?= $(addsuffix $(RANDOM_SUFFIX),$(CI_RG))

scripts/kind-with-registry.sh

@@ -45,8 +45,8 @@ if [ -f "$TILT_SETTINGS_FILE" ]; then
 fi
 
 AZWI_ENABLED="${AZWI_ENABLED:-true}"
-RANDOM_SUFFIX="${RANDOM_SUFFIX:-$(od -An -N4 -tu4 /dev/urandom | tr -d ' ' | head -c 8)}"
-export AZWI_STORAGE_ACCOUNT="capzcioidcissuer${RANDOM_SUFFIX}"
+RANDOM_SUFFIX="${RANDOM_SUFFIX:-$(od -An -N8 -tx8 /dev/urandom | tr -d ' ' | head -c 16)}"
+export AZWI_STORAGE_ACCOUNT="capzoidc${RANDOM_SUFFIX}"
 export AZWI_STORAGE_CONTAINER="\$web"
 export AZWI_LOCATION="${AZURE_LOCATION:-southcentralus}"
 export SERVICE_ACCOUNT_ISSUER="${SERVICE_ACCOUNT_ISSUER:-}"