[cluster] Improve CCM manifests

* Ensure that CCM components only run in CCM * Remove no used host paths
kubernetes · Feb 6, 2023 · 3eb83c5 · 3eb83c5
1 parent b674bb5
commit 3eb83c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 75 deletions.
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
@@ -2209,9 +2209,7 @@ function start-kube-controller-manager {
     params+=("--pv-recycler-pod-template-filepath-nfs=$PV_RECYCLER_OVERRIDE_TEMPLATE")
     params+=("--pv-recycler-pod-template-filepath-hostpath=$PV_RECYCLER_OVERRIDE_TEMPLATE")
   fi
-  if [[ -n "${RUN_CONTROLLERS:-}" ]]; then
-    params+=("--controllers=${RUN_CONTROLLERS}")
-  fi
+  params+=("--controllers=*,-service,-cloud-node-lifecycle,-nodeipam,-route")
 
   local -r kube_rc_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-controller-manager.docker_tag)
   local container_env=""

diff --git a/cluster/gce/manifests/cloud-controller-manager.manifest b/cluster/gce/manifests/cloud-controller-manager.manifest
@@ -57,22 +57,7 @@
         {{flexvolume_hostpath_mount}}
         { "name": "logfile",
         "mountPath": "/var/log/cloud-controller-manager.log",
-        "readOnly": false},
-        { "name": "etcssl",
-        "mountPath": "/etc/ssl",
-        "readOnly": true},
-        { "name": "usrsharecacerts",
-        "mountPath": "/usr/share/ca-certificates",
-        "readOnly": true},
-        { "name": "varssl",
-        "mountPath": "/var/ssl",
-        "readOnly": true},
-        { "name": "etcopenssl",
-        "mountPath": "/etc/openssl",
-        "readOnly": true},
-        { "name": "etcpki",
-        "mountPath": "/etc/pki",
-        "readOnly": true}
+        "readOnly": false}
       ]
     }
 ],
@@ -89,26 +74,6 @@
     "hostPath": {
         "path": "/var/log/cloud-controller-manager.log",
         "type": "FileOrCreate"}
-  },
-  { "name": "etcssl",
-    "hostPath": {
-        "path": "/etc/ssl"}
-  },
-  { "name": "usrsharecacerts",
-    "hostPath": {
-        "path": "/usr/share/ca-certificates"}
-  },
-  { "name": "varssl",
-    "hostPath": {
-        "path": "/var/ssl"}
-  },
-  { "name": "etcopenssl",
-    "hostPath": {
-        "path": "/etc/openssl"}
-  },
-  { "name": "etcpki",
-    "hostPath": {
-        "path": "/etc/pki"}
   }
 ]
 }}
diff --git a/deploy/cloud-controller-manager.manifest b/deploy/cloud-controller-manager.manifest
@@ -60,22 +60,7 @@
         {{flexvolume_hostpath_mount}}
         { "name": "logfile",
         "mountPath": "/var/log/cloud-controller-manager.log",
-        "readOnly": false},
-        { "name": "etcssl",
-        "mountPath": "/etc/ssl",
-        "readOnly": true},
-        { "name": "usrsharecacerts",
-        "mountPath": "/usr/share/ca-certificates",
-        "readOnly": true},
-        { "name": "varssl",
-        "mountPath": "/var/ssl",
-        "readOnly": true},
-        { "name": "etcopenssl",
-        "mountPath": "/etc/openssl",
-        "readOnly": true},
-        { "name": "etcpki",
-        "mountPath": "/etc/pki",
-        "readOnly": true}
+        "readOnly": false}
       ]
     }
 ],
@@ -92,26 +77,6 @@
     "hostPath": {
         "path": "/var/log/cloud-controller-manager.log",
         "type": "FileOrCreate"}
-  },
-  { "name": "etcssl",
-    "hostPath": {
-        "path": "/etc/ssl"}
-  },
-  { "name": "usrsharecacerts",
-    "hostPath": {
-        "path": "/usr/share/ca-certificates"}
-  },
-  { "name": "varssl",
-    "hostPath": {
-        "path": "/var/ssl"}
-  },
-  { "name": "etcopenssl",
-    "hostPath": {
-        "path": "/etc/openssl"}
-  },
-  { "name": "etcpki",
-    "hostPath": {
-        "path": "/etc/pki"}
   }
 ]
 }}