systemd: ocp-userpasswords: syntax improvements

Author: kpouget

systemd/ocp-userpasswords.sh

@@ -11,15 +11,13 @@ export KUBECONFIG="/opt/kubeconfig"
 
 function gen_htpasswd() {
     if [ -z "${1:-}" ] || [ -z "${2:-}" ]; then
-        echo "gen_htpasswd needs two arguments: username password" 1>&2
+        echo "gen_htpasswd needs to arguments: username password" >&2
         return 1
     fi
 
-    podman run --rm docker.io/xmartlabs/htpasswd "$1" "$2"
+    podman run --rm registry.access.redhat.com/ubi10/httpd-24 htpasswd -nb "$1" "$2"
 }
 
-wait_for_resource secret
-
 if [ ! -f /opt/crc/pass_developer ]; then
     echo "developer password does not exist"
     exit 1
@@ -30,20 +28,22 @@ if [ ! -f /opt/crc/pass_kubeadmin ]; then
     exit 1
 fi
 
-echo "generating the kubeadmin and developer passwords ..."
+wait_for_resource_or_die secret
 
-set +x # /!\ disable the logging to avoid leaking the passwords
+echo "generating the kubeadmin and developer passwords ..."
+set +x # disable the logging to avoid leaking the passwords
 
 dev_pass=$(gen_htpasswd developer "$(cat /opt/crc/pass_developer)")
 adm_pass=$(gen_htpasswd kubeadmin "$(cat /opt/crc/pass_kubeadmin)")
 
 echo "creating the password secret ..."
-# use bash <() to use a temporary fd file
-# use sed to remove the empty lines
+# use bash "<()" to use a temporary fd file (safer to handle secrets)
 oc create secret generic htpass-secret  \
    --from-file=htpasswd=<(printf '%s\n%s\n' "$dev_pass" "$adm_pass") \
    -n openshift-config \
    --dry-run=client -oyaml \
     | oc apply -f-
 
-echo "all done"
+echo "All done"
+
+exit 0