Skip to content

Commit

Permalink
Merge pull request #319 from elmiko/merge-1.31
Browse files Browse the repository at this point in the history
OCPCLOUD-2733: rebase on upstream 1.31.0 release
  • Loading branch information
openshift-merge-bot[bot] authored Oct 22, 2024
2 parents 8f0db4c + a1f5171 commit b533c8b
Show file tree
Hide file tree
Showing 4,911 changed files with 744,455 additions and 191,636 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@ updates:
interval: daily
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
labels:
- "vertical-pod-autoscaler"
- "area/vertical-pod-autoscaler"
- package-ecosystem: docker
directory: "/vertical-pod-autoscaler/pkg/recommender"
schedule:
interval: daily
open-pull-requests-limit: 3
labels:
- "vertical-pod-autoscaler"
- "area/vertical-pod-autoscaler"
- package-ecosystem: docker
directory: "/vertical-pod-autoscaler/pkg/updater"
schedule:
interval: daily
open-pull-requests-limit: 3
labels:
- "vertical-pod-autoscaler"
- "area/vertical-pod-autoscaler"
- package-ecosystem: docker
directory: "/vertical-pod-autoscaler/pkg/admission-controller"
schedule:
interval: daily
open-pull-requests-limit: 3
labels:
- "vertical-pod-autoscaler"
- "area/vertical-pod-autoscaler"
- package-ecosystem: gomod
directory: "/addon-resizer"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.22.1'
go-version: '1.22.2'

- uses: actions/checkout@v2
with:
Expand Down
24 changes: 23 additions & 1 deletion .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,32 @@ exclude:
- "cluster-autoscaler/cloudprovider/alicloud/**"
- "cluster-autoscaler/cloudprovider/aws/**"
- "cluster-autoscaler/cloudprovider/azure/**"
- "cluster-autoscaler/cloudprovider/azure/**"
- "cluster-autoscaler/cloudprovider/baiducloud/**"
- "cluster-autoscaler/cloudprovider/bizflycloud/**"
- "cluster-autoscaler/cloudprovider/brightbox/**"
- "cluster-autoscaler/cloudprovider/cherryservers/**"
- "cluster-autoscaler/cloudprovider/civo/**"
- "cluster-autoscaler/cloudprovider/cloudstack/**"
- "cluster-autoscaler/cloudprovider/clusterapi/**"
- "cluster-autoscaler/cloudprovider/digitalocean/**"
- "cluster-autoscaler/cloudprovider/equinixmetal/**"
- "cluster-autoscaler/cloudprovider/exoscale/**"
- "cluster-autoscaler/cloudprovider/externalgrpc/**"
- "cluster-autoscaler/cloudprovider/gce/**"
- "cluster-autoscaler/cloudprovider/hetzner/**"
- "cluster-autoscaler/cloudprovider/huaweicloud/**"
- "cluster-autoscaler/cloudprovider/ionoscloud/**"
- "cluster-autoscaler/cloudprovider/kamatera/**"
- "cluster-autoscaler/cloudprovider/kubemark/**"
- "cluster-autoscaler/cloudprovider/kwok/**"
- "cluster-autoscaler/cloudprovider/linode/**"
- "cluster-autoscaler/cloudprovider/magnum/**"
- "cluster-autoscaler/cloudprovider/oci/**"
- "cluster-autoscaler/cloudprovider/ovhcloud/**"
- "cluster-autoscaler/cloudprovider/rancher/**"
- "cluster-autoscaler/cloudprovider/scaleway/**"
- "cluster-autoscaler/cloudprovider/tencentcloud/**"
- "cluster-autoscaler/cloudprovider/volcengine/**"
- "cluster-autoscaler/cloudprovider/vultr/**"
# ensure we don't get aws artifacts in the unpacked sources
- "**/cluster-autoscaler/cloudprovider/aws/**"
4 changes: 2 additions & 2 deletions charts/cluster-autoscaler/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.29.0
appVersion: 1.30.0
description: Scales Kubernetes worker nodes within autoscaling groups.
engine: gotpl
home: https://github.com/kubernetes/autoscaler
Expand All @@ -11,4 +11,4 @@ name: cluster-autoscaler
sources:
- https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
type: application
version: 9.36.0
version: 9.37.0
2 changes: 1 addition & 1 deletion charts/cluster-autoscaler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ vpa:
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.pullSecrets | list | `[]` | Image pull secrets |
| image.repository | string | `"registry.k8s.io/autoscaling/cluster-autoscaler"` | Image repository |
| image.tag | string | `"v1.29.0"` | Image tag |
| image.tag | string | `"v1.30.0"` | Image tag |
| kubeTargetVersionOverride | string | `""` | Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands. |
| kwokConfigMapName | string | `"kwok-provider-config"` | configmap for configuring kwok provider |
| magnumCABundlePath | string | `"/etc/kubernetes/ca-bundle.crt"` | Path to the host's CA bundle, from `ca-file` in the cloud-config file. |
Expand Down
2 changes: 1 addition & 1 deletion charts/cluster-autoscaler/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ image:
# image.repository -- Image repository
repository: registry.k8s.io/autoscaling/cluster-autoscaler
# image.tag -- Image tag
tag: v1.29.0
tag: v1.30.0
# image.pullPolicy -- Image pull policy
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down
Loading

0 comments on commit b533c8b

Please sign in to comment.