Skip to content

Commit dede39c

Browse files
authored
Merge branch 'main' into docs-datacenter-deprecation-banner
2 parents c967f0c + 4c9e3c4 commit dede39c

7 files changed

Lines changed: 16 additions & 17 deletions

File tree

.github/workflows/goreleaser.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
go-version-file: go.mod
2222

2323
- name: Set up QEMU
24-
uses: docker/setup-qemu-action@v3
24+
uses: docker/setup-qemu-action@v4
2525
- name: Setup Docker Buildx
26-
uses: docker/setup-buildx-action@v3
26+
uses: docker/setup-buildx-action@v4
2727
- name: Login to Docker Hub
28-
uses: docker/login-action@v3
28+
uses: docker/login-action@v4
2929
with:
3030
username: ${{ secrets.DOCKER_USER }}
3131
password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ jobs:
7474
skaffold
7575
helm: v4.1.1 # renovate: datasource=github-releases depName=helm/helm
7676
kubectl: v1.35.2 # renovate: datasource=github-releases depName=kubernetes/kubernetes
77-
skaffold: v2.17.2 # renovate: datasource=github-releases depName=GoogleContainerTools/skaffold
77+
skaffold: v2.17.3 # renovate: datasource=github-releases depName=GoogleContainerTools/skaffold
7878

7979
- name: Setup k3sup
8080
env:
81-
K3SUP_VERSION: 0.13.11 # renovate: datasource=github-releases depName=alexellis/k3sup
81+
K3SUP_VERSION: 0.13.12 # renovate: datasource=github-releases depName=alexellis/k3sup
8282
run: |
8383
curl https://github.com/alexellis/k3sup/releases/download/$K3SUP_VERSION/k3sup -sSL -o /usr/local/bin/k3sup
8484
chmod +x /usr/local/bin/k3sup
@@ -192,7 +192,7 @@ jobs:
192192
skaffold
193193
helm: v4.1.1 # renovate: datasource=github-releases depName=helm/helm
194194
kubectl: v1.35.2 # renovate: datasource=github-releases depName=kubernetes/kubernetes
195-
skaffold: v2.17.2 # renovate: datasource=github-releases depName=GoogleContainerTools/skaffold
195+
skaffold: v2.17.3 # renovate: datasource=github-releases depName=GoogleContainerTools/skaffold
196196

197197
- name: Install k3sup
198198
run: |

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ build:
2525

2626
test:lint:
2727
stage: test
28-
image: golangci/golangci-lint:v2.10
28+
image: golangci/golangci-lint:v2.11
2929
variables:
3030
GOLANGCI_LINT_CACHE: $CI_PROJECT_DIR/.cache/golangci-lint
3131
cache:

.golangci.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ linters:
7474
alias: hrobotmodels
7575
no-unaliased: true
7676

77-
revive:
78-
rules:
79-
- name: var-naming
80-
arguments: [[], [], [{ skipPackageNameCollisionWithGoStd: true }]]
81-
8277
exclusions:
8378
generated: lax
8479
presets:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ repos:
8282
- id: shellcheck
8383

8484
- repo: https://github.com/golangci/golangci-lint
85-
rev: v2.10.1
85+
rev: v2.11.2
8686
hooks:
8787
- id: golangci-lint-full
88-
language_version: 1.25.7 # renovate: datasource=golang-version depName=go
88+
language_version: 1.25.8 # renovate: datasource=golang-version depName=go
8989

9090
- repo: local
9191
hooks:

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ module github.com/hetznercloud/hcloud-cloud-controller-manager
22

33
go 1.25.0
44

5-
toolchain go1.25.7
5+
toolchain go1.25.8
66

77
require (
88
github.com/hetznercloud/hcloud-go/v2 v2.36.0
99
github.com/prometheus/client_golang v1.23.2
1010
github.com/spf13/pflag v1.0.10
1111
github.com/stretchr/testify v1.11.1
1212
github.com/syself/hrobot-go v0.2.7
13-
golang.org/x/time v0.14.0
13+
golang.org/x/time v0.15.0
1414
k8s.io/api v0.35.2
1515
k8s.io/apimachinery v0.35.2
1616
k8s.io/client-go v0.35.2
1717
k8s.io/cloud-provider v0.35.2
1818
k8s.io/component-base v0.35.2
19-
k8s.io/klog/v2 v2.130.1
19+
k8s.io/klog/v2 v2.140.0
2020
)
2121

2222
require (

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
268268
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
269269
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
270270
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
271+
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
272+
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
271273
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
272274
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
273275
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -348,6 +350,8 @@ k8s.io/controller-manager v0.35.2 h1:EpLIwm4bBgoFwXiVULgNxtpUF9cbXUkcGkZ6vUlurYQ
348350
k8s.io/controller-manager v0.35.2/go.mod h1:CknUpFd1A0S9h+J9eQZXvZt05ssXMnsYCCLRghm/gp4=
349351
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
350352
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
353+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
354+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
351355
k8s.io/kms v0.35.0 h1:/x87FED2kDSo66csKtcYCEHsxF/DBlNl7LfJ1fVQs1o=
352356
k8s.io/kms v0.35.0/go.mod h1:VT+4ekZAdrZDMgShK37vvlyHUVhwI9t/9tvh0AyCWmQ=
353357
k8s.io/kms v0.35.1 h1:kjv2r9g1mY7uL+l1RhyAZvWVZIA/4qIfBHXyjFGLRhU=

0 commit comments

Comments
 (0)