Skip to content

Commit 883c2b1

Browse files
aaronferndependabot[bot]gardener-github-actions[bot]github-actions[bot]
authored andcommitted
[rel-v0.24] Cherry pick 324 and 311
* Bump github.com/gardener/gardener from 1.126.0 to 1.127.0 Bumps [github.com/gardener/gardener](https://github.com/gardener/gardener) from 1.126.0 to 1.127.0. - [Release notes](https://github.com/gardener/gardener/releases) - [Commits](gardener/gardener@v1.126.0...v1.127.0) --- updated-dependencies: - dependency-name: github.com/gardener/gardener dependency-version: 1.127.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Upgrade github.com/gardener/machine-controller-manager from v0.60.0 to v0.60.1 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: gardener-github-actions[bot] <207909872+gardener-github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 93734ed commit 883c2b1

4 files changed

Lines changed: 25 additions & 10 deletions

File tree

.ocm/base-component.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
componentReferences:
22
- componentName: github.com/gardener/machine-controller-manager
33
name: machine-controller-manager
4-
version: v0.60.0
4+
version: v0.60.1
55
main-source:
66
labels:
77
- name: cloud.gardener.cnudie/dso/scanning-hints/source_analysis/v1
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ocm:
2+
component_name: github.com/gardener/machine-controller-manager
3+
component_version: v0.60.1
4+
release_notes:
5+
- audience: operator
6+
author:
7+
hostname: github.com
8+
type: githubUser
9+
username: takoverflow
10+
category: bugfix
11+
contents: Added a safeguard to delay deletion of machines that are undergoing a
12+
`Create` Request to prevent orphaning of VMs.
13+
mimetype: text/markdown
14+
reference: '[#1045](https://github.com/gardener/machine-controller-manager/pull/1045)'
15+
type: standard

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.25.0
44

55
require (
66
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
7-
github.com/gardener/gardener v1.126.0
8-
github.com/gardener/machine-controller-manager v0.60.0
7+
github.com/gardener/gardener v1.127.0
8+
github.com/gardener/machine-controller-manager v0.60.1
99
github.com/gophercloud/gophercloud/v2 v2.8.0
1010
github.com/onsi/ginkgo/v2 v2.25.2
1111
github.com/onsi/gomega v1.38.2
@@ -59,7 +59,7 @@ require (
5959
github.com/prometheus/common v0.65.0 // indirect
6060
github.com/prometheus/procfs v0.17.0 // indirect
6161
github.com/russross/blackfriday/v2 v2.1.0 // indirect
62-
github.com/spf13/cobra v1.9.1 // indirect
62+
github.com/spf13/cobra v1.10.1 // indirect
6363
github.com/x448/float16 v0.8.4 // indirect
6464
go.opentelemetry.io/otel v1.37.0 // indirect
6565
go.opentelemetry.io/otel/trace v1.37.0 // indirect
@@ -97,4 +97,4 @@ require (
9797
sigs.k8s.io/yaml v1.5.0 // indirect
9898
)
9999

100-
replace github.com/gardener/machine-controller-manager => github.com/stackitcloud/machine-controller-manager v0.60.0-ske-1
100+
replace github.com/gardener/machine-controller-manager => github.com/stackitcloud/machine-controller-manager v0.60.2-ske-1

go.sum

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
2525
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
2626
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
2727
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
28-
github.com/gardener/gardener v1.126.0 h1:ohn/YqK+HOFWov309WkxBFi8VSAuthpP0mgXf5kJHaY=
29-
github.com/gardener/gardener v1.126.0/go.mod h1:tJ4zF+B3GlseYTPJSnZaXd2K+CKHsoLfele8T1gHJJs=
28+
github.com/gardener/gardener v1.127.0 h1:vp0j/QhU4xlnIetsNnvNOeuR2bNg7Q9KgOoHoWFz2Sk=
29+
github.com/gardener/gardener v1.127.0/go.mod h1:OQBZdCX82NxFs3N2w94YyOXWRZDqzo/W0PGj7QevMvQ=
3030
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
3131
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
3232
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
@@ -126,10 +126,10 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
126126
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
127127
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
128128
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
129-
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
130-
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
129+
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
130+
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
131131
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
132-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
132+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
133133
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
134134
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
135135
github.com/stackitcloud/machine-controller-manager v0.60.0-ske-1 h1:XPE1wIcwawZRb15O2t7sYDw8ze/80lbphP+lcGyfHdA=

0 commit comments

Comments
 (0)