Skip to content

Commit

Permalink
chore: log as events
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Meissner committed Feb 19, 2025
1 parent d61d5ef commit dc7f69d
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 83 deletions.
58 changes: 31 additions & 27 deletions parts/linux/cloud-init/artifacts/secure-tls-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,41 @@ logs_to_events() {
fi
}

if [ -z "$API_SERVER_NAME" ]; then
echo "ERROR: missing apiserver FQDN, cannot continue bootstrapping"
return 1
fi
if [ ! -f "$CLIENT_BINARY_PATH" ]; then
echo "ERROR: bootstrap client binary does not exist at path $CLIENT_BINARY_PATH"
return 1
fi

deadline=$(($(date +%s) + RETRY_PERIOD_SECONDS))
while true; do
now=$(date +%s)
if [ $((now - deadline)) -ge 0 ]; then
echo "ERROR: bootstrapping deadline exceeded"
bootstrap() {
if [ -z "$API_SERVER_NAME" ]; then
echo "ERROR: missing apiserver FQDN, cannot continue bootstrapping"
return 1
fi
if [ ! -f "$CLIENT_BINARY_PATH" ]; then
echo "ERROR: bootstrap client binary does not exist at path $CLIENT_BINARY_PATH"
return 1
fi

$CLIENT_BINARY_PATH \
--aad-resource="$AAD_RESOURCE" \
--apiserver-fqdn="$API_SERVER_NAME" \
--cluster-ca-file="$CLUSTER_CA_FILE_PATH" \
--azure-config="$AZURE_CONFIG_PATH" \
--cert-file="$CLIENT_CERT_PATH" \
--key-file="$CLIENT_KEY_PATH" \
--next-proto="$NEXT_PROTO_VALUE" \
--kubeconfig="$KUBECONFIG_PATH" \
--log-file="$LOG_FILE_PATH"
deadline=$(($(date +%s) + RETRY_PERIOD_SECONDS))
while true; do
now=$(date +%s)
if [ $((now - deadline)) -ge 0 ]; then
echo "ERROR: bootstrapping deadline exceeded"
return 1
fi

[ $? -eq 0 ] && exit 0
$CLIENT_BINARY_PATH \
--aad-resource="$AAD_RESOURCE" \
--apiserver-fqdn="$API_SERVER_NAME" \
--cluster-ca-file="$CLUSTER_CA_FILE_PATH" \
--azure-config="$AZURE_CONFIG_PATH" \
--cert-file="$CLIENT_CERT_PATH" \
--key-file="$CLIENT_KEY_PATH" \
--next-proto="$NEXT_PROTO_VALUE" \
--kubeconfig="$KUBECONFIG_PATH" \
--log-file="$LOG_FILE_PATH"

[ $? -eq 0 ] && exit 0

sleep $RETRY_WAIT_SECONDS
done
}

sleep $RETRY_WAIT_SECONDS
done
logs_to_events "AKS.performSecureTLSBootstrapping" bootstrap

#EOF
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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

- path: /etc/systemd/system/secure-tls-bootstrap.service
permissions: "0644"
Expand Down
58 changes: 31 additions & 27 deletions pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line105.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,41 @@ logs_to_events() {
fi
}

if [ -z "$API_SERVER_NAME" ]; then
echo "ERROR: missing apiserver FQDN, cannot continue bootstrapping"
return 1
fi
if [ ! -f "$CLIENT_BINARY_PATH" ]; then
echo "ERROR: bootstrap client binary does not exist at path $CLIENT_BINARY_PATH"
return 1
fi

deadline=$(($(date +%s) + RETRY_PERIOD_SECONDS))
while true; do
now=$(date +%s)
if [ $((now - deadline)) -ge 0 ]; then
echo "ERROR: bootstrapping deadline exceeded"
bootstrap() {
if [ -z "$API_SERVER_NAME" ]; then
echo "ERROR: missing apiserver FQDN, cannot continue bootstrapping"
return 1
fi
if [ ! -f "$CLIENT_BINARY_PATH" ]; then
echo "ERROR: bootstrap client binary does not exist at path $CLIENT_BINARY_PATH"
return 1
fi

$CLIENT_BINARY_PATH \
--aad-resource="$AAD_RESOURCE" \
--apiserver-fqdn="$API_SERVER_NAME" \
--cluster-ca-file="$CLUSTER_CA_FILE_PATH" \
--azure-config="$AZURE_CONFIG_PATH" \
--cert-file="$CLIENT_CERT_PATH" \
--key-file="$CLIENT_KEY_PATH" \
--next-proto="$NEXT_PROTO_VALUE" \
--kubeconfig="$KUBECONFIG_PATH" \
--log-file="$LOG_FILE_PATH"
deadline=$(($(date +%s) + RETRY_PERIOD_SECONDS))
while true; do
now=$(date +%s)
if [ $((now - deadline)) -ge 0 ]; then
echo "ERROR: bootstrapping deadline exceeded"
return 1
fi

[ $? -eq 0 ] && exit 0
$CLIENT_BINARY_PATH \
--aad-resource="$AAD_RESOURCE" \
--apiserver-fqdn="$API_SERVER_NAME" \
--cluster-ca-file="$CLUSTER_CA_FILE_PATH" \
--azure-config="$AZURE_CONFIG_PATH" \
--cert-file="$CLIENT_CERT_PATH" \
--key-file="$CLIENT_KEY_PATH" \
--next-proto="$NEXT_PROTO_VALUE" \
--kubeconfig="$KUBECONFIG_PATH" \
--log-file="$LOG_FILE_PATH"

[ $? -eq 0 ] && exit 0

sleep $RETRY_WAIT_SECONDS
done
}

sleep $RETRY_WAIT_SECONDS
done
logs_to_events "AKS.performSecureTLSBootstrapping" bootstrap

#EOF
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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

- path: /etc/systemd/system/secure-tls-bootstrap.service
permissions: "0644"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,41 @@ logs_to_events() {
fi
}

if [ -z "$API_SERVER_NAME" ]; then
echo "ERROR: missing apiserver FQDN, cannot continue bootstrapping"
return 1
fi
if [ ! -f "$CLIENT_BINARY_PATH" ]; then
echo "ERROR: bootstrap client binary does not exist at path $CLIENT_BINARY_PATH"
return 1
fi

deadline=$(($(date +%s) + RETRY_PERIOD_SECONDS))
while true; do
now=$(date +%s)
if [ $((now - deadline)) -ge 0 ]; then
echo "ERROR: bootstrapping deadline exceeded"
bootstrap() {
if [ -z "$API_SERVER_NAME" ]; then
echo "ERROR: missing apiserver FQDN, cannot continue bootstrapping"
return 1
fi
if [ ! -f "$CLIENT_BINARY_PATH" ]; then
echo "ERROR: bootstrap client binary does not exist at path $CLIENT_BINARY_PATH"
return 1
fi

$CLIENT_BINARY_PATH \
--aad-resource="$AAD_RESOURCE" \
--apiserver-fqdn="$API_SERVER_NAME" \
--cluster-ca-file="$CLUSTER_CA_FILE_PATH" \
--azure-config="$AZURE_CONFIG_PATH" \
--cert-file="$CLIENT_CERT_PATH" \
--key-file="$CLIENT_KEY_PATH" \
--next-proto="$NEXT_PROTO_VALUE" \
--kubeconfig="$KUBECONFIG_PATH" \
--log-file="$LOG_FILE_PATH"
deadline=$(($(date +%s) + RETRY_PERIOD_SECONDS))
while true; do
now=$(date +%s)
if [ $((now - deadline)) -ge 0 ]; then
echo "ERROR: bootstrapping deadline exceeded"
return 1
fi

[ $? -eq 0 ] && exit 0
$CLIENT_BINARY_PATH \
--aad-resource="$AAD_RESOURCE" \
--apiserver-fqdn="$API_SERVER_NAME" \
--cluster-ca-file="$CLUSTER_CA_FILE_PATH" \
--azure-config="$AZURE_CONFIG_PATH" \
--cert-file="$CLIENT_CERT_PATH" \
--key-file="$CLIENT_KEY_PATH" \
--next-proto="$NEXT_PROTO_VALUE" \
--kubeconfig="$KUBECONFIG_PATH" \
--log-file="$LOG_FILE_PATH"

[ $? -eq 0 ] && exit 0

sleep $RETRY_WAIT_SECONDS
done
}

sleep $RETRY_WAIT_SECONDS
done
logs_to_events "AKS.performSecureTLSBootstrapping" bootstrap

#EOF

0 comments on commit dc7f69d

Please sign in to comment.