github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123503 from aojea/ccm_ci

Browse Source 
Ccm ci
This commit is contained in:
Kubernetes Prow Robot
2024-02-26 08:02:58 -08:00
committed by GitHub
parent 414dabed44 3636971c39
commit d171e6733a
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-default.sh
View File

@@ -311,7 +311,7 @@ fi
# IP_ALIAS_SIZE is the size of the podCIDR allocated to a node.
# IP_ALIAS_SUBNETWORK is the subnetwork to allocate from. If empty, a
# new subnetwork will be created for the cluster.
ENABLE_IP_ALIASES=${KUBE_GCE_ENABLE_IP_ALIASES:-false}
ENABLE_IP_ALIASES=${KUBE_GCE_ENABLE_IP_ALIASES:-true}
NODE_IPAM_MODE=${KUBE_GCE_NODE_IPAM_MODE:-RangeAllocator}
if [ "${ENABLE_IP_ALIASES}" = true ]; then
# Number of Pods that can run on this node.

2
cluster/gce/config-test.sh
View File

@@ -353,7 +353,7 @@ fi
# IP_ALIAS_SIZE is the size of the podCIDR allocated to a node.
# IP_ALIAS_SUBNETWORK is the subnetwork to allocate from. If empty, a
# new subnetwork will be created for the cluster.
ENABLE_IP_ALIASES=${KUBE_GCE_ENABLE_IP_ALIASES:-false}
ENABLE_IP_ALIASES=${KUBE_GCE_ENABLE_IP_ALIASES:-true}
export NODE_IPAM_MODE=${KUBE_GCE_NODE_IPAM_MODE:-RangeAllocator}
if [ "${ENABLE_IP_ALIASES}" = true ]; then
# Number of Pods that can run on this node.

2
cluster/gce/manifests/cloud-controller-manager.manifest
View File

@@ -23,7 +23,7 @@
"containers":[
{
"name": "cloud-controller-manager",
"image": "gcr.io/k8s-staging-cloud-provider-gcp/cloud-controller-manager:v28.2.1",
"image": "gcr.io/k8s-staging-cloud-provider-gcp/cloud-controller-manager:v29.0.0",
"resources": {
"requests": {
"cpu": "{{cpurequest}}"