Skip to content
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.

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

Merge release_4.14 to master #811

Merged
merged 44 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
256728f
Add internalIP as node IP for kubelet drop-in unit for OKD bundle
praveenkumar Jun 5, 2023
31f0cc7
Update mirror url for 4.14 candidate bits
praveenkumar Jun 5, 2023
1025e00
microshift: Install weak deps when installing podman
cfergeau May 25, 2023
7e315bb
Remove lvm system device file
praveenkumar Jun 16, 2023
fe6a6d2
Add route controller resource to bundle
praveenkumar Jun 12, 2023
dbc6492
Use hostpath-csi-driver image from registry.io
praveenkumar Jun 23, 2023
799d660
Add service account as 'router' for route controller
praveenkumar Jun 27, 2023
75556bf
Createdisk: update sparsify helper to use for microshift bundle also
praveenkumar Jul 3, 2023
0d23f23
Add create_bundle_qemu_image helper
praveenkumar Jul 5, 2023
d8c70af
Downgrade kernel only for mac
praveenkumar Jun 28, 2023
716cc5c
Drop the use of internal repo to download kernel package for downgrade
praveenkumar Jul 5, 2023
207e1ae
Revert "CI: Don't build mac bundle because kernel downgrade need inte…
praveenkumar Jul 5, 2023
5a62adc
microshift: Drop RH internal 'brew' requirement
cfergeau Jun 6, 2023
d9a12cb
Add RH internal certificate to access internal registry
praveenkumar Jul 7, 2023
9edf71b
Rename repos dir to pki
praveenkumar Jul 7, 2023
69af9b5
Use sudo for virsh commands as part of preflight checks
praveenkumar Jul 6, 2023
ee4dbc9
Fix typo in internal certificate
praveenkumar Jul 7, 2023
4d67499
Rename route_controller.yaml.in to routes-controller.yaml.in
praveenkumar Jul 6, 2023
1466e4a
Rename router-controller.yaml.in to routes-controller.yaml.in
praveenkumar Jul 7, 2023
96b6521
Use microshift as default value if VM_PREFIX is not set
praveenkumar Jul 10, 2023
3693765
Install-config: Add MachineAPI to enable as part of capability
praveenkumar Jul 12, 2023
5d2c993
ci_microshift: Remove crc domain after bundle creation
praveenkumar Jul 11, 2023
121dcd6
ci_microshift: Just undefine the crc domain
praveenkumar Jul 12, 2023
b17c25f
Build crc-dnsmasq and crc-route-controller image even KAO image alrea…
praveenkumar Jul 18, 2023
33b9020
Enable linger for core user
praveenkumar Jul 19, 2023
20b4bc1
Wait till machine config pool is in updated state
praveenkumar Aug 8, 2023
48d550b
microshift: use yum's downloaddir option instead pushd to directory
praveenkumar Aug 10, 2023
bb7bb87
microshift: Add logic to create bundle of upcoming release
praveenkumar Aug 10, 2023
b7d94f3
CI: use MICROSHIFT_PRERELEASE for creating pre release bundles of mic…
praveenkumar Aug 10, 2023
ff0c9c6
microshift: update mirror to ocp-dev-preview
praveenkumar Aug 11, 2023
ce89c13
Microshift: use MICROSHIFT_PRERELEASE to determine which mirror url t…
praveenkumar Aug 21, 2023
639bee5
microshift: refactor download_microshift_rpm function
praveenkumar Aug 21, 2023
1a57684
gen-bundle-image: Update arm64 bundle image generation condition
praveenkumar Aug 24, 2023
ad07ba3
gen-bundle-image: refactor to accomodate microshift preset
praveenkumar Aug 23, 2023
5b8e2d3
gen-bundle-image: allow to build arm64 image for microshift also
praveenkumar Aug 25, 2023
90e1cd0
snc-library: Fix app route for microshift preset
praveenkumar Aug 25, 2023
e731369
build-patched-kao-kcmo-images.sh: Use https instead of git for encryp…
praveenkumar Sep 18, 2023
47dd301
install-config.yaml: Add image-registry, build and deployment config …
praveenkumar Sep 21, 2023
e2338bd
Use GPT partition table instead msdos
praveenkumar Sep 6, 2023
f19c723
microshift: Boot the ISO in uefi mode
praveenkumar Sep 8, 2023
440a9f7
microshift: Install the grub bootloader for legacy support
praveenkumar Sep 8, 2023
7785539
Merge remote-tracking branch 'origin/release-4.14' into merge_4.14_to…
praveenkumar Nov 2, 2023
6d9edad
Switch candidate-4.14 to latest-4.14
praveenkumar Nov 2, 2023
1152bdf
Update to release-4.14 branch
praveenkumar Nov 2, 2023
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 build-patched-kao-kcmo-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rm -fr crc-cluster-kube-controller-manager-operator
rm -fr crc-dnsmasq
rm -fr crc-routes-controller

readonly OCP_VERSION=4.13
readonly OCP_VERSION=4.14

function check_pull_secret() {
if [ -z "${OPENSHIFT_PULL_SECRET_PATH-}" ]; then
Expand Down
4 changes: 4 additions & 0 deletions install-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@ capabilities:
- openshift-samples
- marketplace
- Console
- MachineAPI
- ImageRegistry
- DeploymentConfig
- Build
publish: External
4 changes: 2 additions & 2 deletions microshift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function configure_host {

function enable_repos {
sudo subscription-manager repos \
--enable rhocp-4.13-for-rhel-9-$(uname -i)-rpms \
--enable rhocp-4.14-for-rhel-9-$(uname -i)-rpms \
--enable fast-datapath-for-rhel-9-$(uname -i)-rpms
}

Expand All @@ -86,7 +86,7 @@ function create_iso {
if [ -n "${MICROSHIFT_PRERELEASE-}" ]; then
git clone -b main https://github.com/openshift/microshift.git
else
git clone -b release-4.13 https://github.com/openshift/microshift.git
git clone -b release-4.14 https://github.com/openshift/microshift.git
fi
cp podman_changes.ks microshift/
pushd microshift
Expand Down
2 changes: 1 addition & 1 deletion snc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ if test -n "${OPENSHIFT_VERSION-}"; then
OPENSHIFT_RELEASE_VERSION=${OPENSHIFT_VERSION}
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from OPENSHIFT_VERSION"
else
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/latest-4.13/release.txt | sed -n 's/^ *Version: *//p')"
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/latest-4.14/release.txt | sed -n 's/^ *Version: *//p')"
if test -n "${OPENSHIFT_RELEASE_VERSION}"; then
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from the latest mirror"
else
Expand Down