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.

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

Merge main 2023 01 27 fad5e524 #334

Closed
wants to merge 29 commits into from
Closed

Merge main 2023 01 27 fad5e524 #334

wants to merge 29 commits into from

Conversation

dougsland
Copy link

Rebase upstream

creydr and others added 28 commits October 21, 2022 06:21
Podman v4 seems to be wider available now (e.g. on Fedora, CentOS
Stream) so we can enable this option again.

This reverts commit f839932.

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.6 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.13.6...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Or Shoval <oshoval@redhat.com>

Signed-off-by: Or Shoval <oshoval@redhat.com>
…mstate#800)

* Extract bridge package from helper.

Helper is a general name that may represent anything.
Extracting bridge module from it improves the code stucture a little by
having a smaller, focused package, that does what its name suggest.

Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>

* Move EventIsForThisNode function to node package

Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>

* Rename helper package to client

The helper package now contains only client.go.
Rename it to represent it's actual content.

Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>

Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.13.9...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* go: Bump to v1.18

Looks like v1.17 is not at centos9 anymore, that's a problem for
rust branch where we are using centos9 and also in the future.

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

* lint: Bump golangci-lint to v1.50.1

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

* lint: Fix new linger errors

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Looks like Jekyll has a pin to a old Liquid version that does not works
with ruby 3.2, this change pins to ruby 3.1 so there is no issue.

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
The buildx version provided with latest docker is more than enough to
has the features needed by the project. This change remove the install
and initialization to reduce complexity and versions missalignments.

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Currently CI is blocked at nmstate bug [1] and the fix is not landing
centos stream 8 since there is a problem at the nmstate supply chain
[2].

This change use Gris dnf repo temporaly while the issue is fixed.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=2158151
[2] https://issues.redhat.com/browse/CS-1373

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Sometimes a pending checkpoint is lingering around, for example when a
handler pod has being restarted before reaching Commit, also looks like
the checkpoint feature is not used except for kubernetes-nmstate. This
change do Rollback to remove the pending checkpoing before Apply since
apply on pending checkpoing fails.

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Petr Horacek <hrck@protonmail.com>

Signed-off-by: Petr Horacek <hrck@protonmail.com>
Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
)

This reverts commit 4bb0cd0.

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 9daf03f)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit a6d66ae)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
…ges to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/openshift-kubernetes-nmstate-operator.yml

(cherry picked from commit 967ed2e)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
…es to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/openshift-kubernetes-nmstate-handler.yml

(cherry picked from commit b0f5585)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
This reverts commit 1aeee49.

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 7bf52c8)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
…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>
…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>
Remove yboaron and creydr from OWNERS file as we both left the
OpenShift kubernetes-nmstate project.

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit ae7132f)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 6d09f69)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
…es to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/openshift-kubernetes-nmstate-handler.yml

(cherry picked from commit 996d23c)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
  - added the ipv4 example for NodeNetworkConfigurationPolicy interface in bundle csv
  - replicate the change in the manifests directory for ART

Signed-off-by: Nishant Parekh <nparekh@redhat.com>
Signed-off-by: Douglas Schilling Landgraf <dlandgra@redhat.com>
(cherry picked from commit dc96322)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
The NNCP API is not defined in the manifests and as a result this
causes CVP test failures. We only need to provide an example for the
NMState object.

(cherry picked from commit 39d426e)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
The CVP tests are unhappy with the missing spec field, and although
we don't actually need or want one let's provide something to make
the check happy.

Note that the spec on NMState is largely used to control pod placement,
and the default behavior is what will be wanted in the majority of
cases. Setting any value on this object may result in undesirable
behavior.

(cherry picked from commit ccf1f1c)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Adding myself as a new team member of the BM Networking Team.

(cherry picked from commit 2c7e90d)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
@dougsland
Copy link
Author

/cc @cybertron

@openshift-ci openshift-ci bot requested a review from cybertron January 27, 2023 19:25
@openshift-ci openshift-ci bot requested a review from qinqon January 27, 2023 19:25
@openshift-ci
Copy link

openshift-ci bot commented Jan 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dougsland

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 Jan 27, 2023
@dougsland
Copy link
Author

/retest

@dougsland
Copy link
Author

dougsland commented Jan 27, 2023

I see in the jobs:

the build kubernetes-nmstate-handler failed after 1m24s with reason DockerBuildFailed: Dockerfile build 
strategy has failed.
Storing signatures [2/2] STEP 2/8: ENV "BUILD_LOGLEVEL"="0" 
[2/2] STEP 3/8: RUN microdnf -y update &&     microdnf -y ...b
iputils  iproute &&     microdnf clean all /bin/sh: 
microdnf: command not found error: build error: error building at 
STEP "RUN microdnf -...nf clean all": error while running runtime: 
exit status 127

@dougsland
Copy link
Author

@cybertron looks like we don't have microdnf around at this time.

@dougsland
Copy link
Author

/retest

During the rebase it was removed and it's needed for
microdnf

Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
@openshift-ci
Copy link

openshift-ci bot commented Jan 31, 2023

@dougsland: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-operator-ovn-ipv4 c79d51a link false /test e2e-operator-ovn-ipv4
ci/prow/e2e-operator-sdn-ipv4 c79d51a link true /test e2e-operator-sdn-ipv4
ci/prow/e2e-handler-ovn-ipv4 c79d51a link false /test e2e-handler-ovn-ipv4
ci/prow/e2e-handler-sdn-ipv4 c79d51a link true /test e2e-handler-sdn-ipv4
ci/prow/images c79d51a link true /test images
ci/prow/check-generate-bundle c79d51a link true /test check-generate-bundle

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.

@dougsland
Copy link
Author

I will open a new one.

@dougsland dougsland closed this Jan 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants