From 788d6707d02d29ccf62c78917419b8eb0dba548b Mon Sep 17 00:00:00 2001 From: Gardener-CICD Bot Date: Fri, 29 Aug 2025 12:05:34 +0000 Subject: [PATCH] Upgrade github.com/gardener/machine-controller-manager from v0.58.0 to v0.60.0 --- .ocm/base-component.yaml | 42 +++---- ...troller-manager_v0.59.0.release-notes.yaml | 27 +++++ ...troller-manager_v0.60.0.release-notes.yaml | 112 ++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- 5 files changed, 163 insertions(+), 24 deletions(-) create mode 100644 .ocm/release-notes/github.com_gardener_machine-controller-manager_v0.59.0.release-notes.yaml create mode 100644 .ocm/release-notes/github.com_gardener_machine-controller-manager_v0.60.0.release-notes.yaml diff --git a/.ocm/base-component.yaml b/.ocm/base-component.yaml index 609e2987..5cf837c0 100644 --- a/.ocm/base-component.yaml +++ b/.ocm/base-component.yaml @@ -1,25 +1,25 @@ +componentReferences: +- componentName: github.com/gardener/machine-controller-manager + name: machine-controller-manager + version: v0.60.0 +labels: +- name: cloud.gardener.cnudie/responsibles + value: + - type: githubUser + username: aaronfern + - type: githubUser + username: unmarshall + - type: githubUser + username: elankath + - type: githubUser + username: thiyyakat + - type: githubUser + username: takoverflow main-source: labels: - - name: cloud.gardener.cnudie/dso/scanning-hints/source_analysis/v1 - value: - policy: skip - comment: | - we use gosec for sast scanning. See attached log. -labels: - - name: 'cloud.gardener.cnudie/responsibles' + - name: cloud.gardener.cnudie/dso/scanning-hints/source_analysis/v1 value: - - type: 'githubUser' - username: 'aaronfern' - - type: 'githubUser' - username: 'unmarshall' - - type: 'githubUser' - username: 'elankath' - - type: 'githubUser' - username: 'thiyyakat' - - type: 'githubUser' - username: 'takoverflow' + comment: 'we use gosec for sast scanning. See attached log. -componentReferences: - - name: machine-controller-manager - componentName: github.com/gardener/machine-controller-manager - version: v0.58.0 + ' + policy: skip diff --git a/.ocm/release-notes/github.com_gardener_machine-controller-manager_v0.59.0.release-notes.yaml b/.ocm/release-notes/github.com_gardener_machine-controller-manager_v0.59.0.release-notes.yaml new file mode 100644 index 00000000..e9a40e53 --- /dev/null +++ b/.ocm/release-notes/github.com_gardener_machine-controller-manager_v0.59.0.release-notes.yaml @@ -0,0 +1,27 @@ +ocm: + component_name: github.com/gardener/machine-controller-manager + component_version: v0.59.0 +release_notes: +- audience: null + author: null + category: null + contents: | + # [gardener/machine-controller-manager] + + ## ✨ New Features + + - `[OPERATOR]` machine-controller-manager can manage machines without a target cluster by specifying `--target-kubeconfig=none`. See the [documentation](https://github.com/gardener/machine-controller-manager/blob/master/docs/FAQ.md#how-to-run-mcm-in-different-cluster-setups) for more details. by @timebertt [#1004] + ## 🐛 Bug Fixes + + - `[OPERATOR]` Fix a bug where MCM does not check if a pod has already been evicted before reattempting eviction blindly by @aaronfern [#979] + - `[OPERATOR]` Fixed a bug in the MachineSet controller where the machine status was set to `Terminating` even if attempt to delete the machine object failed. by @takoverflow [#995] + ## 🏃 Others + + - `[OPERATOR]` add new label `node_name` to the `mcm_machine_info` metric by @aaronfern [#1000] + - `[OPERATOR]` machine-controller-manager base image is updated to `gcr.io/distroless/static-debian12:nonroot`. by @aaronfern [#991] + + ## Container (OCI) Images + - machine-controller-manager: `europe-docker.pkg.dev/gardener-project/releases/gardener/machine-controller-manager:v0.59.0` + mimetype: text/markdown + reference: null + type: prerendered diff --git a/.ocm/release-notes/github.com_gardener_machine-controller-manager_v0.60.0.release-notes.yaml b/.ocm/release-notes/github.com_gardener_machine-controller-manager_v0.60.0.release-notes.yaml new file mode 100644 index 00000000..e8a04683 --- /dev/null +++ b/.ocm/release-notes/github.com_gardener_machine-controller-manager_v0.60.0.release-notes.yaml @@ -0,0 +1,112 @@ +ocm: + component_name: github.com/gardener/machine-controller-manager + component_version: v0.60.0 +release_notes: +- audience: operator + author: + hostname: github.com + type: githubUser + username: maboehm + category: feature + contents: When running without a target cluster machine-controller-manager will + report a new status field `addresses` + mimetype: text/markdown + reference: '[#1012](https://github.com/gardener/machine-controller-manager/pull/1012)' + type: standard +- audience: operator + author: + hostname: github.com + type: githubUser + username: acumino + category: other + contents: '`node.gardener.cloud/critical-components-not-ready` taint is added to + the node after the successful in-place update to prevent scheduling any workload + before critical component pods are ready.' + mimetype: text/markdown + reference: '[#1017](https://github.com/gardener/machine-controller-manager/pull/1017)' + type: standard +- audience: operator + author: + hostname: github.com + type: githubUser + username: gagan16k + category: bugfix + contents: | + Fixed metric `mcm_machine_set_failed_machines` and underlying variable `*machineSet.Status.FailedMachines` so that they reflect the current state of machines + mimetype: text/markdown + reference: '[#1025](https://github.com/gardener/machine-controller-manager/pull/1025)' + type: standard +- audience: operator + author: + hostname: github.com + type: githubUser + username: heldkat + category: other + contents: export testresults as inlined ocm-resource + mimetype: text/markdown + reference: '[#1022](https://github.com/gardener/machine-controller-manager/pull/1022)' + type: standard +- audience: user + author: + hostname: github.com + type: githubUser + username: thiyyakat + category: bugfix + contents: Fixed checking of `createMachineTimeout` when machine is `Pending` + mimetype: text/markdown + reference: '[#1015](https://github.com/gardener/machine-controller-manager/pull/1015)' + type: standard +- audience: operator + author: + hostname: github.com + type: githubUser + username: acumino + category: bugfix + contents: Fixed a bug where machines in the `InPlaceUpdating` phase were incorrectly + transferred to the new machine set during inplace updates. This caused the machine + controller to miss updating the phase to `InPlaceUpdateSuccessful`, resulting + in machines getting stuck or marked as `InPlaceUpdateFailed`. + mimetype: text/markdown + reference: '[#1020](https://github.com/gardener/machine-controller-manager/pull/1020)' + type: standard +- audience: developer + author: + hostname: github.com + type: githubUser + username: ccwienk + category: other + contents: migrate CICD-Pipeline to GitHub-Actions + mimetype: text/markdown + reference: '[#1011](https://github.com/gardener/machine-controller-manager/pull/1011)' + type: standard +- audience: operator + author: + hostname: github.com + type: githubUser + username: elankath + category: feature + contents: Machine Class now has VirtualCapacity field hat maps to WorkerPool's NodeTemplate + VirtualCapacity. + mimetype: text/markdown + reference: '[#1024](https://github.com/gardener/machine-controller-manager/pull/1024)' + type: standard +- audience: operator + author: + hostname: github.com + type: githubUser + username: gagan16k + category: other + contents: Add informational logging for MachineDeployment rollout events + mimetype: text/markdown + reference: '[#1029](https://github.com/gardener/machine-controller-manager/pull/1029)' + type: standard +- audience: developer + author: + hostname: github.com + type: githubUser + username: thiyyakat + category: other + contents: Convert `.reuse/dep5` to `REUSE.toml`. + mimetype: text/markdown + reference: '[#1026](https://github.com/gardener/machine-controller-manager/pull/1026)' + type: standard diff --git a/go.mod b/go.mod index 13ce81c2..b32bd865 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.3 require ( github.com/aws/aws-sdk-go v1.51.28 github.com/cenkalti/backoff/v4 v4.3.0 - github.com/gardener/machine-controller-manager v0.59.0 + github.com/gardener/machine-controller-manager v0.60.0 github.com/onsi/ginkgo/v2 v2.23.0 github.com/onsi/gomega v1.36.2 github.com/prometheus/client_golang v1.19.1 diff --git a/go.sum b/go.sum index f0dc4204..a274477c 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= -github.com/gardener/machine-controller-manager v0.59.0 h1:tmFbxGCTmKfGujPyM1MzYtRWNu/STPQHZ3JEXymIIZ4= -github.com/gardener/machine-controller-manager v0.59.0/go.mod h1:TCU/KoudCMt2eV0Jnrq2D1TwgsrBCuhIVgV3j1el6Og= +github.com/gardener/machine-controller-manager v0.60.0 h1:aaSE85Yu0hcHYsP5/x1rxWa5o2zhmsmXlKQ+xefHY/Q= +github.com/gardener/machine-controller-manager v0.60.0/go.mod h1:8eE1qLztrWIbOM71mHSQGaC6Q+pl5lvOyN08qP39D7o= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=