Use containerd.sock for AmazonVPC CNI with containerd

kubernetes · Dec 27, 2020 · 72e7ec6 · 72e7ec6
1 parent e39f8bc
commit 72e7ec6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
@@ -182,7 +182,7 @@
           "name": "log-dir"
         - "mountPath": "/var/run/aws-node"
           "name": "run-dir"
-        - "mountPath": "/var/run/dockershim.sock"
+        - "mountPath": "{{ if eq .ContainerRuntime "containerd" }}/run/containerd/containerd.sock{{ else }}/var/run/dockershim.sock{{ end }}"
           "name": "dockershim"
         - "mountPath": "/run/xtables.lock"
           "name": "xtables-lock"

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -848,7 +848,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 
 		versions := map[string]string{
 			"k8s-1.12": "1.5.5-kops.1",
-			"k8s-1.16": "1.7.5-kops.1",
+			"k8s-1.16": "1.7.8-kops.1",
 		}
 
 		{

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -83,4 +83,4 @@ spec:
     name: networking.amazon-vpc-routed-eni
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.7.5-kops.1
+    version: 1.7.8-kops.1