Release v2.2.1 (#4746)

* bump version to 2.2.1

* add missing PRs to Changelog.md

Changelog.md

@@ -1,24 +1,40 @@
 #  Odo Changelog
 
+## 2.2.2
+
+### Feature/Enhancements
+
+### Bug Fixes
+
+### Tests
+
+### Documentation
 
 ## 2.2.1
 
 ### Feature/Enhancements
 
-- implement `odo catalog describe service` for operator backed services
-- add deprecation warning for old git style devfile registries ([#4707](https://github.com/openshift/odo/pull/4707))
-- adds dev.odo.push.path attribute support for pushing only mentioned files ([#4588](https://github.com/openshift/odo/pull/4588))
+- Implement `odo catalog describe service` for operator backed services ([#4671](https://github.com/openshift/odo/pull/4671))
+- Add deprecation warning for old git style devfile registries ([#4707](https://github.com/openshift/odo/pull/4707))
+- Adds dev.odo.push.path attribute support for pushing only mentioned files ([#4588](https://github.com/openshift/odo/pull/4588))
+- Use server side apply  approved ([#4648](https://github.com/openshift/odo/pull/4648))
+- Adding wait support to component deletion for devfile ([#4712](https://github.com/openshift/odo/pull/4712))
+- Collect Component type for usage data ([#4662](https://github.com/openshift/odo/pull/4662))
 
 ### Bug Fixes
 
-No changes
+- Follow devfile like conventions in generated url name to keep url short for --s2i  ([#4670](https://github.com/openshift/odo/pull/4670))
+- Fix OCI-based registry migration  approved kind/bug lgtm ([#4702](https://github.com/openshift/odo/pull/4702))
+- Removes invalid endpoints from the devfile on triggering url create. ([#4567](https://github.com/openshift/odo/pull/4567))
 
 ### Tests
 
-Not changes
+- Automate psi ci for mac and windows  ([#4460](https://github.com/openshift/odo/pull/4460))
+- Update devfile tests with OCI-based registry ([#4679](https://github.com/openshift/odo/pull/4679))
+
 
 ### Documentation
 
 - Adds a document regarding the odo.dev.push.path attributes in the devfile ([#4681](https://github.com/openshift/odo/pull/4681))
-
 - Add --s2i conversion related breaking changes ([#4683](https://github.com/openshift/odo/pull/4683))
+- Fix OCI-based registry migration ([#4702](https://github.com/openshift/odo/pull/4702))

Dockerfile.rhel

@@ -16,7 +16,7 @@ LABEL com.redhat.component=atomic-openshift-odo-cli-artifacts-container \
     summary="This image contains the Linux, Mac and Windows version of odo"
 
 # Change version as needed. Note no "-" is allowed
-LABEL version=2.2.0
+LABEL version=2.2.1
 
 COPY --from=builder /go/src/github.com/openshift/odo/dist/bin/darwin-amd64/odo /usr/share/openshift/odo/mac/odo
 COPY --from=builder /go/src/github.com/openshift/odo/dist/bin/windows-amd64/odo.exe /usr/share/openshift/odo/windows/odo.exe

pkg/version/version.go

@@ -12,7 +12,7 @@ Changing these values will change the versioning information when releasing odo.
 
 var (
 	// VERSION  is version number that will be displayed when running ./odo version
-	VERSION = "v2.2.0"
+	VERSION = "v2.2.1"
 
 	// GITCOMMIT is hash of the commit that will be displayed when running ./odo version
 	// this will be overwritten when running  build like this: go build -ldflags="-X github.com/openshift/odo/cmd.GITCOMMIT=$(GITCOMMIT)"

scripts/rpm-prepare.sh

@@ -5,7 +5,7 @@ set +ex
 echo "Reading ODO_VERSION, ODO_RELEASE and GIT_COMMIT env, if they are set"
 # Change version as needed. In most cases ODO_RELEASE would not be touched unless
 # we want to do a re-lease of same version as we are not backporting
-export ODO_VERSION=${ODO_VERSION:=2.2.0}
+export ODO_VERSION=${ODO_VERSION:=2.2.1}
 export ODO_RELEASE=${ODO_RELEASE:=1}
 
 export GIT_COMMIT=${GIT_COMMIT:=`git rev-parse --short HEAD 2>/dev/null`}