Skip to content

Commit 212869b

Browse files
committed
merge: merging from main
2 parents f9f397a + b09676c commit 212869b

File tree

324 files changed

+16967
-3046
lines changed

Some content is hidden

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

324 files changed

+16967
-3046
lines changed

.github/dependabot.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ updates:
77
open-pull-requests-limit: 0 # setting this to 0 means only allowing security updates, see https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit
88
labels:
99
- "area/vertical-pod-autoscaler"
10+
- "release-note-none"
11+
- "ok-to-test"
1012
- package-ecosystem: docker
1113
directory: "/vertical-pod-autoscaler/pkg/recommender"
1214
schedule:
@@ -17,6 +19,8 @@ updates:
1719
open-pull-requests-limit: 3
1820
labels:
1921
- "area/vertical-pod-autoscaler"
22+
- "release-note-none"
23+
- "ok-to-test"
2024
- package-ecosystem: docker
2125
directory: "/vertical-pod-autoscaler/pkg/updater"
2226
schedule:
@@ -27,6 +31,8 @@ updates:
2731
open-pull-requests-limit: 3
2832
labels:
2933
- "area/vertical-pod-autoscaler"
34+
- "release-note-none"
35+
- "ok-to-test"
3036
- package-ecosystem: docker
3137
directory: "/vertical-pod-autoscaler/pkg/admission-controller"
3238
schedule:
@@ -37,9 +43,24 @@ updates:
3743
open-pull-requests-limit: 3
3844
labels:
3945
- "area/vertical-pod-autoscaler"
46+
- "release-note-none"
47+
- "ok-to-test"
4048
- package-ecosystem: gomod
4149
directory: "/addon-resizer"
4250
schedule:
4351
interval: daily
4452
target-branch: "addon-resizer-release-1.8"
4553
open-pull-requests-limit: 3
54+
labels:
55+
- "release-note-none"
56+
- "area/addon-resizer"
57+
- "ok-to-test"
58+
- package-ecosystem: "github-actions"
59+
directory: "/"
60+
schedule:
61+
interval: "weekly"
62+
open-pull-requests-limit: 3
63+
labels:
64+
- "area/dependency"
65+
- "release-note-none"
66+
- "ok-to-test"

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
GO111MODULE: auto
4545

4646
- name: golangci-lint - vertical-pod-autoscaler
47-
uses: golangci/golangci-lint-action@v6
47+
uses: golangci/golangci-lint-action@v8
4848
with:
4949
args: --timeout=30m
5050
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler/vertical-pod-autoscaler

.github/workflows/pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout
1414
uses: actions/[email protected]
1515
- id: filter
16-
uses: dorny/paths-filter@v2.2.0
16+
uses: dorny/paths-filter@v2.11.1
1717
with:
1818
filters: |
1919
charts:
@@ -45,7 +45,7 @@ jobs:
4545
fi
4646
- if: steps.list-changed.outputs.changed == 'true'
4747
name: Create kind cluster
48-
uses: helm/kind-action@v1.10.0
48+
uses: helm/kind-action@v1.12.0
4949
- if: steps.list-changed.outputs.changed == 'true'
5050
name: Run chart-testing (install)
5151
run: ct install

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ We'd love to accept your patches! Before we can take them, we have to jump a cou
2323

2424
All changes must be code reviewed. Coding conventions and standards are explained in the official
2525
[developer docs](https://github.com/kubernetes/community/tree/master/contributors/devel). Expect
26-
reviewers to request that you avoid common [go style mistakes](https://github.com/golang/go/wiki/CodeReviewComments)
26+
reviewers to request that you avoid common [go style mistakes](https://go.dev/wiki/CodeReviewComments)
2727
in your PRs.
2828

2929
### Merge Approval

OWNERS_ALIASES

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,19 @@ aliases:
44
- jackfrancis
55
- raywainman
66
- towca
7+
sig-autoscaling-vpa-approvers:
8+
- kwiesmueller
9+
- voelzmo
10+
- raywainman
11+
- adrianmoisey
12+
- omerap12
13+
# emeritus:
14+
# - jbartosik 2025-08-09
15+
sig-autoscaling-vpa-reviewers:
16+
- kwiesmueller
17+
- voelzmo
18+
- raywainman
19+
- adrianmoisey
20+
- 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 1.32.0
2+
appVersion: 1.33.0
33
description: Scales Kubernetes worker nodes within autoscaling groups.
44
engine: gotpl
55
home: https://github.com/kubernetes/autoscaler
@@ -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.46.6
14+
version: 9.50.1

charts/cluster-autoscaler/README.md

Lines changed: 5 additions & 3 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. |
@@ -480,7 +481,7 @@ vpa:
480481
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
481482
| image.pullSecrets | list | `[]` | Image pull secrets |
482483
| image.repository | string | `"registry.k8s.io/autoscaling/cluster-autoscaler"` | Image repository |
483-
| image.tag | string | `"v1.32.0"` | Image tag |
484+
| image.tag | string | `"v1.33.0"` | Image tag |
484485
| initContainers | list | `[]` | Any additional init containers. |
485486
| kubeTargetVersionOverride | string | `""` | Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands. |
486487
| kwokConfigMapName | string | `"kwok-provider-config"` | configmap for configuring kwok provider |
@@ -498,6 +499,7 @@ vpa:
498499
| prometheusRule.interval | string | `nil` | How often rules in the group are evaluated (falls back to `global.evaluation_interval` if not set). |
499500
| prometheusRule.namespace | string | `"monitoring"` | Namespace which Prometheus is running in. |
500501
| prometheusRule.rules | list | `[]` | Rules spec template (see https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#rule). |
502+
| rbac.additionalRules | list | `[]` | Additional rules for role/clusterrole |
501503
| rbac.clusterScoped | bool | `true` | if set to false will only provision RBAC to alter resources in the current namespace. Most useful for Cluster-API |
502504
| rbac.create | bool | `true` | If `true`, create and use RBAC resources. |
503505
| rbac.pspEnabled | bool | `false` | If `true`, creates and uses RBAC resources required in the cluster with [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) enabled. Must be used with `rbac.create` set to `true`. |

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: 14 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:
@@ -173,4 +184,7 @@ rules:
173184
- patch
174185
- update
175186
{{- end }}
187+
{{- if .Values.rbac.additionalRules }}
188+
{{ toYaml .Values.rbac.additionalRules | indent 2 }}
189+
{{- end }}
176190
{{- end -}}

0 commit comments

Comments
 (0)