Skip to content

proxy support (for non-aks) #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ganga1980 merged 20 commits into from
Oct 8, 2021
Merged

proxy support (for non-aks) #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cacf15a
changes related to aad msi auth feature
ganga1980 Jun 14, 2021
679038b
use existing envvars
ganga1980 Jun 14, 2021
b0730e8
fix imds token expiry interval
ganga1980 Jun 14, 2021
43208aa
initial proxy support
daweim0 Jul 9, 2021
58d9737
Merge branch 'ci_dev' of github.com:microsoft/Docker-Provider into da…
daweim0 Jul 9, 2021
bdcfca8
Merge branch 'ci_dev' of github.com:microsoft/Docker-Provider into da…
daweim0 Jul 19, 2021
eb99c30
merge?
daweim0 Jul 19, 2021
c239ff2
cleaning up some files which should've merged differently
daweim0 Jul 19, 2021
16cba94
proxy should be working, but most tables don't have any data. About t…
daweim0 Aug 28, 2021
a85bddb
Merge branch 'ci_dev' of github.com:microsoft/Docker-Provider into da…
daweim0 Aug 28, 2021
fd5b5d7
linux AMA proxy works
daweim0 Aug 31, 2021
571ad49
Merge branch 'ci_dev' of github.com:microsoft/Docker-Provider into da…
daweim0 Sep 13, 2021
e09ffab
about to merge
daweim0 Oct 1, 2021
9033b19
Merge branch 'ci_dev' of github.com:microsoft/Docker-Provider into da…
daweim0 Oct 1, 2021
c610b8c
proxy support appears to be working, final mdsd build location will s…
daweim0 Oct 7, 2021
9682796
removing some unnecessary changes
daweim0 Oct 7, 2021
a4149a0
forgot to remove one last change
daweim0 Oct 7, 2021
6760f27
redirected mdsd stderr to stdout instead of stdin
daweim0 Oct 8, 2021
e453854
addressing proxy password location comment
daweim0 Oct 8, 2021
abd8000
Merge branch 'ci_dev' of github.com:microsoft/Docker-Provider into da…
daweim0 Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion kubernetes/linux/main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,21 @@ if [ -e "/etc/omsagent-secret/WSID" ]; then
else
echo "successfully validated provided proxy endpoint is valid and expected format"
fi

echo $pwd > /opt/microsoft/docker-cimprov/proxy_password

export MDSD_PROXY_MODE=application
echo "export MDSD_PROXY_MODE=$MDSD_PROXY_MODE" >> ~/.bashrc
export MDSD_PROXY_ADDRESS=$proto$hostport
echo "export MDSD_PROXY_ADDRESS=$MDSD_PROXY_ADDRESS" >> ~/.bashrc
export MDSD_PROXY_USERNAME=$user
echo "export MDSD_PROXY_USERNAME=$MDSD_PROXY_USERNAME" >> ~/.bashrc
export MDSD_PROXY_PASSWORD_FILE=/opt/microsoft/docker-cimprov/proxy_password
echo "export MDSD_PROXY_PASSWORD_FILE=$MDSD_PROXY_PASSWORD_FILE" >> ~/.bashrc

#TODO: Compression + proxy creates a deserialization error in ODS. This needs a fix in MDSD
export MDSD_ODS_COMPRESSION_LEVEL=0
echo "export MDSD_ODS_COMPRESSION_LEVEL=$MDSD_ODS_COMPRESSION_LEVEL" >> ~/.bashrc
fi

if [ ! -z "$PROXY_ENDPOINT" ]; then
Expand Down Expand Up @@ -563,7 +578,7 @@ if [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ]; then
else
echo "starting mdsd mode in main container..."
# add -T 0xFFFF for full traces
mdsd ${MDSD_AAD_MSI_AUTH_ARGS} -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos &
mdsd ${MDSD_AAD_MSI_AUTH_ARGS} -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos 2>> /dev/null &
fi

# Set up a cron job for logrotation
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/linux/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
dpkg-reconfigure --frontend=noninteractive locales && \
update-locale LANG=en_US.UTF-8

#install oneagent - Official bits (08/04/2021)
wget https://github.com/microsoft/Docker-Provider/releases/download/06242021-oneagent/azure-mdsd_1.10.3-build.master.257_x86_64.deb
#install oneagent - Official bits (10/7/2021)
wget https://github.com/microsoft/Docker-Provider/releases/download/1.14/azure-mdsd_1.14.0-build.master.279_x86_64.deb

/usr/bin/dpkg -i $TMPDIR/azure-mdsd*.deb
cp -f $TMPDIR/mdsd.xml /etc/mdsd.d
Expand Down