Skip to content

Commit

Permalink
Add conntrack as dependency for kube{adm,let}
Browse files Browse the repository at this point in the history
Addresses kubernetes/kubeadm#1287

Also associated with a PR in the k8s.io/kubernetes to keep the changes
in sync.

/cc @luxas @dims

Signed-off-by: Duffie Cooley <dcooley@heptio.com>
  • Loading branch information
Duffie Cooley committed Nov 29, 2018
1 parent 4a45486 commit a568f49
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions debian/build.go
Expand Up @@ -292,6 +292,7 @@ func getKubeadmDependencies(v version) (string, error) {
"kubelet (>= 1.6.0)",
"kubectl (>= 1.6.0)",
fmt.Sprintf("kubernetes-cni (%s)", cniVersion),
"conntrack",
"${misc:Depends}",
}
sv, err := semver.Make(v.Version)
Expand Down
2 changes: 1 addition & 1 deletion debian/xenial/kubelet/debian/control
Expand Up @@ -10,6 +10,6 @@ Vcs-Browser: https://github.com/kubernetes/kubernetes

Package: kubelet
Architecture: {{ .DebArch }}
Depends: iptables (>= 1.4.21), kubernetes-cni ({{ .KubeletCNIVersion }}), iproute2, socat, util-linux, mount, ebtables, ethtool, ${misc:Depends}
Depends: iptables (>= 1.4.21), kubernetes-cni ({{ .KubeletCNIVersion }}), iproute2, socat, util-linux, mount, ebtables, ethtool, conntrack, ${misc:Depends}
Description: Kubernetes Node Agent
The node agent of Kubernetes, the container cluster manager
2 changes: 2 additions & 0 deletions rpm/kubelet.spec
Expand Up @@ -53,6 +53,7 @@ Requires: util-linux
Requires: ethtool
Requires: iproute
Requires: ebtables
Requires: conntrack


%description
Expand Down Expand Up @@ -86,6 +87,7 @@ Requires: kubelet >= 1.6.0
Requires: kubectl >= 1.6.0
Requires: kubernetes-cni >= 0.6.0
Requires: cri-tools >= 1.11.0
Requires: conntrack

%description -n kubeadm
Command-line utility for administering a Kubernetes cluster.
Expand Down

0 comments on commit a568f49

Please sign in to comment.