From 9bcfb6b6a719f570f413510583f8c48afbda1672 Mon Sep 17 00:00:00 2001
From: zhiling-liftoff <zchen@liftoff.io>
Date: Fri, 24 Mar 2023 12:58:04 +0800
Subject: [PATCH] [NOJIRA] Remove offending flag, add static flag to containerd
 service

---
 .github/workflows/build.yaml     | 10 +++++-----
 files/kubelet-containerd.service |  1 +
 files/kubelet.service            |  1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a481757b4..453643914 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,7 +4,7 @@ on:
     types: [published]
 permissions:
   id-token: write
-  contents: read
+  contents: write
 jobs:
   build-us-east-1:
     runs-on: ubuntu-latest
@@ -12,13 +12,13 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Assume github action role
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@master
       with:
         role-to-assume: "arn:aws:iam::320005014399:role/github-action"
         aws-region: us-east-1
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@master
       with:
         aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
@@ -46,13 +46,13 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Assume github action role
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@master
       with:
         role-to-assume: "arn:aws:iam::320005014399:role/github-action"
         aws-region: us-west-2
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@master
       with:
         aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
diff --git a/files/kubelet-containerd.service b/files/kubelet-containerd.service
index d5789530e..14c8ae165 100644
--- a/files/kubelet-containerd.service
+++ b/files/kubelet-containerd.service
@@ -12,6 +12,7 @@ ExecStart=/usr/bin/kubelet \
     --kubeconfig /var/lib/kubelet/kubeconfig \
     --container-runtime remote \
     --container-runtime-endpoint unix:///run/containerd/containerd.sock \
+    --cpu-manager-policy static \
     $KUBELET_ARGS \
     $KUBELET_EXTRA_ARGS
 
diff --git a/files/kubelet.service b/files/kubelet.service
index aaa4ccd1a..de288c471 100644
--- a/files/kubelet.service
+++ b/files/kubelet.service
@@ -10,7 +10,6 @@ ExecStart=/usr/bin/kubelet \
     --config /etc/kubernetes/kubelet/kubelet-config.json \
     --kubeconfig /var/lib/kubelet/kubeconfig \
     --container-runtime docker \
-    --enable-cadvisor-json-endpoints \
     --cpu-manager-policy static \
     --network-plugin cni \
     $KUBELET_ARGS \