Leaving this in post until we get all the prs in.
This bz does not require QA. It exists only to allow merging of 1.19 bump PRs to the repos that need them.
Nothing for QA to do here that won't be covered as part of the regular testing regime. This bz is process-only, to ensure the bot allows us to merge bumps post-feature freeze.
This needs to continue targeting 4.6 to ensure that the bot considers it valid for merging to 4.6. There are still PRs that will merge against this, likely right up to freeze (including further patch release rebases).
Planning on using this for 1.19.2
Reassigning to Tomas who is doing the 1.19.2 rebase.
Moving to 4.7 as only PR about kube rebase is still open.
Moving back to 4.6 to pick up one more change, will revert to 4.7 immediately after.
Verification steps as below, $ git clone https://github.com/openshift/api $ cd api $ git checkout -b 4.6 remotes/origin/release-4.6 $ git log --date=local --pretty="%h %an %cd - %s" | grep '#728' c05698d1 OpenShift Merge Robot Thu Aug 27 17:01:12 2020 - Merge pull request #728 from marun/bump-1.19.0 $ git log --date=local --pretty="%h %an %cd - %s" | grep '#742' 2a185268 OpenShift Merge Robot Wed Sep 23 16:06:07 2020 - Merge pull request #742 from stlaz/service_ca_names $ git clone https://github.com/openshift/apiserver-library-go $ cd apiserver-library-go $ git log --date=local --pretty="%h %an %cd - %s" | grep '#34' 1236dc23 OpenShift Merge Robot Tue Sep 1 22:07:31 2020 - Merge pull request #34 from marun/bump-1.19.0 $ git clone https://github.com/openshift/client-go $ cd client-go/ $ git checkout -b 4.6 remotes/origin/release-4.6 $ git log --date=local --pretty="%h %an %cd - %s" | grep '#159' 30621373 OpenShift Merge Robot Fri Aug 28 03:00:08 2020 - Merge pull request #159 from marun/bump-1.19.0 $ git clone https://github.com/openshift/kubernetes $ cd kubernetes $ git checkout -b 4.6 remotes/origin/release-4.6 $ $ for pr in 325 337 349 351 360 361 366 377; do git log --date=local --pretty="%h %an %cd - %s" | grep " #$pr " | head -1 ;done 0d5808eb375 OpenShift Merge Robot Thu Sep 10 18:27:08 2020 - Merge pull request #325 from marun/rebase-1.19.0 e6c224ae9fa OpenShift Merge Robot Sun Sep 13 02:47:54 2020 - Merge pull request #337 from marun/k8s-e2e-serial 4336ff45cf9 OpenShift Merge Robot Sat Sep 12 18:27:22 2020 - Merge pull request #349 from marun/commit-test-bindata b4ffb455315 Michal Fojtik Wed Sep 16 15:14:55 2020 - Merge pull request #351 from marun/commit-openapi-definitions 7e8389f8702 OpenShift Merge Robot Tue Sep 22 01:19:07 2020 - Merge pull request #360 from marun/rebase-instructions bafba66f2c0 OpenShift Merge Robot Tue Sep 29 08:58:28 2020 - Merge pull request #366 from marun/update-docs beb741bdf00 OpenShift Merge Robot Wed Sep 30 04:50:38 2020 - Merge pull request #377 from marun/fix-test-annotation > Missed PR 361 of 4.6 release $ git clone https://github.com/openshift/library-go $ cd library-go/ $ git checkout -b 4.6 remotes/origin/release-4.6 $ git log --date=local --pretty="%h %an %cd - %s" | grep '#872' 0f320c8f OpenShift Merge Robot Mon Aug 31 14:48:43 2020 - Merge pull request #872 from marun/bump-1.19.0 $ git clone https://github.com/openshift/oauth-proxy $ cd oauth-proxy $ git checkout -b 4.6 remotes/origin/release-4.6 $ git log --date=local --pretty="%h %an %cd - %s" | grep '#188' 675506a OpenShift Merge Robot Wed Sep 23 15:43:38 2020 - Merge pull request #188 from stlaz/rebase_1.19 $ git clone https://github.com/openshift/service-ca-operator $ cd service-ca-operator $ git checkout -b 4.6 remotes/origin/release-4.6 $ git log --date=local --pretty="%h %an %cd - %s" | grep '#125' a840cd93 OpenShift Merge Robot Wed Sep 23 18:16:46 2020 - Merge pull request #125 from stlaz/rebase_1.19 $ git clone https://github.com/openshift/origin $ cd origin $ git checkout -b 4.6 remotes/origin/release-4.6 $ for pr in 25382 25495 25565 25659; do git log --date=local --pretty="%h %an %cd - %s" | grep " #$pr " | head -1 ;done for pr in 25382 25495 25565 25659; do git log --date=local --pretty="%h %an %cd - %s" | grep " #$pr ";done eccefa0759 OpenShift Merge Robot Thu Sep 3 08:33:11 2020 - Merge pull request #25382 from marun/vendor-test-annotation a78b89d8c6 David Eads Thu Sep 17 01:33:03 2020 - Merge pull request #25495 from marun/bump-1.19.0 e1481edf12 OpenShift Merge Robot Fri Oct 2 13:19:05 2020 - Merge pull request #25565 from marun/fix-annotation-generation > Missed PR 25659 of 4.6 release
mnewby, Would you please help to have a look above results?
afaik, we have bumped only the binaries to 1.19.4 in https://bugzilla.redhat.com/show_bug.cgi?id=1900630 (https://github.com/openshift/kubernetes/pull/435) for release-4.6, not the libs
I don't expect that much changes in the libraries as in the binaries, thus we usually only bump the latter.
Verified with the kube-apiserver-operator, $ oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS version 4.6.0-0.nightly-2021-01-05-203053 True False 164m Cluster version is 4.6.0-0.nightly-2021-01-05-203053 $ oc get pods -A |grep openshift-kube-apiserver-operator openshift-kube-apiserver-operator kube-apiserver-operator-79fc878b44-p5lck 1/1 Running 0 156m $ oc describe po/kube-apiserver-operator-79fc878b44-p5lck -n openshift-kube-apiserver-operator | grep 'OPERAND_IMAGE_VERSION' OPERAND_IMAGE_VERSION: 1.19.4 The binaries version is 1.19.4, it is as expected, move the bug VERIFIED.
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory (Moderate: OpenShift Container Platform 4.7.0 security, bug fix, and enhancement update), and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHSA-2020:5633