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.

Sign up for GitHub

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

Jump to bottom

Merge https://github.com/nmstate/kubernetes-nmstate:main (80c6e01) into master #439

Merged
merged 35 commits into from Nov 20, 2023
Merged

Merge https://github.com/nmstate/kubernetes-nmstate:main (80c6e01) into master #439

merged 35 commits into from Nov 20, 2023

Conversation

metal-net-merge-bot[bot]
Copy link

No description provided.

qinqon and others added 30 commits November 16, 2023 16:39
@qinqon
handler: Retry enactment update (nmstate#1215)
80c6e01 
At some scenarios it takes some retries to update the enactment status
if the network is not totally settle. This change add some retries to
enactment status update.

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
merge upstream/main into master
9f2124d
@cybertron
UPSTREAM: <carry>: Add ocp-e2e-tests script
8967ae5 
When running the e2e tests on OCP, we need to do some things
slightly different. This adds a script and the necessary files to
do so.

(cherry picked from commit 567716a)
(cherry picked from commit dfb4c3c)
(cherry picked from commit b4064be)
(cherry picked from commit 00025c6)
(cherry picked from commit f906068)
(cherry picked from commit a78a700)
(cherry picked from commit 09e4bf4)
(cherry picked from commit c851635)
(cherry picked from commit d6b4f51)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 3b4248b)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 1d67745)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 0ee7006)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit e8b8052)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Add machineconfigs before running e2e tests on OCP
6707c6b 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 4fe0d7a)
(cherry picked from commit 83bd895)
(cherry picked from commit b322f05)
(cherry picked from commit 8c1a3dd)
(cherry picked from commit a991847)
(cherry picked from commit 42479c5)
(cherry picked from commit fa55fa8)
(cherry picked from commit 7b97ef5)
(cherry picked from commit 22bf379)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit f4d155a)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 0b432c9)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ac93130)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit acd7aca)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Skip e2e tests which are not supported on OVN
2b2f4bb 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 1d01efb)
(cherry picked from commit 364fe41)
(cherry picked from commit b6c9641)
(cherry picked from commit 5f1b9b5)
(cherry picked from commit 80af39f)
(cherry picked from commit b2626f2)
(cherry picked from commit 12054ce)
(cherry picked from commit c900358)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 71219bd)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 9e6bd01)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 0f8349d)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 49529da)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Switch to dnf in Openshift handler image
d4b3c90 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 6612de2)
(cherry picked from commit da4ab74)
(cherry picked from commit a53ca45)
(cherry picked from commit 24267ed)
(cherry picked from commit 4aa6e19)
(cherry picked from commit 3af5b7c)
(cherry picked from commit b095b4f)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 630276c)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 4456104)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 9f2eb3f)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit fc28f40)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Add ssh proxy for e2e tests in CI
91facf0 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 7b74bd8)
(cherry picked from commit be0ae5f)
(cherry picked from commit f73ee93)
(cherry picked from commit 23cfe97)
(cherry picked from commit 171fe84)
(cherry picked from commit 05e992d)
(cherry picked from commit 77d2346)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ce16176)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 250a582)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit a50d65a)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit cdb4ea2)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Apply SCC in e2e tests when reinstalling operator …
c0de7bb 
…in another namespace

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 7509eee)
(cherry picked from commit 38cc1fd)
(cherry picked from commit de2462b)
(cherry picked from commit 3a1e61e)
(cherry picked from commit d4d08a0)
(cherry picked from commit fb74350)
(cherry picked from commit 7945213)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ea3a836)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit c6d2f5c)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit f120c02)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit f19c7bc)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Add make target to run operator e2e tests against ocp
eaae897 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 6a8591b)
(cherry picked from commit ded6769)
(cherry picked from commit 5d1c799)
(cherry picked from commit 25ab920)
(cherry picked from commit 9b77532)
(cherry picked from commit 87cce8c)
(cherry picked from commit d7c68f4)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit a43da04)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit fc78734)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 89d6eae)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 7e9d288)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Do not ignore parameters for ocp tests
e9e9ad5 
This commit fixes the issue that provided parameters for the ocp e2e
test targets would have been ignored. For example in case the
IMAGE_BUILDER was set to docker, this would have been ignored and is
fixed now.

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 322cf1f)
(cherry picked from commit 4b330ef)
(cherry picked from commit bcb43a6)
(cherry picked from commit 8b9e18c)
(cherry picked from commit 2f12709)
(cherry picked from commit ea1dff5)
(cherry picked from commit f53e9ce)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 5d4b8bb)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 6b63f06)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 2f3f740)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 55fd9a6)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Rerun flaky e2e tests
168945e 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 4857be0)
(cherry picked from commit 22608ef)
(cherry picked from commit c8fa90d)
(cherry picked from commit 51b4fdc)
(cherry picked from commit 89d0f12)
(cherry picked from commit 3111167)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit c308763)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 23b48e4)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 2e66b85)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit c434379)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Timeout handler e2e tests after 4h
c424973 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit a4822b5)
(cherry picked from commit e40fc60)
(cherry picked from commit bcb773b)
(cherry picked from commit 3fea150)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 794ac90)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ba8691e)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ff134ff)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 29f8abe)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: makefile: add check to verify bundles have been up…
5506464 
…dated

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit b8396cb)
(cherry picked from commit 4c82db6)
(cherry picked from commit 60213aa)
(cherry picked from commit 5eda91c)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 6fed76b)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 49480ac)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 8d42895)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ac0bf1a)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: tmp: Skip ovs-bridge e2e test with nmstate 1.2
542240e 
An OVS-bridge e2e tests was reenabled in
a5ed4b5 in upstreams. This required a
fix in nmstate which was not yet backported to nmstate 1.2. Therefor we
keep this test skipping until it was backported to nmstate 1.2 as this
does not make things worse.

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 8a9fe63)
(cherry picked from commit 97f52d4)
(cherry picked from commit 2eb8126)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit f0a4187)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 1bcaa9b)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 35a3cad)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 92f3d04)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Skip LLDP e2e test on OVN
3948471 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 6c258a6)
(cherry picked from commit ee43a0d)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 5c6d1b1)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 064d4cb)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit c5aa1bf)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 588b6b8)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Add documentation for developing on and for OCP
6af866b 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit a6d66ae)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 881f722)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 690c237)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 6d64a75)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ee5bda6)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Add script to install nightly build of ART operato…
48247cc 
…r bundle

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit e1933e4)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 60a19d0)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit d03500d)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ba9b68c)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 3bbd715)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry>: Add script to capture NM and entire journal logs i…
e12c8e6 
…n dev-scripts clusters

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 1ae2ffb)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit dd181a5)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit ae3e7aa)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit b91d0e1)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 57503d2)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@dougsland
UPSTREAM: <carry>: makefile: add more verbosity
2e305ab 
helps identify e2e tests failures

Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 7bc1b35)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 4383bb4)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 028ee24)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 9c5a4b7)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@cybertron
UPSTREAM: <carry>: OCPBUGS-13014: Skip "with capture" e2e tests on OVNK
8fb8047 
Currently the capture tests are not respecting our settings for
secondary interfaces and as a result they try to use the enp2s0
interface in a bond. This won't work since that's the interface
used by configure-ovs, so until we work out a way to make those
tests behave correctly in OVNK clusters we need to skip them in order
to get useful results from the ovn e2e jobs.

(cherry picked from commit 43740da)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 71bd439)
Signed-off-by: Mat Kowalski <mko@redhat.com>
@creydr
UPSTREAM: <carry> Improve ocp-rebase script
e8dccb7 
Combines following commits

c295349 hack: fix git log to use correct order
8eb855a ocp-rebase: do not use static branch names
3f518d9 ocp-rebase: general improvements
4018f52 UPSTREAM: <carry>: ocp-rebase: use -s in cherry-pick
19a5912 UPSTREAM: <carry>: Add helper script for rebase
@bcrochet
UPSTREAM: <carry> Update OWNERS
cf1ebed 
Combines following commits

92f28cc UPSTREAM: <carry>: Add mko as reviewer and approver
1d239b1 UPSTREAM: <carry>: Add dougsland as an approver
d7d674e UPSTREAM: <carry>: Remove yboaron and creydr from OWNERS
fa88ab9 UPSTREAM: <carry>: Update OWNERS
97feffd UPSTREAM: <carry>: Add midstream approvers and reviewers
UPSTREAM: <carry> Update manifests and images
7e54c31 
Contains following commits

5b219d5 manifests: update references from 4.13 to 4.14
2924cbc UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-handler images to be consistent with ART
b29ee80 UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-operator images to be consistent with ART
f1abcfc OPNET-261: Integrate the ART build of nmstate-console-plugin image in the CSV
bf07359 manifests: update io_nmstates.yaml
43df0b6 move to stable channel - part 2
d4bc01a OPNET-256: Move from version-specific to stable channel
769469a UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-operator images to be consistent with ART
bb1a4b6 UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-handler images to be consistent with ART
8b51d9f update manifest for 4.13
2d12ff9 UPSTREAM: <carry>: run make ocp-update-bundle-manifests
62cdefa UPSTREAM: <carry>: Add empty spec to NMState CR example
c8b6e3d UPSTREAM: <carry>: Remove NNCP example from manifests
ee87461 UPSTREAM: <carry>: add ipv4 example to the interfaces in the alm-examples
7819bc8 UPSTREAM: <carry>: Update Dockerfile images to match ART
61ee11d UPSTREAM: <carry>: Update Dockerfile images to match ART
4f7b97d UPSTREAM: <carry>: Update Dockerfile images to match ART
77df634 UPSTREAM: <carry>: Remove handler SA permissions from CSV
190f76a UPSTREAM: <carry>: Update bundle manifests after rebase
f24a70e UPSTREAM: <carry>: Update Dockerfile images to match ART
b618206 UPSTREAM: <carry>: Update OPM for 4.12
ac2a2f4 UPSTREAM: <carry>: Make sure yq v4 is installed for bundle updates
b29545d UPSTREAM: <carry>: Add manifests for 4.12
0f857a9 UPSTREAM: <carry>: Add make target to update bundle manifests and install bundle
e14a4ec UPSTREAM: <carry>: Remove old manifests
cc7b3cd UPSTREAM: <carry>: Fix OLM skipRange replacement
da70e89 UPSTREAM: <carry>: Update CSV after rebase
a6c70fa UPSTREAM: <carry>: Update Dockerfile images to match ART
33c48f5 UPSTREAM: <carry>: Update NMState CRD
4e0d9fe UPSTREAM: <carry>: Update 4.11 CSV file after rebase
ed3c3d1 UPSTREAM: <carry>: add priority class to operator CSV
465ae22 UPSTREAM: <carry>: Add qosClass to operator CSV
024a069 UPSTREAM: <carry>: Update Dockerfile images to match ART
6aab395 UPSTREAM: <carry>: Add manifests for 4.11
2f51948 UPSTREAM: <carry>: Add operators app label in CSV
d908538 UPSTREAM: <carry>: Update Dockerfile images to match ART
ba28219 UPSTREAM: <carry>: Remove initialization resource from CSV
943a83a UPSTREAM: <carry>: enable all archs in nmstate example CR
67e4240 UPSTREAM: <carry>: Add disconnected annotation for OperatorHub
607f4fd UPSTREAM: <carry>: Fix JSON error in initialization resource
26bcd49 UPSTREAM: <carry>: Add ppc64le and s390x to 4.10 CSV
f5c01ec UPSTREAM: <carry>: add arm64 to 4.10 CSV
ba9425f UPSTREAM: <carry>: Add 4.10 release OLM manifests
97f3643 UPSTREAM: <carry>: Provide default NMState CR
9b50408 UPSTREAM: <carry>: Remove serviceaccount manifest
9f5c002 UPSTREAM: <carry>: Update dockerfile to match ART
e0ae977 UPSTREAM: <carry>: update naming convention
93b48ef UPSTREAM: <carry>: Define the suggested namespace for NMState CR
1ed4511 UPSTREAM: <carry>: Update Dockerfile images to match ART
e12cac1 UPSTREAM: <carry>: Add manifests to .PHONY in Makefile
1523828 UPSTREAM: <carry>: Add manifests for 4.9
bb95b06 UPSTREAM: <carry>: Add manifests for 4.8
40f1e21 UPSTREAM: <carry>: Add manifests for 4.7
6202118 UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-operator images to be consistent with ART
@dougsland
developing-on-ocp: update README
dea34d4 
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-operator ima…
221bcf7 
…ges to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/8d4bab62fd4568f0a302cd46f27f2068a8869dfb/images/openshift-kubernetes-nmstate-operator.yml
UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-handler imag…
4a2793d 
…es to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/8d4bab62fd4568f0a302cd46f27f2068a8869dfb/images/openshift-kubernetes-nmstate-handler.yml
@mkowalski
UPSTREAM: <carry>: Use RHEL9 base images
f2add42
@mkowalski
UPSTREAM: <carry>: Allow setting custom namespace in tests
56cdc2d
@mkowalski
UPSTREAM: <carry>: Fix ssh-ci script to use proper env
10db371
@mkowalski
UPSTREAM: <carry>: Ignore test reporting due to some unknown bug
3d1942e
cybertron and others added 5 commits November 17, 2023 05:34
@cybertron
UPSTREAM: <carry>: Add script for correlating NMState/OCP versions
7045018 
We frequently get asked when a given version of NMState became
available and it's surprisingly difficult to determine that. This
script starts at the errata tool page for the handler image and
drills down to the corresponding Brew build logs to determine which
NMState version shipped in a given release.
@mkowalski
UPSTREAM: <carry>: Fix CI SSH proxy hack
22066e4 
After moving from Packet to OFCIR the config script got renamed. This PR
fixes it.
UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-handler imag…
eed54a8 
…es to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/36058631cc2f6fa02e42efff797846edb2d5b04e/images/openshift-kubernetes-nmstate-handler.yml
UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-operator ima…
5d64b03 
…ges to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/36058631cc2f6fa02e42efff797846edb2d5b04e/images/openshift-kubernetes-nmstate-operator.yml
@cybertron
Bump manifest versions to 4.15
fb24f3d
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 17, 2023

Hi @metal-net-merge-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 17, 2023
@mkowalski
Copy link

/ok-to-test
/approve
/lgtm

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 17, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 17, 2023
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 17, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: metal-net-merge-bot[bot], mkowalski

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 17, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 27108e9 and 2 for PR HEAD fb24f3d in total

@mkowalski
Copy link 

 +++ yq --version
./hack/ocp-bundle-common.sh: line 7: yq: command not found

Something changed in the build image I guess

@mkowalski
Copy link

Forget the above, the real issue is

 ./hack/check-gen.sh ocp-update-bundle-manifests
++ git status --porcelain
+ [[ -n  M manifests/stable/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml ]]
+ echo 'It seems like you need to run '\''make ocp-update-bundle-manifests'\''. Please run it and commit the changes'
It seems like you need to run 'make ocp-update-bundle-manifests'. Please run it and commit the changes
+ git status --porcelain
 M manifests/stable/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml
+ exit 1

so for some reason the updated manifest is different from the one we have in our repo

@mkowalski
Copy link

Reported mikefarah/yq#1869 as this is definitely regression between github.com/mikefarah/yq/v4@v4.35.2 and github.com/mikefarah/yq/v4@latest which is v4.40.1 today

@mkowalski
Copy link

/test e2e-handler-sdn-ipv4

@mkowalski
Copy link

/test check-generate-bundle

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 20, 2023

@metal-net-merge-bot[bot]: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 57d11cf into openshift:master Nov 20, 2023
7 checks passed
@mkowalski mkowalski deleted the rebase-bot-master branch November 20, 2023 09:11
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-kubernetes-nmstate-operator-container-v4.15.0-202311201056.p0.g57d11cf.assembly.stream for distgit openshift-kubernetes-nmstate-operator.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-kubernetes-nmstate-handler-rhel-9-container-v4.15.0-202311201056.p0.g57d11cf.assembly.stream for distgit openshift-kubernetes-nmstate-handler.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougsland dougsland Awaiting requested review from dougsland

@mkowalski mkowalski Awaiting requested review from mkowalski

Assignees

@mkowalski mkowalski

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@mkowalski @openshift-ci-robot @openshift-bot @qinqon @cybertron @creydr @dougsland @bcrochet