From 90814b4b3d13053b5fe846e823fa6e226703d52e Mon Sep 17 00:00:00 2001 From: Liran Rotenberg Date: Wed, 20 Sep 2023 11:36:57 +0300 Subject: [PATCH] Switch to v2.5.1 names Signed-off-by: Liran Rotenberg --- .bazelrc | 2 +- Makefile | 2 +- README.md | 2 +- operator/README.md | 5 ++--- .../bases/forklift-operator.clusterserviceversion.yaml | 4 ---- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.bazelrc b/.bazelrc index 6fe3c3546..020f7e2b0 100644 --- a/.bazelrc +++ b/.bazelrc @@ -3,7 +3,7 @@ build --action_env=CONTAINER_CMD build --action_env=XDG_RUNTIME_DIR # Operator ## Default operator config -build --action_env=VERSION=2.5.0 +build --action_env=VERSION=2.5.1 build --action_env=NAMESPACE=konveyor-forklift build --action_env=CHANNELS=development build --action_env=DEFAULT_CHANNEL=development diff --git a/Makefile b/Makefile index 48cd5bfde..ff25bbda8 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ REGISTRY ?= quay.io REGISTRY_ORG ?= kubev2v REGISTRY_TAG ?= devel -VERSION ?= 2.5.0 +VERSION ?= 2.5.1 NAMESPACE ?= konveyor-forklift OPERATOR_NAME ?= forklift-operator CHANNELS ?= development diff --git a/README.md b/README.md index 32aad39b1..7da904d36 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Another option to override the default values can use `--action_env` as in the e | Name | Default value | Description | |----------------------------|-------------------------------------------------|-------------------------------------------------------------| | CONTAINER_CMD | autodetected | The container runtime command (e.g.: /usr/bin/podman) | -| VERSION | 2.5.0 | The version with which the forklift should be built. | +| VERSION | 2.5.1 | The version with which the forklift should be built. | | NAMESPACE | konveyor-forklift | The namespace in which the operator should be installed. | | CHANNELS | development | The olm channels. | | DEFAULT_CHANNEL | development | The default olm channel. | diff --git a/operator/README.md b/operator/README.md index f9925ba0a..b5c7064bb 100644 --- a/operator/README.md +++ b/operator/README.md @@ -15,10 +15,9 @@ Forklift Operator installs a suite of migration tools that facilitate the migrat OpenShift Virtualization/KubeVirt is required and must be installed prior attempting to deploy Forklift, see the table below for supported configurations: Forklift release | OpenShift Virtualization/KubeVirt | VMware | oVirt ----------------- | --------------------------------- | ------ | ----- -v2.2 | v4.9 | 6.5+ | 4.4.9+ -v2.3 | v4.10-v4.11 | 6.5+ | 4.4.9+ +---------------- |-----------------------------------| ------ | ----- v2.4 | v4.11+ | 6.5+ | 4.4.9+ +v2.5 | v4.12+ | 6.5+ | 4.4.9+ **Note:** Please keep in mind Forklift will not deploy in unsupported configurations. diff --git a/operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml b/operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml index f6bb3736a..b2d203f4a 100644 --- a/operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml @@ -104,10 +104,6 @@ spec: * Must-gather-api, a service to generate targeted must-gather archives. ### Compatibility - Forklift 2.2 is supported on OpenShift 4.9 - - Forklift 2.3 is supported on OpenShift 4.10 and 4.11 - Forklift 2.4 is supported on OpenShift 4.11 and 4.12 Forklift 2.5 is supported on OpenShift 4.12 and 4.13