Skip to content

Conversation

@aojea
Copy link
Contributor

@aojea aojea commented Jan 28, 2023

Add network plugin metrics.

The metrics are the same that were used in dockershim/kubelet until it was deprecated in kubernetes 1.23

https://github.com/kubernetes/kubernetes/blob/release-1.23/pkg/kubelet/dockershim/network/metrics/metrics.go

Signed-off-by: Antonio Ojea [email protected]

Cherry-pick #7858

Add network plugin metrics.

The metrics are the same that were used in dockershim/kubelet until
it was deprecated in kubernetes 1.23

https://github.com/kubernetes/kubernetes/blob/release-1.23/pkg/kubelet/dockershim/network/metrics/metrics.go

Signed-off-by: Antonio Ojea <[email protected]>
@k8s-ci-robot
Copy link

Hi @aojea. Thanks for your PR.

I'm waiting for a containerd 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.

Details

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.

@aojea
Copy link
Contributor Author

aojea commented Jan 28, 2023

/assign @mikebrow @fuweid
/cc @MrHohn

@k8s-ci-robot
Copy link

@aojea: GitHub didn't allow me to request PR reviews from the following users: MrHohn.

Note that only containerd members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

/assign @mikebrow @fuweid
/cc @MrHohn

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.

@fuweid fuweid changed the title Backport network plugin metrics to 1.6 [release/1.6] add network plugin metrics Jan 28, 2023
@fuweid
Copy link
Member

fuweid commented Jan 28, 2023

[It] runtime should support portforward [Conformance]

The flaky testcase has been fixed in critools kubernetes-sigs/cri-tools#1026

Retrying

REF: https://github.com/containerd/containerd/actions/runs/4031448920/jobs/6930978120

Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on green

@samuelkarp
Copy link
Member

/ok-to-test

@fuweid fuweid merged commit 84000cd into containerd:release/1.6 Jan 29, 2023
Mengkzhaoyun pushed a commit to open-beagle/containerd that referenced this pull request Feb 13, 2023
containerd 1.6.17

Welcome to the v1.6.17 release of containerd!

The seventeenth patch release for containerd 1.6 includes various updates.

* **Add network plugin metrics** ([#8018](containerd/containerd#8018))
* **Update mkdir permission on /etc/cni to 0755 instead of 0700** ([#8030](containerd/containerd#8030))
* **Export remote snapshotter label handler** ([#8054](containerd/containerd#8054))
* **Add support for default hosts.toml configuration** ([#8065](containerd/containerd#8065))

See the changelog for complete list of changes

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

* Derek McGowan
* Akihiro Suda
* Jess
* Antonio Ojea
* Kohei Tokunaga
* Phil Estes
* Wei Fu
<details><summary>11 commits</summary>
<p>

* [release/1.6] Prepare release notes for v1.6.17 ([#8080](containerd/containerd#8080))
  * [`a1aa9b900`](containerd/containerd@a1aa9b9) Prepare release notes for v1.6.17
* [1.6] Backport default registry hosts config ([#8065](containerd/containerd#8065))
  * [`1436641b8`](containerd/containerd@1436641) Support default hosts.toml configuration
  * [`87acecd04`](containerd/containerd@87acecd) Update hosts doc
* [release/1.6 backport] Export remote snapshotter label handler ([#8054](containerd/containerd#8054))
  * [`a6544ed7d`](containerd/containerd@a6544ed) Export remote snapshotter label handler
* [release/1.6] cri: mkdir /etc/cni with 0755, not 0700 ([#8030](containerd/containerd#8030))
  * [`ae02a24a3`](containerd/containerd@ae02a24) cri: mkdir /etc/cni with 0755, not 0700
* [release/1.6] add network plugin metrics ([#8018](containerd/containerd#8018))
  * [`6c6cc5ec1`](containerd/containerd@6c6cc5e) add network plugin metrics
</p>
</details>

This release has no dependency changes

Previous release can be found at [v1.6.16](https://github.com/containerd/containerd/releases/tag/v1.6.16)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants