Regenerate configs after changing CRI socket mount name

aws · Aug 26, 2020 · 5298477 · 5298477
1 parent 6828380
commit 5298477
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml
@@ -187,8 +187,8 @@
           "name": "log-dir"
         - "mountPath": "/var/run/aws-node"
           "name": "run-dir"
-        - "mountPath": "/var/run/dockershim.sock"
-          "name": "dockershim"
+        - "mountPath": "/var/run/cri.sock"
+          "name": "cri-sock"
       "hostNetwork": true
       "initContainers":
       - "image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:latest"
@@ -213,7 +213,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/var/log/aws-routed-eni"
           "type": "DirectoryOrCreate"

diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml
@@ -187,8 +187,8 @@
           "name": "log-dir"
         - "mountPath": "/var/run/aws-node"
           "name": "run-dir"
-        - "mountPath": "/var/run/dockershim.sock"
-          "name": "dockershim"
+        - "mountPath": "/var/run/cri.sock"
+          "name": "cri-sock"
       "hostNetwork": true
       "initContainers":
       - "image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:latest"
@@ -213,7 +213,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/var/log/aws-routed-eni"
           "type": "DirectoryOrCreate"

diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml
@@ -187,8 +187,8 @@
           "name": "log-dir"
         - "mountPath": "/var/run/aws-node"
           "name": "run-dir"
-        - "mountPath": "/var/run/dockershim.sock"
-          "name": "dockershim"
+        - "mountPath": "/var/run/cri.sock"
+          "name": "cri-sock"
       "hostNetwork": true
       "initContainers":
       - "image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:latest"
@@ -213,7 +213,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/var/log/aws-routed-eni"
           "type": "DirectoryOrCreate"

diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml
@@ -187,8 +187,8 @@
           "name": "log-dir"
         - "mountPath": "/var/run/aws-node"
           "name": "run-dir"
-        - "mountPath": "/var/run/dockershim.sock"
-          "name": "dockershim"
+        - "mountPath": "/var/run/cri.sock"
+          "name": "cri-sock"
       "hostNetwork": true
       "initContainers":
       - "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:latest"
@@ -213,7 +213,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/var/log/aws-routed-eni"
           "type": "DirectoryOrCreate"