From 9883f622509a6e3cd0f6ba3518b09fd71959825c Mon Sep 17 00:00:00 2001
From: Claes Mogren <mogren@amazon.com>
Date: Wed, 26 Aug 2020 11:22:39 -0700
Subject: [PATCH] Regenerate configs after changing CRI socket mount name

---
 config/master/aws-k8s-cni-cn.yaml            | 6 +++---
 config/master/aws-k8s-cni-us-gov-east-1.yaml | 6 +++---
 config/master/aws-k8s-cni-us-gov-west-1.yaml | 6 +++---
 config/master/aws-k8s-cni.yaml               | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml
index fbaaf86809..206a5474d3 100644
--- 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"
         - "mountPath": "/run/xtables.lock"
           "name": "xtables-lock"
       "hostNetwork": true
@@ -215,7 +215,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/run/xtables.lock"
         "name": "xtables-lock"
diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml
index 81ce6620a7..a77fd3536e 100644
--- 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"
         - "mountPath": "/run/xtables.lock"
           "name": "xtables-lock"
       "hostNetwork": true
@@ -215,7 +215,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/run/xtables.lock"
         "name": "xtables-lock"
diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml
index d7aa51f802..b0ddd477ab 100644
--- 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"
         - "mountPath": "/run/xtables.lock"
           "name": "xtables-lock"
       "hostNetwork": true
@@ -215,7 +215,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/run/xtables.lock"
         "name": "xtables-lock"
diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml
index da182435e5..2110b7c868 100644
--- 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"
         - "mountPath": "/run/xtables.lock"
           "name": "xtables-lock"
       "hostNetwork": true
@@ -215,7 +215,7 @@
         "name": "cni-net-dir"
       - "hostPath":
           "path": "/var/run/dockershim.sock"
-        "name": "dockershim"
+        "name": "cri-sock"
       - "hostPath":
           "path": "/run/xtables.lock"
         "name": "xtables-lock"