Skip to content

Update version detection and make dnsVIP conditional #1146

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 3 commits into from
Nov 24, 2020
Merged

Update version detection and make dnsVIP conditional #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f29670d
Store local copy of release info
Nov 9, 2020
91fbc9b
Replace OPENSHIFT_VERSION reference with function
Nov 9, 2020
5ddfb07
Only specify dnsVIP for < 4.5
Nov 9, 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
2 changes: 2 additions & 0 deletions 03_build_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ extract_oc "${OPENSHIFT_RELEASE_IMAGE}"

mkdir -p $OCP_DIR

save_release_info ${OPENSHIFT_RELEASE_IMAGE} ${OCP_DIR}

if [ -z "$KNI_INSTALL_FROM_GIT" ]; then
# Extract openshift-install from the release image
extract_installer "${OPENSHIFT_RELEASE_IMAGE}" $OCP_DIR
Expand Down
2 changes: 1 addition & 1 deletion 04_setup_ironic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ if [ ! -z "${MIRROR_IMAGES}" ]; then
sudo podman push --tls-verify=false --authfile $PULL_SECRET_FILE $OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE $OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE

# If we're mirroring images, let's use the local Ironic image instead
OPENSHIFT_RELEASE_VERSION=$(oc adm release info --registry-config="$PULL_SECRET_FILE" "$OPENSHIFT_RELEASE_IMAGE" -o json | jq -r ".config.config.Labels.\"io.openshift.release\"")
OPENSHIFT_RELEASE_VERSION=$(openshift_release_version)
IRONIC_LOCAL_IMAGE=${IRONIC_LOCAL_IMAGE:-"${LOCAL_REGISTRY_DNS_NAME}:${LOCAL_REGISTRY_PORT}/localimages/local-release-image:${OPENSHIFT_RELEASE_VERSION}-ironic"}
fi

Expand Down
40 changes: 37 additions & 3 deletions ocp_install_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,39 @@ function extract_installer() {
extract_command openshift-baremetal-install "$1" "$2"
}

function save_release_info() {
local release_image
local outdir

release_image="$1"
outdir="$2"

oc adm release info --registry-config "$PULL_SECRET_FILE" "$release_image" -o json > ${outdir}/release_info.json
}

# Gives e.g 4.7.0-0.nightly-2020-10-27-051128
function openshift_release_version() {
jq -r ".metadata.version" ${OCP_DIR}/release_info.json
}

# Gives us e.g 4.7 because although OPENSHIFT_VERSION is set by users,
# but is not set in CI
function openshift_version() {
jq -r ".metadata.version" ${OCP_DIR}/release_info.json | grep -oP "\d\.\d+"
}

function image_for() {
jq -r ".references.spec.tags[] | select(.name == \"$1\") | .from.name" ${OCP_DIR}/release_info.json
}

function extract_rhcos_json() {
local release_image
local outdir

release_image="$1"
outdir="$2"

baremetal_image=$(oc adm release info --image-for=baremetal-installer --registry-config "$PULL_SECRET_FILE" "$release_image")
baremetal_image=$(image_for baremetal-installer)
baremetal_container=$(podman create --authfile "$PULL_SECRET_FILE" "$baremetal_image")

# This is OK to fail as rhcos.json isn't available in every release,
Expand All @@ -70,7 +95,7 @@ function build_installer() {
}

function baremetal_network_configuration() {
if [[ "$OPENSHIFT_VERSION" == "4.3" ]]; then
if [[ "$(openshift_version $OCP_DIR)" == "4.3" ]]; then
return
fi

Expand All @@ -89,6 +114,15 @@ EOF
fi
}

function dnsvip() {
# dnsVIP was removed from 4.5
if printf '%s\n4.4\n' "$(openshift_version)" | sort -V -C; then
cat <<EOF
dnsVIP: ${DNS_VIP}
EOF
fi
}

function libvirturi() {
if [[ "$REMOTE_LIBVIRT" -ne 0 ]]; then
cat <<EOF
Expand Down Expand Up @@ -199,7 +233,7 @@ $(baremetal_network_configuration)
clusterOSImage: http://$(wrap_if_ipv6 $MIRROR_IP)/images/${MACHINE_OS_IMAGE_NAME}?sha256=${MACHINE_OS_IMAGE_SHA256}
apiVIP: ${API_VIP}
ingressVIP: ${INGRESS_VIP}
dnsVIP: ${DNS_VIP}
$(dnsvip)
Copy link
Member

@zaneb zaneb Nov 20, 2020

Choose a reason for hiding this comment

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

Might be safer to do the indentation here rather than in the function.

Copy link
Author

@hardys hardys Nov 23, 2020

Choose a reason for hiding this comment

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

Yeah I did think the same but all of the other functions adding install-config snippets work like this so I decided to align for consistency.

hosts:
$(node_map_to_install_config_hosts $NUM_MASTERS 0 master)
$(node_map_to_install_config_hosts $NUM_WORKERS $NUM_MASTERS worker)
Expand Down
9 changes: 4 additions & 5 deletions utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,18 +270,17 @@ function generate_auth_template {
# clouds.yaml
OCP_VERSIONS_NOAUTH="4.3 4.4 4.5"

# Fix the version if OPENSHIFT_VERSION follows x.y.z format to change it to x.y
OPENSHIFT_VERSION_TRIM=$(echo "$OPENSHIFT_VERSION" | grep -oE '^[[:digit:]]+\.[[:digit:]]+' || echo "$OPENSHIFT_VERSION")
VERSION=$(openshift_version $OCP_DIR)

if [[ "$OCP_VERSIONS_NOAUTH" == *"$OPENSHIFT_VERSION_TRIM"* ]]; then
if [[ "$OCP_VERSIONS_NOAUTH" == *"$VERSION"* ]]; then
go run metal3-templater.go "noauth" -template-file=clouds.yaml.template -provisioning-interface="$CLUSTER_PRO_IF" -provisioning-network="$PROVISIONING_NETWORK" -image-url="$MACHINE_OS_IMAGE_URL" -bootstrap-ip="$BOOTSTRAP_PROVISIONING_IP" -cluster-ip="$CLUSTER_PROVISIONING_IP" > clouds.yaml
else
IRONIC_USER=$(oc -n openshift-machine-api get secret/metal3-ironic-password -o template --template '{{.data.username}}' | base64 -d)
IRONIC_PASSWORD=$(oc -n openshift-machine-api get secret/metal3-ironic-password -o template --template '{{.data.password}}' | base64 -d)
IRONIC_CREDS="$IRONIC_USER:$IRONIC_PASSWORD"
IRONIC_CREDS="$IRONIC_USER:$IRONIC_PASSWORD"
INSPECTOR_USER=$(oc -n openshift-machine-api get secret/metal3-ironic-inspector-password -o template --template '{{.data.username}}' | base64 -d)
INSPECTOR_PASSWORD=$(oc -n openshift-machine-api get secret/metal3-ironic-inspector-password -o template --template '{{.data.password}}' | base64 -d)
INSPECTOR_CREDS="$INSPECTOR_USER:$INSPECTOR_PASSWORD"
INSPECTOR_CREDS="$INSPECTOR_USER:$INSPECTOR_PASSWORD"

go run metal3-templater.go "http_basic" -ironic-basic-auth="$IRONIC_CREDS" -inspector-basic-auth="$INSPECTOR_CREDS" -template-file=clouds.yaml.template -provisioning-interface="$CLUSTER_PRO_IF" -provisioning-network="$PROVISIONING_NETWORK" -image-url="$MACHINE_OS_IMAGE_URL" -bootstrap-ip="$BOOTSTRAP_PROVISIONING_IP" -cluster-ip="$CLUSTER_PROVISIONING_IP" > clouds.yaml
fi
Expand Down