From a12bc7a00d2227fac3503a8d083c4bd828cacb4e Mon Sep 17 00:00:00 2001
From: hbc <bcxxxxxx@gmail.com>
Date: Sat, 26 Jun 2021 05:51:27 +0800
Subject: [PATCH] fix: mount kubelet config to `/var/lib/kubelet` for non-rbac
 deployment (#1098)

* fix: mount kubelet config to `/var/lib/kubelet` for non-rbac deployment

* fix: update nonazurejson non-rbac deployment settings
---
 manifest_staging/deploy/infra/deployment.yaml             | 8 ++++----
 manifest_staging/deploy/infra/noazurejson/deployment.yaml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest_staging/deploy/infra/deployment.yaml b/manifest_staging/deploy/infra/deployment.yaml
index 87a7c7ad4..fafc0e8ed 100644
--- a/manifest_staging/deploy/infra/deployment.yaml
+++ b/manifest_staging/deploy/infra/deployment.yaml
@@ -497,7 +497,7 @@ spec:
       - name: mic
         image: "mcr.microsoft.com/oss/azure/aad-pod-identity/mic:v1.8.0"
         args:
-          - "--kubeconfig=/etc/kubernetes/kubeconfig/kubeconfig"
+          - "--kubeconfig=/var/lib/kubelet/kubeconfig"
           - "--cloudconfig=/etc/kubernetes/azure.json"
           - "--logtostderr"
         securityContext:
@@ -515,8 +515,8 @@ spec:
             cpu: 100m
             memory: 256Mi
         volumeMounts:
-          - name: kubeconfig
-            mountPath: /etc/kubernetes/kubeconfig
+          - name: kubelet-config
+            mountPath: /var/lib/kubelet
             readOnly: true
           - name: certificates
             mountPath: /etc/kubernetes/certs
@@ -531,7 +531,7 @@ spec:
           initialDelaySeconds: 10
           periodSeconds: 5
       volumes:
-      - name: kubeconfig
+      - name: kubelet-config
         hostPath:
           path: /var/lib/kubelet
       - name: certificates
diff --git a/manifest_staging/deploy/infra/noazurejson/deployment.yaml b/manifest_staging/deploy/infra/noazurejson/deployment.yaml
index f91c00f15..cdbe3dc0a 100644
--- a/manifest_staging/deploy/infra/noazurejson/deployment.yaml
+++ b/manifest_staging/deploy/infra/noazurejson/deployment.yaml
@@ -509,7 +509,7 @@ spec:
       - name: mic
         image: "mcr.microsoft.com/oss/azure/aad-pod-identity/mic:v1.8.0"
         args:
-          - "--kubeconfig=/etc/kubernetes/kubeconfig/kubeconfig"
+          - "--kubeconfig=/var/lib/kubelet/kubeconfig"
           - "--logtostderr"
         securityContext:
           runAsUser: 0
@@ -561,8 +561,8 @@ spec:
             cpu: 100m
             memory: 256Mi
         volumeMounts:
-          - name: kubeconfig
-            mountPath: /etc/kubernetes/kubeconfig
+          - name: kubelet-config
+            mountPath: /var/lib/kubelet
             readOnly: true
           - name: certificates
             mountPath: /etc/kubernetes/certs
@@ -574,7 +574,7 @@ spec:
           initialDelaySeconds: 10
           periodSeconds: 5
       volumes:
-      - name: kubeconfig
+      - name: kubelet-config
         hostPath:
           path: /var/lib/kubelet
       - name: certificates