Skip to content

Commit d4808b9

Browse files
committed
merge: resolve conflicts with main after PR #2454
Merge origin/main into feat/kubernetes-kubelet-reserved-resources. PR #2454 (persistent storage for worker nodes) landed in main and touched the same nodeGroups schema. Conflicts resolved by keeping both feature sets (kubelet reservations + persistent storage): - api/apps/v1alpha1/kubernetes/types.go: merged kubebuilder default marker with all keys from both features - packages/apps/kubernetes/README.md: merged Parameters table with diskSize/storageClass + kubelet* rows - packages/system/kubernetes-rd/cozyrds/kubernetes.yaml: merged openAPISchema and keysOrder, dropped stale ephemeralStorage path Signed-off-by: Arsolitt <[email protected]>
2 parents 34ec220 + d6cafd7 commit d4808b9

133 files changed

Lines changed: 12013 additions & 370 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Codegen Drift Check
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
paths:
7+
- 'api/**'
8+
- 'pkg/apis/**'
9+
- 'pkg/generated/**'
10+
- 'internal/crdinstall/manifests/**'
11+
- 'packages/system/cozystack-controller/definitions/**'
12+
- 'packages/system/application-definition-crd/definition/**'
13+
- 'packages/system/backup-controller/definitions/**'
14+
- 'packages/system/backupstrategy-controller/definitions/**'
15+
- 'hack/update-codegen.sh'
16+
- 'hack/boilerplate.go.txt'
17+
- 'Makefile'
18+
- 'go.mod'
19+
- 'go.sum'
20+
- '.github/workflows/codegen-drift.yml'
21+
22+
concurrency:
23+
group: codegen-drift-${{ github.workflow }}-${{ github.event.pull_request.number }}
24+
cancel-in-progress: true
25+
26+
jobs:
27+
codegen-drift:
28+
name: Verify generated code is up to date
29+
runs-on: ubuntu-22.04
30+
steps:
31+
- name: Checkout code
32+
uses: actions/checkout@v4
33+
34+
- name: Set up Go
35+
uses: actions/setup-go@v5
36+
with:
37+
go-version-file: go.mod
38+
cache: true
39+
40+
- name: Pre-fetch k8s.io/code-generator module
41+
# hack/update-codegen.sh sources kube_codegen.sh from the Go module cache.
42+
# The module is not declared in go.mod, so fetch it explicitly at the
43+
# version pinned in the script.
44+
run: |
45+
version=$(grep -oP 'code-generator@\Kv[0-9.]+' hack/update-codegen.sh)
46+
tmpdir=$(mktemp -d)
47+
cd "$tmpdir"
48+
go mod init codegen-fetch
49+
go get "k8s.io/code-generator@${version}"
50+
51+
- name: Run make generate
52+
run: make generate
53+
54+
- name: Fail on drift
55+
run: |
56+
if [ -n "$(git status --porcelain)" ]; then
57+
echo "::error::'make generate' produced changes. Run 'make generate' locally and commit the result."
58+
git status --short
59+
git diff --color=always
60+
exit 1
61+
fi

‎.github/workflows/pull-requests-release.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ jobs:
122122
- name: Publish draft release
123123
uses: actions/github-script@v7
124124
with:
125+
github-token: ${{ steps.app-token.outputs.token }}
125126
script: |
126127
const tag = '${{ steps.get_tag.outputs.tag }}';
127128
const m = tag.match(/^v(\d+\.\d+\.\d+)(-(?:alpha|beta|rc)\.\d+)?$/);

‎.pre-commit-config.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
repos:
22
- repo: local
33
hooks:
4+
- id: run-make-generate-root
5+
name: Run 'make generate' at repo root
6+
entry: |
7+
flock -x .git/pre-commit.lock sh -c '
8+
echo "Running make generate at repo root"
9+
make generate || exit $?
10+
git diff --color=always | cat
11+
'
12+
language: system
13+
files: ^(api/|pkg/apis/|pkg/generated/|internal/crdinstall/manifests/|packages/system/cozystack-controller/definitions/|packages/system/application-definition-crd/definition/|packages/system/backup-controller/definitions/|packages/system/backupstrategy-controller/definitions/|hack/update-codegen\.sh$|hack/boilerplate\.go\.txt$|Makefile$)
14+
pass_filenames: false
415
- id: run-make-generate
516
name: Run 'make generate' in all app directories
617
entry: |

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ build: build-deps
2222
make -C packages/system/lineage-controller-webhook image
2323
make -C packages/system/cilium image
2424
make -C packages/system/linstor image
25+
make -C packages/system/linstor-gui image
2526
make -C packages/system/kubeovn-webhook image
2627
make -C packages/system/kubeovn-plunger image
2728
make -C packages/system/dashboard image

‎api/apps/v1alpha1/kubernetes/types.go‎

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/apps/v1alpha1/kubernetes/zz_generated.deepcopy.go‎

Lines changed: 34 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/apps/v1alpha1/postgresql/types.go‎

Lines changed: 6 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/apps/v1alpha1/postgresql/zz_generated.deepcopy.go‎

Lines changed: 8 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/apps/v1alpha1/vminstance/types.go‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/backups/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)