Skip to content

Commit d78c7c7

Browse files
authored
Merge pull request #811 from praveenkumar/merge_4.14_to_master
Merge release_4.14 to master
2 parents 9b0a5fd + 1152bdf commit d78c7c7

4 files changed

+8
-4
lines changed

build-patched-kao-kcmo-images.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ rm -fr crc-cluster-kube-controller-manager-operator
2323
rm -fr crc-dnsmasq
2424
rm -fr crc-routes-controller
2525

26-
readonly OCP_VERSION=4.13
26+
readonly OCP_VERSION=4.14
2727

2828
function check_pull_secret() {
2929
if [ -z "${OPENSHIFT_PULL_SECRET_PATH-}" ]; then

install-config.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,8 @@ capabilities:
3737
- openshift-samples
3838
- marketplace
3939
- Console
40+
- MachineAPI
41+
- ImageRegistry
42+
- DeploymentConfig
43+
- Build
4044
publish: External

microshift.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function configure_host {
6464

6565
function enable_repos {
6666
sudo subscription-manager repos \
67-
--enable rhocp-4.13-for-rhel-9-$(uname -i)-rpms \
67+
--enable rhocp-4.14-for-rhel-9-$(uname -i)-rpms \
6868
--enable fast-datapath-for-rhel-9-$(uname -i)-rpms
6969
}
7070

@@ -86,7 +86,7 @@ function create_iso {
8686
if [ -n "${MICROSHIFT_PRERELEASE-}" ]; then
8787
git clone -b main https://github.com/openshift/microshift.git
8888
else
89-
git clone -b release-4.13 https://github.com/openshift/microshift.git
89+
git clone -b release-4.14 https://github.com/openshift/microshift.git
9090
fi
9191
cp podman_changes.ks microshift/
9292
pushd microshift

snc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if test -n "${OPENSHIFT_VERSION-}"; then
4444
OPENSHIFT_RELEASE_VERSION=${OPENSHIFT_VERSION}
4545
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from OPENSHIFT_VERSION"
4646
else
47-
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/latest-4.13/release.txt | sed -n 's/^ *Version: *//p')"
47+
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/latest-4.14/release.txt | sed -n 's/^ *Version: *//p')"
4848
if test -n "${OPENSHIFT_RELEASE_VERSION}"; then
4949
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from the latest mirror"
5050
else

0 commit comments

Comments
 (0)