Skip to content

AGENT-1522: Add internalreleaseimage manifest with v1 version #1912

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

Open
pawanpinjarkar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AGENT-1522: Add internalreleaseimage manifest with v1 version #1912

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
36 changes: 36 additions & 0 deletions agent/05_agent_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,41 @@ EOF
fi
}

function generate_extra_cluster_manifests_iri_v1() {
mkdir -p "${EXTRA_MANIFESTS_PATH}"

local release_version
release_version=$(oc adm release info --registry-config "$PULL_SECRET_FILE" "$OPENSHIFT_RELEASE_IMAGE" -o json | jq -r '.metadata.version')

# For non-CI/nightly builds (stable, RC, DevPreview, GA), append architecture suffix
# ISO_NO_REGISTRY supports x86_64, so arch is always "x86_64"
local version_for_tag="${release_version}"

if [[ "${OPENSHIFT_RELEASE_TYPE}" != "ci" ]] && [[ "${OPENSHIFT_RELEASE_TYPE}" != "nightly" ]]; then
version_for_tag="${release_version}-x86_64"
fi

# Generate the OCP bundle string using the Tag logic
# Tag format: "ocp-release-bundle-{version}" truncated to 64 chars
local ocp_bundle_str="ocp-release-bundle-${version_for_tag}"
local max_length=64

if [[ ${#ocp_bundle_str} -gt ${max_length} ]]; then
ocp_bundle_str="${ocp_bundle_str:0:${max_length}}"
fi

cat > "${EXTRA_MANIFESTS_PATH}/internalreleaseimage.yaml" << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: InternalReleaseImage
metadata:
name: cluster
spec:
releases:
- name: ${ocp_bundle_str}
EOF

}

function oc_mirror_mce() {
tmpimageset=$(mktemp --tmpdir "mceimageset--XXXXXXXXXX")
_tmpfiles="$_tmpfiles $tmpimageset"
Expand Down Expand Up @@ -700,6 +735,7 @@ else
if [[ "${NUM_MASTERS}" -gt "1" ]]; then
add_dns_entry "${API_VIPS%"${VIPS_SEPARATOR}"*}" "api-int"
fi
generate_extra_cluster_manifests_iri_v1
fi

enable_isolated_baremetal_network