Skip to content

Commit 9569a9d

Browse files
scripts: use scaffold Dockerfile and .golangci.yml instead of backup
Keep scaffold-generated versions for Dockerfile and .golangci.yml, applying MetalK8s customizations programmatically on top (extra COPY layers, ldflags, LABEL block) via a new DockerfilePatch dataclass. This ensures upstream scaffold improvements are picked up automatically on future upgrades. Also cleans up redundant entries (.devcontainer, cover.out) from the merge policy and removes the golangci-lint install/migrate logic.
1 parent 7e6dd52 commit 9569a9d

File tree

2 files changed

+134
-118
lines changed

2 files changed

+134
-118
lines changed

BUMPING.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@ A few tips to bump image versions and SHAs:
126126

127127
## Operator-sdk and Go version
128128

129-
The upgrade is automated by `scripts/upgrade-operator-sdk.py`. The script detects
130-
the latest compatible versions of operator-sdk, Go toolchain and golangci-lint from
131-
their respective public APIs, scaffolds fresh projects, and merges the existing
132-
custom code back. It applies to both `operator/` and `storage-operator/`.
129+
This guide is applied for both `metalk8s-operator` and `storage-operator`.
133130

134131
### Prerequisites
135132

@@ -165,9 +162,9 @@ Options:
165162
--yes, -y Skip the confirmation prompt
166163
```
167164

168-
The script caches `operator-sdk` and `golangci-lint` in `.tmp/bin/` so they are not
169-
re-downloaded on repeated runs. Use `--clean-tools` to reclaim disk space once the
170-
upgrade is validated.
165+
The script caches `operator-sdk` in `.tmp/bin/` so it is not re-downloaded on
166+
repeated runs. Use `--clean-tools` to reclaim disk space once the upgrade is
167+
validated.
171168

172169
### What to review after the upgrade
173170

0 commit comments

Comments
 (0)