kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use components.UsesKubenet to check if Kubenet is required

This commit is contained in:
Ciprian Hacman 2020-05-19 20:16:13 +03:00
parent e608cd5265
commit 9d666c73bc
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nodeup/pkg/model/BUILD.bazel
View File

@ -54,6 +54,7 @@ go_library(
"//pkg/k8scodecs:go_default_library", "//pkg/k8scodecs:go_default_library",
"//pkg/kubeconfig:go_default_library", "//pkg/kubeconfig:go_default_library",
"//pkg/kubemanifest:go_default_library", "//pkg/kubemanifest:go_default_library",
"//pkg/model/components:go_default_library",
"//pkg/nodelabels:go_default_library", "//pkg/nodelabels:go_default_library",
"//pkg/pki:go_default_library", "//pkg/pki:go_default_library",
"//pkg/rbac:go_default_library", "//pkg/rbac:go_default_library",

7
nodeup/pkg/model/containerd.go
View File

@ -25,6 +25,7 @@ import (
"k8s.io/kops/nodeup/pkg/model/resources" "k8s.io/kops/nodeup/pkg/model/resources"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/flagbuilder" "k8s.io/kops/pkg/flagbuilder"
"k8s.io/kops/pkg/model/components"
"k8s.io/kops/pkg/systemd" "k8s.io/kops/pkg/systemd"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
@ -338,7 +339,11 @@ func (b *ContainerdBuilder) Build(c *fi.ModelBuilderContext) error {
// Using containerd with Kubenet requires special configuration. This is a temporary backwards-compatible solution // Using containerd with Kubenet requires special configuration. This is a temporary backwards-compatible solution
// and will be deprecated when Kubenet is deprecated: // and will be deprecated when Kubenet is deprecated:
// https://github.com/containerd/cri/blob/master/docs/config.md#cni-config-template // https://github.com/containerd/cri/blob/master/docs/config.md#cni-config-template
if b.Cluster.Spec.ContainerRuntime == "containerd" && b.Cluster.Spec.Networking != nil && b.Cluster.Spec.Networking.Kubenet != nil { usesKubenet, err := components.UsesKubenet(&b.Cluster.Spec)
if err != nil {
return err
}
if b.Cluster.Spec.ContainerRuntime == "containerd" && usesKubenet {
b.buildKubenetCNIConfigTemplate(c) b.buildKubenetCNIConfigTemplate(c)
} }

6
pkg/model/components/containerd.go
View File

@ -63,7 +63,11 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
// Apply defaults for containerd running in container runtime mode // Apply defaults for containerd running in container runtime mode
containerd.LogLevel = fi.String("info") containerd.LogLevel = fi.String("info")
if clusterSpec.Networking != nil && clusterSpec.Networking.Kubenet != nil { usesKubenet, err := UsesKubenet(clusterSpec)
if err != nil {
return err
}
if clusterSpec.Networking != nil && usesKubenet {
// Using containerd with Kubenet requires special configuration. This is a temporary backwards-compatible solution // Using containerd with Kubenet requires special configuration. This is a temporary backwards-compatible solution
// and will be deprecated when Kubenet is deprecated: // and will be deprecated when Kubenet is deprecated:
// https://github.com/containerd/cri/blob/master/docs/config.md#cni-config-template // https://github.com/containerd/cri/blob/master/docs/config.md#cni-config-template