Skip to content

Additional trust bundle #1152

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 4 commits into from
Nov 20, 2020
Merged

Additional trust bundle #1152

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c942986
Adding the option to add certs to install-config.yaml
Nov 17, 2020
9f6d132
Add ADDITIONAL_TRUST_BUNDLE to the config_example.sh
Nov 17, 2020
3bbe825
Avoid additionalTrustBundle duplication & move from sed to awk
Nov 17, 2020
185f76c
In case MIRROR_IMAGES is set, concat ADDITIONAL_TRUST_BUNDLE
Nov 18, 2020
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
10 changes: 10 additions & 0 deletions ocp_install_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ EOF
fi
}

function additional_trust_bundle() {
if [ ! -z "$ADDITIONAL_TRUST_BUNDLE" ]; then
cat <<EOF
additionalTrustBundle: |
$(echo ${ADDITIONAL_TRUST_BUNDLE} | sed -e ':a;N;$!ba;s/\n/\n /g')

@hardys hardys Nov 17, 2020

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will create a duplicate section when image_mirror_config is called (when MIRROR_IMAGES or ipv6 is specified), we'll need some way to merge the content.

@Avielyo10 Avielyo10 Nov 17, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why duplicated?does image_mirror_config adds this section?

@hardys hardys Nov 17, 2020

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes exactly, it already adds this section https://github.com/openshift-metal3/dev-scripts/blob/master/utils.sh#L331

EOF
fi

@zaneb zaneb Nov 20, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A less complicated version of this function:

if [ -n "${ADDITIONAL_TRUST_BUNDLE}" ]; then
    if [ -z "${MIRROR_IMAGES}" ]; then
        echo "additionalTrustBundle: |"
    fi
    echo "${ADDITIONAL_TRUST_BUNDLE}" | awk '{ print " ", $0 }'
fi

@Avielyo10 Avielyo10 Nov 22, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree

}

function cluster_network() {
if [[ "${IP_STACK}" == "v4" ]]; then
cat <<EOF
Expand Down Expand Up @@ -191,6 +200,7 @@ $(baremetal_network_configuration)
$(node_map_to_install_config_hosts $NUM_MASTERS 0 master)
$(node_map_to_install_config_hosts $NUM_WORKERS $NUM_MASTERS worker)
$(image_mirror_config)
$(additional_trust_bundle)
pullSecret: |
$(jq -c . $install_config_pull_secret)
sshKey: |
Expand Down