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 (d47c561) into master #479

Merged
merged 48 commits into from
May 8, 2024
Merged

Merge https://github.com/nmstate/kubernetes-nmstate:main (d47c561) into master #479

merged 48 commits into from
May 8, 2024

Conversation

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

No description provided.

@qinqon
e2e, handler: Check neighbors at lldp test (nmstate#1236)
6ac1567 
Start lldpd at a node and check that neighbors get reported at nns at
the enabled LLDP test.

Signed-off-by: Enrique Llorente <[email protected]>
@openshift-ci openshift-ci bot requested review from mkowalski and qinqon April 30, 2024 05:40
@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 Apr 30, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 30, 2024

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.

@mkowalski
Copy link

/hold

First #478

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2024
@mkowalski
Copy link

/hold cancel
/lgtm
/approve
/ok-to-test

@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 do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 30, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2024
@qinqon qinqon mentioned this pull request Apr 30, 2024
Open
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 30, 2024

[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 Apr 30, 2024
@qinqon
Copy link

qinqon commented Apr 30, 2024

/retest

Memory issue

reason OOMKilled

@mkowalski
Copy link 

  > Enter �[1m[It]�[0m should report a metrics with proper gauge increased �[38;5;243m- /go/src/github.com/openshift/kubernetes-nmstate/test/e2e/handler/metrics_test.go:67 @ 04/30/24 08:54:41.169�[0m
  ./cluster/kubectl.sh exec -n monitoring prometheus-k8s-0 -c prometheus -- cat /var/run/secrets/kubernetes.io/serviceaccount/token
  stdout: ...,
  stderr: Error from server (NotFound): namespaces "monitoring" not found

  �[38;5;9m[FAILED] Unexpected error:
      <*errors.errorString | 0xc001314550>: 
      ./cluster/kubectl.shexec -n monitoring prometheus-k8s-0 -c prometheus -- cat /var/run/secrets/kubernetes.io/serviceaccount/token : Error from server (NotFound): namespaces "monitoring" not found
       exit status 1
      {
          s: "./cluster/kubectl.shexec -n monitoring prometheus-k8s-0 -c prometheus -- cat /var/run/secrets/kubernetes.io/serviceaccount/token : Error from server (NotFound): namespaces \"monitoring\" not found\n exit status 1",
      }
  occurred�[0m

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b5a1fd8 and 2 for PR HEAD d8939c2 in total

@qinqon
Copy link

qinqon commented May 6, 2024

/retest

not related

 > Enter �[1m[ReportBeforeEach]�[0m TOP-LEVEL �[38;5;243m- /go/src/github.com/openshift/kubernetes-nmstate/test/e2e/handler/main_test.go:135 @ 04/30/24 13:47:20.358�[0m
  �[38;5;9m[FAILED] Unexpected error:
      <*errors.errorString | 0xc000c6a950>: 
      ./hack/ssh-ci.shworker-0 -- /usr/bin/nmcli c s : ssh: connect to host 128.31.20.106 port 22: Connection refused
       exit status 255
      {
          s: "./hack/ssh-ci.shworker-0 -- /usr/bin/nmcli c s : ssh: connect to host 128.31.20.106 port 22: Connection refused\r\n exit status 255",
      }
  occurred�

@mkowalski
Copy link

/label rebase/manual

@openshift-ci openshift-ci bot added rebase/manual Indicates the PR should not be rebased by the rebasebot. and removed lgtm Indicates that a PR is ready to be merged. labels May 6, 2024
@mkowalski
Copy link

It is better, but still some flakes with monitoring

  > Enter �[1m[It]�[0m should report a metrics with proper gauge increased �[38;5;243m- /go/src/github.com/openshift/kubernetes-nmstate/test/e2e/handler/metrics_test.go:67 @ 05/06/24 10:23:29.957�[0m
  ./cluster/kubectl.sh exec -n openshift-monitoring prometheus-k8s-0 -c prometheus -- cat /var/run/secrets/kubernetes.io/serviceaccount/token
  stdout: eyJhbGciOiJSUzI1NiIsImtpZCI6ImxHZlNDTnZFWUNBVURtU1NzQWVfMmpSNEpkbWxtNzM5cFZXV3RNdnpyN00ifQ.eyJhdWQiOlsiaHR0cHM6Ly9rdWJlcm5ldGVzLmRlZmF1bHQuc3ZjIl0sImV4cCI6MTc0NjUyNDg0NCwiaWF0IjoxNzE0OTg4ODQ0LCJpc3MiOiJodHRwczovL2t1YmVybmV0ZXMuZGVmYXVsdC5zdmMiLCJrdWJlcm5ldGVzLmlvIjp7Im5hbWVzcGFjZSI6Im9wZW5zaGlmdC1tb25pdG9yaW5nIiwicG9kIjp7Im5hbWUiOiJwcm9tZXRoZXVzLWs4cy0wIiwidWlkIjoiZTUwYmY5NmEtMDNhNC00ZTkwLWJmOTMtNTEwN2U5Yzk4MGExIn0sInNlcnZpY2VhY2NvdW50Ijp7Im5hbWUiOiJwcm9tZXRoZXVzLWs4cyIsInVpZCI6ImVhZWMzOGRjLTcxN...,
  stderr: 
  ./cluster/kubectl.sh get pod -n openshift-nmstate --no-headers=true -o custom-columns=:metadata.name -l component=kubernetes-nmstate-metrics
  stdout: nmstate-metrics-7d757cb68d-gpcsd
  ...,
  stderr: 
  ./cluster/kubectl.sh exec -n openshift-nmstate nmstate-metrics-7d757cb68d-gpcsd -- curl -s -k --header Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImxHZlNDTnZFWUNBVURtU1NzQWVfMmpSNEpkbWxtNzM5cFZXV3RNdnpyN00ifQ.eyJhdWQiOlsiaHR0cHM6Ly9rdWJlcm5ldGVzLmRlZmF1bHQuc3ZjIl0sImV4cCI6MTc0NjUyNDg0NCwiaWF0IjoxNzE0OTg4ODQ0LCJpc3MiOiJodHRwczovL2t1YmVybmV0ZXMuZGVmYXVsdC5zdmMiLCJrdWJlcm5ldGVzLmlvIjp7Im5hbWVzcGFjZSI6Im9wZW5zaGlmdC1tb25pdG9yaW5nIiwicG9kIjp7Im5hbWUiOiJwcm9tZXRoZXVzLWs4cy0wIiwidWlkIjoiZTUwYmY5NmEtMDNhNC00ZTkwLWJmOTMtNTEwN2U5Yzk4MGExIn0sInNlcnZpY2VhY2NvdW50Ijp7Im5hbWUiOiJwcm9tZXRoZXVzLWs4cyIsInVpZCI6ImVhZWMzOGRjLTcxNGMtNDEwNy1hMzBlLTUyYzNlYWFiMTY1OCJ9LCJ3YXJuYWZ0ZXIiOjE3MTQ5OTI0NTF9LCJuYmYiOjE3MTQ5ODg4NDQsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpvcGVuc2hpZnQtbW9uaXRvcmluZzpwcm9tZXRoZXVzLWs4cyJ9.JIRkmdp3N4rxUNIXJlKO2QyVNHIHcZwjoouXfVC4cul2tT2h0OQOTGxvvmCQh8_e6hMjKpDSUNiS0hMtxnTK4ad8QDeKfoxV9TZGtk-4sMttlAFfsDrifofr3c52YJeTO9ZER3mxgbWHqe-VPZnYTRuiDNYwdO34so4pJJyMzweCPuON7Cq3knx7_NRQ6m3yZu0EgzpsiDBybs3Y3g2zXpgf0ktOlya9NdJs3iVftvzWW_499fWUBIniU4DivLr0sxyqi-rjXZXFJzIir49SMgsKBRhyD7SteHlqpsOCJwTAJM7WCjdQf-7r0jooB6SUZDe2RMK96GVrVWecMHRo0scfN2a6Shn7FMouu7PVmVaNtJar1e62xdakyj4nZ0TkSx8yl42_yl2qdkxEvRYR8g3wFpIL0qpA5RNChbafSgl5Fod7zzjZbVT4EhI_F4NuTFm3rsZuKQeE0BekTg6VmqHmEVwYLDUnP3GHQB1Po2jap1RoJXwU8wUhMJ7_f_ZALxPvkQTyeTLnzMBSefnv4xCH4lhC_8pGNe4f9dpYlMVLXdpKNMSbLwrxqAUntpw9TLYXsyIM4FXv7wIBjQfAc2x6NLJWAdbtzv7YPLoXUxTqU3GMTghOyYrnzH_G7E8lVZ5LOAngQIQVvg1A4D4KT2QFTTzenIzc5z1d5PzoRpE :8089 https://127.0.0.1:8443/metrics
  stdout: # HELP certwatcher_read_certificate_errors_total Total number of certificate read errors
  # TYPE certwatcher_read_certificate_errors_total counter
  certwatcher_read_certificate_errors_total 0
  # HELP certwatcher_read_certificate_total Total number of certificate reads
  # TYPE certwatcher_read_certificate_total counter
  certwatcher_read_certificate_total 0
  # HELP controller_runtime_active_workers Number of currently used workers per controller
  # TYPE controller_runtime_active_workers gauge
  controller_...,
  stderr: Defaulted container "nmstate-metrics" out of: nmstate-metrics, kube-rbac-proxy

  < Exit �[1m[It]�[0m should report a metrics with proper gauge increased �[38;5;243m- /go/src/github.com/openshift/kubernetes-nmstate/test/e2e/handler/metrics_test.go:67 @ 05/06/24 10:23:30.849 (892ms)�[0m

@mkowalski
Copy link

/test e2e-handler-ovn-ipv4

maiqueb and others added 2 commits May 6, 2024 17:44
@maiqueb
api: add ovn bridge mappings to node network state (nmstate#1237)
84ca0cb 
Signed-off-by: Miguel Duarte Barroso <[email protected]>
@mkowalski
e2e: parametrize monitoring namespace (nmstate#1239)
d47c561 
This PR adds ability to manually configure monitoring namespace by using
`MONITORING_NAMESPACE` env variable passed to Makefile, e.g. when
executing

```
make test-e2e-handler
```

With this change we can run e2e tests in OpenShift clusters which use a
different name than our hardcoded `monitoring`.

Signed-off-by: Mat Kowalski <[email protected]>
@mkowalski
Copy link

/remove-label rebase/manual

@openshift-ci openshift-ci bot removed the rebase/manual Indicates the PR should not be rebased by the rebasebot. label May 7, 2024
mkowalski and others added 19 commits May 8, 2024 05:35
@mkowalski
UPSTREAM: <carry>: Allow setting custom namespace in tests
7732f92
@mkowalski
UPSTREAM: <carry>: Fix ssh-ci script to use proper env
bc9c4bf
@mkowalski
UPSTREAM: <carry>: Ignore test reporting due to some unknown bug
6a57af9
@cybertron
UPSTREAM: <carry>: Add script for correlating NMState/OCP versions
2798b81 
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
4fe744f 
After moving from Packet to OFCIR the config script got renamed. This PR
fixes it.
UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-handler imag…
7b6e609 
…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…
43b4372 
…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
2d619f1
@mkowalski
deps: freeze yq to 4.35.2
48e1242
@cybertron
Handle RHEL 9-based images in nmstate-version script
5a84484 
Since we moved to RHEL 9 in 4.14 for the container images the builds
no longer show up on the RHEL 8 page. This adds logic to make sure we
look in the right place based on the requested OCP version.
UPSTREAM: <carry>: Updating openshift-kubernetes-nmstate-handler-rhel…
2d7b844 
…-9-container image to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/openshift-kubernetes-nmstate-handler.yml
UPSTREAM: <carry>: Updating ose-kubernetes-nmstate-operator-container…
2bcc46e 
… image to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/openshift-kubernetes-nmstate-operator.yml
@cybertron
Add .snyk file to ignore vendor and test files
ef4cdd5 
These files either come from other projects or are not used in
production so there's no reason to security scan them.
@cybertron
Remove Doug from OWNERS
cfd1221 
He's no longer working on the project so there's no sense having the
bot autoassign him.
@cybertron
OCPBUGS-28780: Bump manifest versions to 4.16
4a4b87b
@mkowalski
OCPBUGS-30559: Add FIPS and other OpenShift-required annotations
3c19bab
@qinqon
handler: Expose nmstatectl stats as k8s metrics (nmstate#1221)
356d063 
Now that nmstatectl is able to calculate some useful stats from network
configuration [1], we can bubble them up and expose them as k8s metrics so
k-nmstate users can digg on them using prometheus, graphana or the like.

This change add a new "Features" under nnce Status with the output of
`nmstatectl st` and also create a new deployment `nmstate-metrics` that
will gather the NNCEs features and reflecta that at a cluster wide
gaugue prometheus metric.

[1] nmstate/nmstate#2420

Signed-off-by: Enrique Llorente <[email protected]>
@mkowalski
metrics: change port used by metrics server
11d7f3c 
Currently metrics server uses port `:8080` what has a high chance of
conflicting with other services. In order to decrease a chance of the
conflict we are moving to `:8089`.

Signed-off-by: Mat Kowalski <[email protected]>
@mkowalski
UPSTREAM: <carry> Update manifests
34dcd06
@metal-net-merge-bot metal-net-merge-bot bot changed the title Merge https://github.com/nmstate/kubernetes-nmstate:main (6ac1567) into master Merge https://github.com/nmstate/kubernetes-nmstate:main (d47c561) into master May 8, 2024
@mkowalski
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented May 8, 2024 •
edited
Loading

@metal-net-merge-bot[bot]: The following test 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-handler-sdn-ipv4 d8939c2 link true /test e2e-handler-sdn-ipv4

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.

@qinqon
Copy link

qinqon commented May 8, 2024

/override ci/prow/e2e-handler-ovn-ipv4

It's failing on the veth vs ethernet issue

 Test didn't return to initial state on node worker-0
  Expected
      <string>: {
        "0d74d2b4caefe54": "ignore",
        "458ef2f1efe5136": "ignore",
        "51d376a60df09fd": "ignore",
        "948becc934ab9a8": "ignore",
        "b6cac256fda2bed": "ignore",
        "br-ex": "up",
        "br-int": "ignore",
        "e1fa5c522393272": "ignore",
        "enp1s0": "up",
        "enp2s0": "up",
        "enp3s0": "up",
        "enp4s0": "up",
        "f94fcea60702d89": "ignore",
        "genev_sys_6081": "ignore",
        "lo": "up",
        "ovn-k8s-mp0": "ignore",
        "patch-br-ex_worker-0-to-br-int": "ignore",
        "patch-br-int-to-br-ex_worker-0": "ignore"
      }
  to match JSON of
      <string>: {
        "1ae302a0f62b7f8": "ignore",
        "5562deed4f6dfd9": "ignore",
        "815a75b776d684c": "ignore",
        "8d5d9c85811d2c1": "ignore",
        "afa7dba90f033fb": "ignore",
        "b687633470bb358": "ignore",
        "br-ex": "up",
        "br-int": "ignore",
        "d972a6ef092c985": "ignore",
        "enp1s0": "up",
        "enp2s0": "up",
        "enp3s0": "up",
        "enp4s0": "up",
        "genev_sys_6081": "ignore",
        "lo": "up",
        "ovn-k8s-mp0": "ignore",
        "patch-br-ex_worker-0-to-br-int": "ignore",
        "patch-br-int-to-br-ex_worker-0": "ignor

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented May 8, 2024

@qinqon: Overrode contexts on behalf of qinqon: ci/prow/e2e-handler-ovn-ipv4

In response to this:

/override ci/prow/e2e-handler-ovn-ipv4

It's failing on the veth vs ethernet issue

Test didn't return to initial state on node worker-0
 Expected
     <string>: {
       "0d74d2b4caefe54": "ignore",
       "458ef2f1efe5136": "ignore",
       "51d376a60df09fd": "ignore",
       "948becc934ab9a8": "ignore",
       "b6cac256fda2bed": "ignore",
       "br-ex": "up",
       "br-int": "ignore",
       "e1fa5c522393272": "ignore",
       "enp1s0": "up",
       "enp2s0": "up",
       "enp3s0": "up",
       "enp4s0": "up",
       "f94fcea60702d89": "ignore",
       "genev_sys_6081": "ignore",
       "lo": "up",
       "ovn-k8s-mp0": "ignore",
       "patch-br-ex_worker-0-to-br-int": "ignore",
       "patch-br-int-to-br-ex_worker-0": "ignore"
     }
 to match JSON of
     <string>: {
       "1ae302a0f62b7f8": "ignore",
       "5562deed4f6dfd9": "ignore",
       "815a75b776d684c": "ignore",
       "8d5d9c85811d2c1": "ignore",
       "afa7dba90f033fb": "ignore",
       "b687633470bb358": "ignore",
       "br-ex": "up",
       "br-int": "ignore",
       "d972a6ef092c985": "ignore",
       "enp1s0": "up",
       "enp2s0": "up",
       "enp3s0": "up",
       "enp4s0": "up",
       "genev_sys_6081": "ignore",
       "lo": "up",
       "ovn-k8s-mp0": "ignore",
       "patch-br-ex_worker-0-to-br-int": "ignore",
       "patch-br-int-to-br-ex_worker-0": "ignor

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-merge-bot openshift-merge-bot bot merged commit a07ccf4 into openshift:master May 8, 2024
7 checks passed
@mkowalski mkowalski deleted the rebase-bot-master branch May 8, 2024 10:56
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-kubernetes-nmstate-operator-container-v4.17.0-202405081416.p0.ga07ccf4.assembly.stream.el9 for distgit openshift-kubernetes-nmstate-operator.
All builds following this will include this PR.

mkowalski pushed a commit to mkowalski/kubernetes-nmstate that referenced this pull request May 9, 2024
@openshift-merge-bot @mkowalski
Merge pull request openshift#479 from openshift-networking/rebase-bot…
933d858 
…-master

Merge https://github.com/nmstate/kubernetes-nmstate:main (d47c561) into master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkowalski mkowalski Awaiting requested review from mkowalski

@qinqon qinqon Awaiting requested review from qinqon

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.
9 participants
@mkowalski @qinqon @openshift-ci-robot @openshift-bot @maiqueb @cybertron @creydr @dougsland @bcrochet