Skip to content

Additional trust bundle #1159

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
openshift-merge-robot merged 1 commit into from
Dec 2, 2020
Merged

Additional trust bundle #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion config_example.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@ set -x
# PEM-encoded X.509 certificate bundle that will be added to the nodes' trusted
# certificate store. This trust bundle may also be used when a proxy has
# been configured.
# export ADDITIONAL_TRUST_BUNDLE=$(cat ca)
# export ADDITIONAL_TRUST_BUNDLE=/path/to/ca_file
14 changes: 5 additions & 9 deletions ocp_install_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,12 @@ EOF
}

function additional_trust_bundle() {
if [ ! -z "$ADDITIONAL_TRUST_BUNDLE" ] && [ -z $MIRROR_IMAGES ]; then
cat <<EOF
additionalTrustBundle: |
$(echo ${ADDITIONAL_TRUST_BUNDLE} | awk '{ print " ", $0 }')
EOF
elif [ ! -z "$ADDITIONAL_TRUST_BUNDLE" ] && [ ! -z "$MIRROR_IMAGES" ]; then
cat <<EOF
$(echo ${ADDITIONAL_TRUST_BUNDLE} | awk '{ print " ", $0 }')
EOF
if [ ! -z "$ADDITIONAL_TRUST_BUNDLE" ]; then
if [ -z $MIRROR_IMAGES ]; then
echo "additionalTrustBundle: |"
fi
awk '{ print " ", $0 }' "${ADDITIONAL_TRUST_BUNDLE}"
fi
}

function cluster_network() {
Expand Down