Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07d7f02720 | ||
|
|
6322ebd30f |
+2
-1
@@ -9,4 +9,5 @@ CLEAN_CONTAINERS=false
|
||||
SYSTEM_PRUNE=false
|
||||
WEBAPP_IMAGE_PRUNE=true
|
||||
CHECK_INTERVAL=5
|
||||
FQDN_POLICY="allow"
|
||||
FQDN_POLICY="allow"
|
||||
DEPLOYMENT_IP="k8s.cluster.ip.address"
|
||||
@@ -25,6 +25,11 @@ if [ -z "$DEPLOYMENT_RECORD_NAMESPACE" ]; then
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if [ "$FQDN_POLICY" = "allow" ] && [ -z "$DEPLOYMENT_IP" ]; then
|
||||
echo "DEPLOYMENT_IP is required with 'allow' FQDN_POLICY"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if [ -z "$IMAGE_REGISTRY" ]; then
|
||||
echo "IMAGE_REGISTRY is required."
|
||||
exit 2
|
||||
@@ -160,6 +165,7 @@ while true; do
|
||||
--include-tags "$INCLUDE_TAGS" \
|
||||
--exclude-tags "$EXCLUDE_TAGS" \
|
||||
--fqdn-policy "${FQDN_POLICY:-prohibit}" \
|
||||
--ip "${DEPLOYMENT_IP}" \
|
||||
--lrn "$LRN" \
|
||||
--min-required-payment ${MIN_REQUIRED_PAYMENT:-0} \
|
||||
--config-upload-dir "$UPLOAD_DIRECTORY" \
|
||||
|
||||
+3
-1
@@ -159,7 +159,9 @@ export class RegHelper {
|
||||
}
|
||||
|
||||
status.app = r.attributes.application;
|
||||
const hostname = r.attributes.dns ?? generateHostnameForApp(app);
|
||||
|
||||
const dnsList: string[] = r.attributes.dns ? r.attributes.dns.split(",") : [];
|
||||
const hostname = dnsList.length ? dnsList[dnsList.length - 1] : generateHostnameForApp(app);
|
||||
|
||||
if (deploymentsByRequest.has(r.id)) {
|
||||
const deployment = deploymentsByRequest.get(r.id);
|
||||
|
||||
Reference in New Issue
Block a user