Skip to content

Commit c52abd3

Browse files
dependabot[bot]hebelsan
dependabot[bot]
and
hebelsan
authored
Bump github.com/gardener/gardener from 1.119.0 to 1.126.0 (gardener#304)
* Bump github.com/gardener/gardener from 1.119.0 to 1.126.0 Bumps [github.com/gardener/gardener](https://github.com/gardener/gardener) from 1.119.0 to 1.126.0. - [Release notes](https://github.com/gardener/gardener/releases) - [Commits](gardener/gardener@v1.119.0...v1.126.0) --- updated-dependencies: - dependency-name: github.com/gardener/gardener dependency-version: 1.126.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Mak tidy * Fix update-codegen.sh * Merge master --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexander Hebel <a.hebelsun@gmail.com> Co-authored-by: Alexander Hebel <alexander.hebel@sap.com>
1 parent e17baa6 commit c52abd3

7 files changed

Lines changed: 160 additions & 189 deletions

File tree

‎.ci/hack/component_descriptor‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
3+
# SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and Gardener contributors
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

@@ -17,36 +17,8 @@
1717
set -e
1818

1919
repo_root_dir="$1"
20-
repo_name="${2:-github.com/gardener/gardener}"
2120
descriptor_out_file="${COMPONENT_DESCRIPTOR_PATH}"
2221

23-
resources_file="$repo_root_dir/.ci/resources.yaml"
24-
if [[ -f ${resources_file} ]]; then
25-
echo "Adding additional resources from ${resources_file}"
26-
27-
# component-cli expects a directory where the component descriptor file is named component-descriptor.yaml.
28-
# however the pre-rendered component descriptors of the pipeline have different filenames.
29-
# therefore create a tempdir and copy the pre-rendered component descriptor to it with the correct filename.
30-
tmp_dir="$(mktemp -d)"
31-
tmp_cd="${tmp_dir}/component-descriptor.yaml"
32-
cp "${BASE_DEFINITION_PATH}" "${tmp_cd}"
33-
echo "${tmp_cd}"
34-
35-
# read the component version.
36-
if [[ -z ${EFFECTIVE_VERSION} ]]; then
37-
echo "The env variable EFFECTIVE_VERSION must be set"
38-
exit 1
39-
fi
40-
41-
# adds all resources defined in the resources file to the component descriptor.
42-
component-cli component-archive resources add ${tmp_dir} ${resources_file} -v=3 -- COMPONENT_VERSION=${EFFECTIVE_VERSION}
43-
44-
# move modified component descriptor back to the original file.
45-
mv "${tmp_cd}" "${BASE_DEFINITION_PATH}"
46-
else
47-
echo "Resources file ${resources_file} not found. Skip adding additional resources."
48-
fi
49-
5022
echo "Enriching component descriptor from ${BASE_DEFINITION_PATH}"
5123

5224
image_vector_path=""

‎.ci/hack/doc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
2+
* SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and Gardener contributors
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/

‎.ci/hack/prepare_release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env sh
22
#
3-
# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
3+
# SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and Gardener contributors
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

‎.ci/hack/set_dependency_version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22
#
3-
# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
3+
# SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and Gardener contributors
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

‎go.mod‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,96 +6,95 @@ toolchain go1.24.1
66

77
require (
88
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
9-
github.com/gardener/gardener v1.119.0
9+
github.com/gardener/gardener v1.126.0
1010
github.com/gardener/machine-controller-manager v0.60.0
1111
github.com/gophercloud/gophercloud/v2 v2.7.0
12-
github.com/onsi/ginkgo/v2 v2.23.4
13-
github.com/onsi/gomega v1.37.0
14-
github.com/prometheus/client_golang v1.22.0
15-
github.com/spf13/pflag v1.0.6
16-
go.uber.org/mock v0.5.2
17-
k8s.io/api v0.32.4
18-
k8s.io/apimachinery v0.32.4
19-
k8s.io/code-generator v0.32.4
20-
k8s.io/component-base v0.32.4
12+
github.com/onsi/ginkgo/v2 v2.25.0
13+
github.com/onsi/gomega v1.38.0
14+
github.com/prometheus/client_golang v1.23.0
15+
github.com/spf13/pflag v1.0.7
16+
go.uber.org/mock v0.6.0
17+
k8s.io/api v0.33.4
18+
k8s.io/apimachinery v0.33.4
19+
k8s.io/code-generator v0.33.4
20+
k8s.io/component-base v0.33.4
2121
k8s.io/klog/v2 v2.130.1
22-
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
23-
sigs.k8s.io/controller-runtime v0.20.4
22+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
23+
sigs.k8s.io/controller-runtime v0.21.0
2424
)
2525

2626
require (
27-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
27+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2828
github.com/beorn7/perks v1.0.1 // indirect
2929
github.com/blang/semver/v4 v4.0.0 // indirect
3030
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3131
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
32-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
32+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3333
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3434
github.com/fatih/color v1.18.0 // indirect
35-
github.com/fsnotify/fsnotify v1.8.0 // indirect
35+
github.com/fsnotify/fsnotify v1.9.0 // indirect
3636
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
37-
github.com/go-logr/logr v1.4.2 // indirect
38-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
37+
github.com/go-logr/logr v1.4.3 // indirect
38+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3939
github.com/go-openapi/jsonreference v0.21.0 // indirect
40-
github.com/go-openapi/swag v0.23.0 // indirect
40+
github.com/go-openapi/swag v0.23.1 // indirect
4141
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4242
github.com/gobuffalo/flect v1.0.3 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
44-
github.com/golang/protobuf v1.5.4 // indirect
4544
github.com/google/btree v1.1.3 // indirect
46-
github.com/google/gnostic-models v0.6.9 // indirect
45+
github.com/google/gnostic-models v0.7.0 // indirect
4746
github.com/google/go-cmp v0.7.0 // indirect
48-
github.com/google/gofuzz v1.2.0 // indirect
4947
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
5048
github.com/google/uuid v1.6.0 // indirect
5149
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5250
github.com/ironcore-dev/vgopath v0.1.5 // indirect
5351
github.com/josharian/intern v1.0.0 // indirect
5452
github.com/json-iterator/go v1.1.12 // indirect
5553
github.com/mailru/easyjson v0.9.0 // indirect
56-
github.com/mattn/go-colorable v0.1.13 // indirect
54+
github.com/mattn/go-colorable v0.1.14 // indirect
5755
github.com/mattn/go-isatty v0.0.20 // indirect
5856
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5957
github.com/modern-go/reflect2 v1.0.2 // indirect
6058
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6159
github.com/pkg/errors v0.9.1 // indirect
62-
github.com/prometheus/client_model v0.6.1 // indirect
63-
github.com/prometheus/common v0.63.0 // indirect
64-
github.com/prometheus/procfs v0.15.1 // indirect
60+
github.com/prometheus/client_model v0.6.2 // indirect
61+
github.com/prometheus/common v0.65.0 // indirect
62+
github.com/prometheus/procfs v0.17.0 // indirect
6563
github.com/russross/blackfriday/v2 v2.1.0 // indirect
6664
github.com/spf13/cobra v1.9.1 // indirect
6765
github.com/x448/float16 v0.8.4 // indirect
68-
go.opentelemetry.io/otel v1.32.0 // indirect
69-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
66+
go.opentelemetry.io/otel v1.37.0 // indirect
67+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
7068
go.uber.org/automaxprocs v1.6.0 // indirect
71-
golang.org/x/mod v0.24.0 // indirect
72-
golang.org/x/net v0.40.0 // indirect
73-
golang.org/x/oauth2 v0.28.0 // indirect
74-
golang.org/x/sync v0.14.0 // indirect
75-
golang.org/x/sys v0.33.0 // indirect
76-
golang.org/x/term v0.32.0 // indirect
77-
golang.org/x/text v0.25.0 // indirect
78-
golang.org/x/time v0.11.0 // indirect
79-
golang.org/x/tools v0.33.0 // indirect
69+
go.yaml.in/yaml/v2 v2.4.2 // indirect
70+
go.yaml.in/yaml/v3 v3.0.3 // indirect
71+
golang.org/x/mod v0.27.0 // indirect
72+
golang.org/x/net v0.43.0 // indirect
73+
golang.org/x/oauth2 v0.30.0 // indirect
74+
golang.org/x/sync v0.16.0 // indirect
75+
golang.org/x/sys v0.35.0 // indirect
76+
golang.org/x/term v0.34.0 // indirect
77+
golang.org/x/text v0.28.0 // indirect
78+
golang.org/x/time v0.12.0 // indirect
79+
golang.org/x/tools v0.36.0 // indirect
80+
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
8081
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
81-
google.golang.org/protobuf v1.36.5 // indirect
82+
google.golang.org/protobuf v1.36.6 // indirect
8283
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8384
gopkg.in/inf.v0 v0.9.1 // indirect
8485
gopkg.in/yaml.v2 v2.4.0 // indirect
8586
gopkg.in/yaml.v3 v3.0.1 // indirect
86-
k8s.io/apiextensions-apiserver v0.32.4 // indirect
87-
k8s.io/apiserver v0.32.4 // indirect
88-
k8s.io/client-go v0.32.4 // indirect
89-
k8s.io/cluster-bootstrap v0.32.4 // indirect
87+
k8s.io/apiextensions-apiserver v0.33.4 // indirect
88+
k8s.io/apiserver v0.33.4 // indirect
89+
k8s.io/client-go v0.33.4 // indirect
90+
k8s.io/cluster-bootstrap v0.33.4 // indirect
9091
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
91-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
92+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
9293
k8s.io/klog v1.0.0 // indirect
93-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
94-
sigs.k8s.io/controller-tools v0.17.3 // indirect
94+
k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
95+
sigs.k8s.io/controller-tools v0.18.0 // indirect
9596
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
97+
sigs.k8s.io/randfill v1.0.0 // indirect
9698
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
97-
sigs.k8s.io/yaml v1.4.0 // indirect
99+
sigs.k8s.io/yaml v1.5.0 // indirect
98100
)
99-
100-
// temporary workaround while gardener adopts latest client packages
101-
replace k8s.io/code-generator => k8s.io/code-generator v0.29.0

0 commit comments

Comments
 (0)