Skip to content

Commit

Permalink
update components
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed May 21, 2020
1 parent fab326e commit da7a705
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,12 +1,12 @@
# Fedora 31 (cgroup v2) on Vagrant
# Fedora (cgroup v2) on Vagrant
dist: bionic
language: generic
cache:
directories:
- /home/travis/.vagrant.d/boxes
env:
global:
- VAGRANT_VERSION=2.2.7
- VAGRANT_VERSION=2.2.9
install:
- sudo apt-get remove -q -y 'docker*' && sudo rm -rf /etc/docker && curl -fsSL https://get.docker.com | sh
# https://github.com/alvistack/ansible-role-virtualbox/blob/6887b020b0ca5c59ddb6620d73f053ffb84f4126/.travis.yml#L30
Expand Down
28 changes: 14 additions & 14 deletions Dockerfile
Expand Up @@ -4,28 +4,28 @@
### Version definitions
# use ./hack/show-latest-commits.sh to get the latest commits

# 2020-04-27T04:00:32Z
ARG ROOTLESSKIT_COMMIT=3b1290add414a9d97fb9120fb76b432027e26103
# 2020-04-27T14:57:56Z
ARG CONTAINERD_COMMIT=3f95bc5f18a7d9dceb1e7502d2fc6120900c5bfb
# 2020-03-09T08:58:15Z
ARG CONTAINERD_FUSE_OVERLAYFS_COMMIT=86d17da27d9d344ab1681245176cc31190076d5d
# 2020-04-28T20:40:00Z
ARG CRIO_COMMIT=324422bb1c2c2d82592e5689eae16f31d5496d5b
# 2020-04-28T22:58:24Z
ARG KUBERNETES_COMMIT=961a5ed144cf0f2f4e2d858beb8cc0cfdd822c1b
# 2020-05-11T01:17:05Z
ARG ROOTLESSKIT_COMMIT=748ea095d9b18f9ea9e8a3487a2e43dce534ca8c
# 2020-05-20T19:46:50Z
ARG CONTAINERD_COMMIT=1c58c5d440f424e2d192f35f02306c5dc1a1e8c9
# 2020-05-12T01:55:15Z
ARG CONTAINERD_FUSE_OVERLAYFS_COMMIT=32086ef23a5a20250f4282426bae855d42ff45b3
# 2020-05-20T14:14:21Z
ARG CRIO_COMMIT=ad83d2a35a30b8a336b16a0ea5f7afc6aebfb9b7
# 2020-05-21T10:30:36Z
ARG KUBERNETES_COMMIT=bded41a817a84cd7e51fa535ad6def319a892a3c

# Version definitions (cont.)
ARG SLIRP4NETNS_RELEASE=v1.0.1
ARG CONMON_RELEASE=v2.0.15
ARG SLIRP4NETNS_RELEASE=v1.1.0-beta.1
ARG CONMON_RELEASE=v2.0.16
ARG CRUN_RELEASE=0.13
ARG FUSE_OVERLAYFS_RELEASE=v1.0.0
# Kube's build script requires KUBE_GIT_VERSION to be set to a semver string
ARG KUBE_GIT_VERSION=v1.19.0-usernetes
ARG SOCAT_RELEASE=1.7.3.4
ARG CNI_PLUGINS_RELEASE=v0.8.5
ARG CNI_PLUGINS_RELEASE=v0.8.6
ARG FLANNEL_RELEASE=v0.12.0
ARG ETCD_RELEASE=v3.4.7
ARG ETCD_RELEASE=v3.4.8

### Common base images (common-*)
FROM alpine:3.11 AS common-alpine
Expand Down
@@ -1,4 +1,4 @@
From cd10b8fc8864d2d0eb35c140656445b61010f1e7 Mon Sep 17 00:00:00 2001
From a585619def7b9e0856bb9bc0d667bdd62a7e3ba2 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Tue, 21 Aug 2018 16:45:04 +0900
Subject: [PATCH 1/3] kubelet/cm: ignore sysctl error when running in userns
Expand All @@ -10,7 +10,7 @@ Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD
index 3ed3ec523d6..cbd118f4458 100644
index b1fd5530a27..39e320e9cfc 100644
--- a/pkg/kubelet/cm/BUILD
+++ b/pkg/kubelet/cm/BUILD
@@ -73,6 +73,7 @@ go_library(
Expand All @@ -30,15 +30,15 @@ index 3ed3ec523d6..cbd118f4458 100644
"//vendor/k8s.io/utils/mount:go_default_library",
"//vendor/k8s.io/utils/path:go_default_library",
diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go
index 73b02e9413c..b672791bd6f 100644
index a56bf8dc83d..da74a0fb6d6 100644
--- a/pkg/kubelet/cm/container_manager_linux.go
+++ b/pkg/kubelet/cm/container_manager_linux.go
@@ -32,6 +32,7 @@ import (
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/configs"
+ libcontainersystem "github.com/opencontainers/runc/libcontainer/system"
"k8s.io/klog"
"k8s.io/klog/v2"
utilio "k8s.io/utils/io"
"k8s.io/utils/mount"
@@ -420,7 +421,11 @@ func setupKernelTunables(option KernelTunableBehavior) error {
Expand Down
@@ -1,4 +1,4 @@
From f8fd3dce67a5c010a41690cfd27bf3fa4c8ffc61 Mon Sep 17 00:00:00 2001
From 9f8c9f5140b41b9a4f52b63273aa720376e4775f Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Thu, 23 Aug 2018 14:14:44 +0900
Subject: [PATCH 2/3] kube-proxy: allow running in userns
Expand All @@ -12,7 +12,7 @@ Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD
index 0c88dd2cd8d..9ef541d7b1d 100644
index 7f519212c3e..62d8a05a1ae 100644
--- a/cmd/kube-proxy/app/BUILD
+++ b/cmd/kube-proxy/app/BUILD
@@ -87,6 +87,7 @@ go_library(
Expand Down Expand Up @@ -104,7 +104,7 @@ index 0c88dd2cd8d..9ef541d7b1d 100644
],
"@io_bazel_rules_go//go/platform:windows": [
diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go
index 38cd4c14deb..101719414b8 100644
index 2692a64c211..7d9d7bb1fe1 100644
--- a/cmd/kube-proxy/app/server_others.go
+++ b/cmd/kube-proxy/app/server_others.go
@@ -35,6 +35,7 @@ import (
Expand Down Expand Up @@ -138,19 +138,19 @@ index 38cd4c14deb..101719414b8 100644
NodeRef: nodeRef,
MetricsBindAddress: config.MetricsBindAddress,
diff --git a/pkg/proxy/userspace/BUILD b/pkg/proxy/userspace/BUILD
index 79348fdb792..f492370995b 100644
index 4f292e73399..1c75026b5e6 100644
--- a/pkg/proxy/userspace/BUILD
+++ b/pkg/proxy/userspace/BUILD
@@ -34,6 +34,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/cloud-provider/service/helpers:go_default_library",
+ "//vendor/github.com/opencontainers/runc/libcontainer/system:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library",
"//vendor/k8s.io/utils/net:go_default_library",
diff --git a/pkg/proxy/userspace/proxier.go b/pkg/proxy/userspace/proxier.go
index a2f6090b815..9bb3f328c3b 100644
index 6b4f5ce451d..ac54510d36b 100644
--- a/pkg/proxy/userspace/proxier.go
+++ b/pkg/proxy/userspace/proxier.go
@@ -26,6 +26,7 @@ import (
Expand Down
@@ -1,4 +1,4 @@
From c161fb705f9f91ddba3c37dba40eab0cdcf281f9 Mon Sep 17 00:00:00 2001
From 50517c0621dd085163a2214f4f9ceb5b30c4ad1a Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Sun, 2 Jun 2019 18:39:05 +0900
Subject: [PATCH 3/3] kubelet: new feature gate: SupportNoneCgroupDriver
Expand All @@ -23,10 +23,10 @@ Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
9 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go
index b34c693e5f9..9df7d6c67ac 100644
index 3ce0b652884..6a6f08281ce 100644
--- a/cmd/kubelet/app/options/options.go
+++ b/cmd/kubelet/app/options/options.go
@@ -502,7 +502,7 @@ func AddKubeletConfigFlags(mainfs *pflag.FlagSet, c *kubeletconfig.KubeletConfig
@@ -503,7 +503,7 @@ func AddKubeletConfigFlags(mainfs *pflag.FlagSet, c *kubeletconfig.KubeletConfig
fs.StringVar(&c.SystemCgroups, "system-cgroups", c.SystemCgroups, "Optional absolute name of cgroups in which to place all non-kernel processes that are not already inside a cgroup under '/'. Empty for no container. Rolling back the flag requires a reboot.")

fs.BoolVar(&c.CgroupsPerQOS, "cgroups-per-qos", c.CgroupsPerQOS, "Enable creation of QoS cgroup hierarchy, if true top level QoS and pod cgroups are created.")
Expand All @@ -36,10 +36,10 @@ index b34c693e5f9..9df7d6c67ac 100644
fs.StringVar(&c.CPUManagerPolicy, "cpu-manager-policy", c.CPUManagerPolicy, "CPU Manager policy to use. Possible values: 'none', 'static'. Default: 'none'")
fs.DurationVar(&c.CPUManagerReconcilePeriod.Duration, "cpu-manager-reconcile-period", c.CPUManagerReconcilePeriod.Duration, "<Warning: Alpha feature> CPU Manager reconciliation period. Examples: '10s', or '1m'. If not supplied, defaults to 'NodeStatusUpdateFrequency'")
diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
index 2368bd15299..9edc4479648 100644
index 3639ce18b1f..67c5dfddd84 100644
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -607,26 +607,30 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, featureGate f
@@ -600,26 +600,30 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, featureGate f
}

var cgroupRoots []string
Expand Down Expand Up @@ -89,7 +89,7 @@ index 2368bd15299..9edc4479648 100644

if kubeDeps.CAdvisorInterface == nil {
diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index bc03cbc2f67..73be09c7361 100644
index 4a8f6a5d05d..03957fbb884 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -574,6 +574,18 @@ const (
Expand Down Expand Up @@ -120,7 +120,7 @@ index bc03cbc2f67..73be09c7361 100644
// inherited features from generic apiserver, relisted here to get a conflict if it is changed
// unintentionally on either side:
diff --git a/pkg/kubelet/apis/config/types.go b/pkg/kubelet/apis/config/types.go
index fa27e5f6398..3073af528dc 100644
index 1fb797d07da..87f1f583c77 100644
--- a/pkg/kubelet/apis/config/types.go
+++ b/pkg/kubelet/apis/config/types.go
@@ -204,7 +204,7 @@ type KubeletConfiguration struct {
Expand All @@ -133,7 +133,7 @@ index fa27e5f6398..3073af528dc 100644
// CPUManagerPolicy is the name of the policy to use.
// Requires the CPUManager feature gate to be enabled.
diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go
index a9177d94e75..da2149816ca 100644
index 23830a09e74..9ab6454fd96 100644
--- a/pkg/kubelet/cm/cgroup_manager_linux.go
+++ b/pkg/kubelet/cm/cgroup_manager_linux.go
@@ -51,6 +51,9 @@ const (
Expand Down Expand Up @@ -246,7 +246,7 @@ index 5d77ed7a45f..5654d737fd6 100644

func (m *unsupportedCgroupManager) Name(_ CgroupName) string {
diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go
index b672791bd6f..585612a8f4f 100644
index da74a0fb6d6..8a20dd79a40 100644
--- a/pkg/kubelet/cm/container_manager_linux.go
+++ b/pkg/kubelet/cm/container_manager_linux.go
@@ -254,9 +254,15 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
Expand Down

0 comments on commit da7a705

Please sign in to comment.