Skip to content

Commit 2073c90

Browse files
authored
Cert mount fix for AGC (#1518)
* Fix cert mount for AGC * nit * defaulting agc mount to mariner
1 parent a8670cf commit 2073c90

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

kubernetes/linux/main.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -660,33 +660,33 @@ else
660660
echo "LA Onboarding:Workspace Id not mounted, skipping the telemetry check"
661661
fi
662662

663-
# Copying over CA certs for airgapped clouds. This is needed for Mariner vs Ubuntu hosts.
664-
# We are unable to tell if the host is Mariner or Ubuntu,
665-
# so both /anchors/ubuntu and /anchors/mariner are mounted in the yaml.
663+
# Copying over CA certs for airgapped clouds. This is needed for AzureLinux vs Ubuntu hosts.
664+
# We are unable to tell if the host is AzureLinux or Ubuntu,
665+
# so both /anchors/ubuntu and /anchors/mariner (for AzureLinux) are mounted in the yaml.
666666
# One will have the certs and the other will be empty.
667-
# These need to be copied to a different location for Mariner vs Ubuntu containers.
667+
# These need to be copied to a different location for AzureLinux vs Ubuntu containers.
668668
# OS_ID here is the container distro.
669-
# Adding Mariner now even though the elif will never currently evaluate.
669+
# Adding AzureLinux now even though the elif will never currently evaluate.
670670
if [ $CLOUD_ENVIRONMENT == "usnat" ] || [ $CLOUD_ENVIRONMENT == "ussec" ] || [ "$IS_CUSTOM_CERT" == "true" ]; then
671671
OS_ID=$(cat /etc/os-release | grep ^ID= | cut -d '=' -f2 | tr -d '"' | tr -d "'")
672-
if [ $OS_ID == "mariner" ]; then
673-
cp /anchors/ubuntu/* /etc/pki/ca-trust/source/anchors
674-
cp /anchors/mariner/* /etc/pki/ca-trust/source/anchors
675-
if [ -e "/etc/ama-logs-secret/PROXYCERT.crt" ]; then
676-
cp /etc/ama-logs-secret/PROXYCERT.crt /etc/pki/ca-trust/source/PROXYCERT.crt
677-
fi
678-
update-ca-trust
679-
else
680-
if [ $OS_ID != "ubuntu" ]; then
681-
echo "Error: The ID in /etc/os-release is not ubuntu or mariner. Defaulting to ubuntu."
682-
fi
672+
if [ $OS_ID == "ubuntu" ]; then
683673
cp /anchors/ubuntu/* /usr/local/share/ca-certificates/
684674
cp /anchors/mariner/* /usr/local/share/ca-certificates/
685675
if [ -e "/etc/ama-logs-secret/PROXYCERT.crt" ]; then
686676
cp /etc/ama-logs-secret/PROXYCERT.crt /usr/local/share/ca-certificates/PROXYCERT.crt
687677
fi
688678
update-ca-certificates
689679
cp /etc/ssl/certs/ca-certificates.crt /usr/lib/ssl/cert.pem
680+
else
681+
if [ $OS_ID != "azurelinux" ]; then
682+
echo "Error: The ID in /etc/os-release is not ubuntu or azurelinux. Defaulting to azurelinux."
683+
fi
684+
cp /anchors/ubuntu/* /etc/pki/ca-trust/source/anchors
685+
cp /anchors/mariner/* /etc/pki/ca-trust/source/anchors
686+
if [ -e "/etc/ama-logs-secret/PROXYCERT.crt" ]; then
687+
cp /etc/ama-logs-secret/PROXYCERT.crt /etc/pki/ca-trust/source/PROXYCERT.crt
688+
fi
689+
update-ca-trust
690690
fi
691691
fi
692692

0 commit comments

Comments
 (0)