Support persistent custom Admiral configurations #1880
Conversation
Updating fork to 1.3.1
Appending the registry integration URL to the config.properties instead of overwriting custom.config
| @@ -82,6 +79,9 @@ cp $data_dir/custom.conf $config_dir/config.properties | |||
| cp $admiral_psc_dir/psc-config.keystore $config_dir | |||
| cp $admiral_psc_dir/psc-config.properties $config_dir | |||
|
|
|||
| # Configure the integration URL | |||
| echo "harbor.tab.url=https://${HOSTNAME}:${REGISTRY_PORT}" >> $config_dir/config.properties | |||
There was a problem hiding this comment.
It seems like this will append a new line each time the service is started. When testing the change, did you try restarting the OVA a few times to see what happens?
There was a problem hiding this comment.
I think "$config_dir/config.properties" is newly created each time from "cp $data_dir/custom.conf $config_dir/config.properties". I thought I tested a few reboots but I will have to double check again.
There was a problem hiding this comment.
@zjs On VIC 1.4.3 I rebooted a few times and didn't see any duplicate entries.
There was a problem hiding this comment.
Can you rebase this patch and move below proxy setting after this line?
if [ -n "${NETWORK_HTTPS_PROXY}" ]; then
echo "registry.proxy=${NETWORK_HTTPS_PROXY}" >> $data_dir/custom.conf
elif [ -n "${NETWORK_HTTP_PROXY}" ]; then
echo "registry.proxy=${NETWORK_HTTP_PROXY}" >> $data_dir/custom.conf
fi
if [ -n "${NETWORK_NO_PROXY_LIST}" ]; then
echo "registry.no.proxy.list=${NETWORK_NO_PROXY_LIST}" >> $data_dir/custom.conf
fi
Changing the custom.conf from being overwritten each time the configure_admiral.sh script runs. Sets custom.conf to be an empty text file by default for users to modify as needed to add custom configurations.
https://ikb.vmware.com/s/article/52332 currently has internal workaround for applying the changes manually.
VIC Appliance Checklist:
masterbranchIf this is a feature or change to existing functionality, consider areas of impact with the Impact
Assessment Checklist
Related #2391