Skip to content

Commit 220d5fb

Browse files
authored
Merge branch 'kubernetes:master' into csr-scaleup-time
2 parents 426e273 + 79aea9b commit 220d5fb

File tree

117 files changed

+8555
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+8555
-652
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ updates:
88
labels:
99
- "area/vertical-pod-autoscaler"
1010
- "release-note-none"
11+
- "ok-to-test"
1112
- package-ecosystem: docker
1213
directory: "/vertical-pod-autoscaler/pkg/recommender"
1314
schedule:
@@ -19,6 +20,7 @@ updates:
1920
labels:
2021
- "area/vertical-pod-autoscaler"
2122
- "release-note-none"
23+
- "ok-to-test"
2224
- package-ecosystem: docker
2325
directory: "/vertical-pod-autoscaler/pkg/updater"
2426
schedule:
@@ -30,6 +32,7 @@ updates:
3032
labels:
3133
- "area/vertical-pod-autoscaler"
3234
- "release-note-none"
35+
- "ok-to-test"
3336
- package-ecosystem: docker
3437
directory: "/vertical-pod-autoscaler/pkg/admission-controller"
3538
schedule:
@@ -41,6 +44,7 @@ updates:
4144
labels:
4245
- "area/vertical-pod-autoscaler"
4346
- "release-note-none"
47+
- "ok-to-test"
4448
- package-ecosystem: gomod
4549
directory: "/addon-resizer"
4650
schedule:
@@ -49,6 +53,8 @@ updates:
4953
open-pull-requests-limit: 3
5054
labels:
5155
- "release-note-none"
56+
- "area/addon-resizer"
57+
- "ok-to-test"
5258
- package-ecosystem: "github-actions"
5359
directory: "/"
5460
schedule:
@@ -57,3 +63,4 @@ updates:
5763
labels:
5864
- "area/dependency"
5965
- "release-note-none"
66+
- "ok-to-test"

OWNERS_ALIASES

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ aliases:
66
- towca
77
sig-autoscaling-vpa-approvers:
88
- kwiesmueller
9-
- jbartosik
109
- voelzmo
1110
- raywainman
1211
- adrianmoisey
1312
- omerap12
13+
# emeritus:
14+
# - jbartosik 2025-08-09
1415
sig-autoscaling-vpa-reviewers:
1516
- kwiesmueller
16-
- jbartosik
1717
- voelzmo
1818
- raywainman
1919
- adrianmoisey
2020
- omerap12
21+
# emeritus:
22+
# - jbartosik 2025-08-09

balancer/pkg/controller/conditions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func setConditionsBasedOnError(balancer *v1alpha1.Balancer, err *BalancerError,
3232
} else {
3333
balancer.Status.Conditions = setConditionInList(balancer.Status.Conditions,
3434
now, v1alpha1.BalancerConditionRunning, metav1.ConditionFalse,
35-
string(err.phase), err.Error())
35+
string(err.phase), "%s", err.Error())
3636
}
3737
}
3838

charts/cluster-autoscaler/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ name: cluster-autoscaler
1111
sources:
1212
- https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
1313
type: application
14-
version: 9.48.0
14+
version: 9.50.1

charts/cluster-autoscaler/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ To use Managed Instance Group (MIG) auto-discovery, provide a YAML file setting
176176

177177
```console
178178
$ helm install my-release autoscaler/cluster-autoscaler \
179-
--set "autoscalingGroupsnamePrefix[0].name=your-ig-prefix,autoscalingGroupsnamePrefix[0].maxSize=10,autoscalingGroupsnamePrefi[0].minSize=1" \
179+
--set "autoscalingGroupsnamePrefix[0].name=your-ig-prefix,autoscalingGroupsnamePrefix[0].maxSize=10,autoscalingGroupsnamePrefix[0].minSize=1" \
180180
--set autoDiscovery.clusterName=<CLUSTER NAME> \
181181
--set cloudProvider=gce
182182
```
@@ -454,7 +454,7 @@ vpa:
454454
| civoClusterID | string | `""` | Cluster ID for the Civo cluster. Required if `cloudProvider=civo` |
455455
| civoRegion | string | `""` | Region for the Civo cluster. Required if `cloudProvider=civo` |
456456
| cloudConfigPath | string | `""` | Configuration file for cloud provider. |
457-
| cloudProvider | string | `"aws"` | The cloud provider where the autoscaler runs. Currently only `gce`, `aws`, `azure`, `magnum`, `clusterapi` and `civo` are supported. `aws` supported for AWS. `gce` for GCE. `azure` for Azure AKS. `magnum` for OpenStack Magnum, `clusterapi` for Cluster API. `civo` for Civo Cloud. |
457+
| cloudProvider | string | `"aws"` | The cloud provider where the autoscaler runs. Currently only `gce`, `aws`, `azure`, `magnum`, `clusterapi`, `civo` and `coreweave` are supported. `aws` supported for AWS. `gce` for GCE. `azure` for Azure AKS. `magnum` for OpenStack Magnum, `clusterapi` for Cluster API. `civo` for Civo Cloud. `coreweave` for CoreWeave. |
458458
| clusterAPICloudConfigPath | string | `"/etc/kubernetes/mgmt-kubeconfig"` | Path to kubeconfig for connecting to Cluster API Management Cluster, only used if `clusterAPIMode=kubeconfig-kubeconfig or incluster-kubeconfig` |
459459
| clusterAPIConfigMapsNamespace | string | `""` | Namespace on the workload cluster to store Leader election and status configmaps |
460460
| clusterAPIKubeconfigSecret | string | `""` | Secret containing kubeconfig for connecting to Cluster API managed workloadcluster Required if `cloudProvider=clusterapi` and `clusterAPIMode=kubeconfig-kubeconfig,kubeconfig-incluster or incluster-kubeconfig` |
@@ -463,6 +463,7 @@ vpa:
463463
| containerSecurityContext | object | `{}` | [Security context for container](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) |
464464
| customArgs | list | `[]` | Additional custom container arguments. Refer to https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-the-parameters-to-ca for the full list of cluster autoscaler parameters and their default values. List of arguments as strings. |
465465
| deployment.annotations | object | `{}` | Annotations to add to the Deployment object. |
466+
| dnsConfig | object | `{}` | [Pod's DNS Config](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config) |
466467
| dnsPolicy | string | `"ClusterFirst"` | Defaults to `ClusterFirst`. Valid values are: `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`. If autoscaler does not depend on cluster DNS, recommended to set this to `Default`. |
467468
| envFromConfigMap | string | `""` | ConfigMap name to use as envFrom. |
468469
| envFromSecret | string | `""` | Secret name to use as envFrom. |

charts/cluster-autoscaler/README.md.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ To use Managed Instance Group (MIG) auto-discovery, provide a YAML file setting
176176

177177
```console
178178
$ helm install my-release autoscaler/cluster-autoscaler \
179-
--set "autoscalingGroupsnamePrefix[0].name=your-ig-prefix,autoscalingGroupsnamePrefix[0].maxSize=10,autoscalingGroupsnamePrefi[0].minSize=1" \
179+
--set "autoscalingGroupsnamePrefix[0].name=your-ig-prefix,autoscalingGroupsnamePrefix[0].maxSize=10,autoscalingGroupsnamePrefix[0].minSize=1" \
180180
--set autoDiscovery.clusterName=<CLUSTER NAME> \
181181
--set cloudProvider=gce
182182
```

charts/cluster-autoscaler/templates/clusterrole.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ metadata:
66
{{ include "cluster-autoscaler.labels" . | indent 4 }}
77
name: {{ template "cluster-autoscaler.fullname" . }}
88
rules:
9+
{{- if (eq .Values.cloudProvider "coreweave") }}
10+
- apiGroups:
11+
- "compute.coreweave.com"
12+
resources:
13+
- nodepools
14+
verbs:
15+
- get
16+
- list
17+
- patch
18+
- update
19+
{{- end }}
920
- apiGroups:
1021
- ""
1122
resources:

charts/cluster-autoscaler/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ spec:
4040
{{- if .Values.priorityClassName }}
4141
priorityClassName: "{{ .Values.priorityClassName }}"
4242
{{- end }}
43+
{{- with .Values.dnsConfig }}
44+
dnsConfig:
45+
{{- toYaml . | nindent 8 }}
46+
{{- end }}
4347
{{- if .Values.dnsPolicy }}
4448
dnsPolicy: "{{ .Values.dnsPolicy }}"
4549
{{- end }}

charts/cluster-autoscaler/values.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,11 @@ civoRegion: ""
133133
cloudConfigPath: ""
134134

135135
# cloudProvider -- The cloud provider where the autoscaler runs.
136-
# Currently only `gce`, `aws`, `azure`, `magnum`, `clusterapi` and `civo` are supported.
136+
# Currently only `gce`, `aws`, `azure`, `magnum`, `clusterapi`, `civo` and `coreweave` are supported.
137137
# `aws` supported for AWS. `gce` for GCE. `azure` for Azure AKS.
138138
# `magnum` for OpenStack Magnum, `clusterapi` for Cluster API.
139139
# `civo` for Civo Cloud.
140+
# `coreweave` for CoreWeave.
140141
cloudProvider: aws
141142

142143
# clusterAPICloudConfigPath -- Path to kubeconfig for connecting to Cluster API Management Cluster, only used if `clusterAPIMode=kubeconfig-kubeconfig or incluster-kubeconfig`
@@ -170,6 +171,18 @@ deployment:
170171
# deployment.annotations -- Annotations to add to the Deployment object.
171172
annotations: {}
172173

174+
# dnsConfig -- [Pod's DNS Config](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config)
175+
dnsConfig: {}
176+
# nameservers:
177+
# - 1.2.3.4
178+
# searches:
179+
# - ns1.svc.cluster-domain.example
180+
# - my.dns.search.suffix
181+
# options:
182+
# - name: ndots
183+
# value: "2"
184+
# - name: edns0
185+
173186
# dnsPolicy -- Defaults to `ClusterFirst`. Valid values are:
174187
# `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`.
175188
# If autoscaler does not depend on cluster DNS, recommended to set this to `Default`.

cluster-autoscaler/FAQ.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ The following startup parameters are supported for cluster autoscaler:
990990
| `check-capacity-provisioning-request-batch-timebox` | Maximum time to process a batch of provisioning requests. | 10s |
991991
| `check-capacity-provisioning-request-max-batch-size` | Maximum number of provisioning requests to process in a single batch. | 10 |
992992
| `cloud-config` | The path to the cloud provider configuration file. Empty string for no configuration file. | |
993-
| `cloud-provider` | Cloud provider type. Available values: [aws,azure,gce,alicloud,cherryservers,cloudstack,baiducloud,magnum,digitalocean,exoscale,externalgrpc,huaweicloud,hetzner,oci,ovhcloud,clusterapi,ionoscloud,kamatera,kwok,linode,bizflycloud,brightbox,equinixmetal,vultr,tencentcloud,civo,scaleway,rancher,volcengine] | "gce" |
993+
| `cloud-provider` | Cloud provider type. Available values: [aws,azure,gce,alicloud,cherryservers,cloudstack,baiducloud,magnum,digitalocean,exoscale,externalgrpc,huaweicloud,hetzner,oci,ovhcloud,clusterapi,ionoscloud,kamatera,kwok,linode,bizflycloud,brightbox,equinixmetal,vultr,tencentcloud,civo,scaleway,rancher,volcengine,utho] | "gce" |
994994
| `cloud-provider-gce-l7lb-src-cidrs` | CIDRs opened in GCE firewall for L7 LB traffic proxy & health checks | 130.211.0.0/22,35.191.0.0/16 |
995995
| `cloud-provider-gce-lb-src-cidrs` | CIDRs opened in GCE firewall for L4 LB traffic proxy & health checks | 130.211.0.0/22,209.85.152.0/22,209.85.204.0/22,35.191.0.0/16 |
996996
| `cluster-name` | Autoscaled cluster name, if available | |

0 commit comments

Comments
 (0)