Skip to content

Commit abbb6cd

Browse files
shanshanyingwusai80
shanshanying
and
wusai80
authored
chore: bump controller gen version from 0.14 to 0.18 (#10270)
Co-authored-by: wusai80 <wusai80@gmail.com>
1 parent 8ce658b commit abbb6cd

77 files changed

Lines changed: 1764 additions & 11347 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.

‎.github/workflows/cicd-pull-request.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
1212
BASE_BRANCH: origin/main
13-
GO_VERSION: "1.24"
13+
GO_VERSION: "1.25"
1414

1515
jobs:
1616
trigger-mode:
@@ -136,7 +136,7 @@ jobs:
136136
with:
137137
MAKE_OPS_PRE: "generate"
138138
IMG: "apecloud/kubeblocks"
139-
GO_VERSION: "1.24"
139+
GO_VERSION: "1.25"
140140
BUILDX_PLATFORMS: "linux/amd64"
141141
DOCKERFILE_PATH: "./docker/Dockerfile"
142142
BUILDX_ARGS: |
@@ -152,7 +152,7 @@ jobs:
152152
with:
153153
MAKE_OPS_PRE: "module generate test-go-generate"
154154
IMG: "apecloud/kubeblocks-tools"
155-
GO_VERSION: "1.24"
155+
GO_VERSION: "1.25"
156156
BUILDX_PLATFORMS: "linux/amd64"
157157
DOCKERFILE_PATH: "./docker/Dockerfile-tools"
158158
secrets: inherit
@@ -179,7 +179,7 @@ jobs:
179179
CHART_DIR: "deploy/helm"
180180
APECD_REF: "v0.1.43"
181181
MAKE_OPS_POST: "install"
182-
GO_VERSION: "1.24"
182+
GO_VERSION: "1.25"
183183
secrets: inherit
184184

185185
pr-check:

‎.github/workflows/cicd-push.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
1212
BASE_BRANCH: origin/main
13-
GO_VERSION: "1.24"
13+
GO_VERSION: "1.25"
1414

1515
jobs:
1616
trigger-mode:
@@ -86,7 +86,7 @@ jobs:
8686
echo $(find "$filePath" -type f ! -name "*i18n*" -exec pcregrep -n -I '[^\x00-\x7f]' {} + >> pcregrep.out)
8787
fi
8888
done
89-
89+
9090
python ${{ github.workspace }}/.github/utils/pcregrep.py \
9191
--source="${{ github.workspace }}/pcregrep.out" \
9292
--filter="$FILE_PATH"
@@ -161,7 +161,7 @@ jobs:
161161
with:
162162
MAKE_OPS_PRE: "generate"
163163
IMG: "apecloud/kubeblocks"
164-
GO_VERSION: "1.24"
164+
GO_VERSION: "1.25"
165165
BUILDX_PLATFORMS: "linux/amd64"
166166
DOCKERFILE_PATH: "./docker/Dockerfile"
167167
BUILDX_ARGS: |
@@ -177,7 +177,7 @@ jobs:
177177
with:
178178
MAKE_OPS_PRE: "module generate test-go-generate"
179179
IMG: "apecloud/kubeblocks-tools"
180-
GO_VERSION: "1.24"
180+
GO_VERSION: "1.25"
181181
BUILDX_PLATFORMS: "linux/amd64"
182182
DOCKERFILE_PATH: "./docker/Dockerfile-tools"
183183
secrets: inherit
@@ -203,7 +203,7 @@ jobs:
203203
CHART_DIR: "deploy/helm"
204204
APECD_REF: "v0.1.43"
205205
MAKE_OPS_POST: "install"
206-
GO_VERSION: "1.24"
206+
GO_VERSION: "1.25"
207207
secrets: inherit
208208

209209
deploy-kubeblocks-io:

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
BASE_BRANCH: origin/main
11-
GO_VERSION: "1.24"
11+
GO_VERSION: "1.25"
1212

1313
jobs:
1414
trigger-mode:

‎.github/workflows/release-helm-chart.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
CHART_DIR: "deploy/helm"
4545
APECD_REF: "v0.1.96"
4646
MAKE_OPS_POST: "install"
47-
GO_VERSION: "1.24"
47+
GO_VERSION: "1.25"
4848
secrets: inherit
4949

5050
release-addons-chart:
@@ -75,7 +75,7 @@ jobs:
7575
MAKE_OPS_PRE: "helm-package VERSION=${{ needs.release-version.outputs.release-version-bump }}"
7676
IMG: "apecloud/kubeblocks-charts"
7777
VERSION: "${{ needs.release-version.outputs.release-version }}"
78-
GO_VERSION: "1.24"
78+
GO_VERSION: "1.25"
7979
APECD_REF: "v0.1.86"
8080
DOCKERFILE_PATH: "./docker/Dockerfile-charts"
8181
secrets: inherit
@@ -95,7 +95,7 @@ jobs:
9595
ARTIFACT_KEY="${{ env.RELEASE_VERSION }}-chart"
9696
touch ${ARTIFACT_KEY}
9797
echo 'artifact_key='${ARTIFACT_KEY} >> $GITHUB_OUTPUT
98-
98+
9999
CONTENT="error"
100100
if [[ "${{ needs.release-charts-image.result }}" == "success" ]]; then
101101
CONTENT="success"

‎.github/workflows/release-image.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
MAKE_OPS_PRE: "generate"
7272
IMG: "apecloud/kubeblocks"
7373
VERSION: "${{ needs.release-version.outputs.release-version }}"
74-
GO_VERSION: "1.24"
74+
GO_VERSION: "1.25"
7575
APECD_REF: "v0.1.24"
7676
DOCKERFILE_PATH: "./docker/Dockerfile"
7777
BUILDX_ARGS: |
@@ -88,7 +88,7 @@ jobs:
8888
MAKE_OPS_PRE: "module generate test-go-generate"
8989
IMG: "apecloud/kubeblocks-tools"
9090
VERSION: "${{ needs.release-version.outputs.release-version }}"
91-
GO_VERSION: "1.24"
91+
GO_VERSION: "1.25"
9292
APECD_REF: "v0.1.24"
9393
DOCKERFILE_PATH: "./docker/Dockerfile-tools"
9494
secrets: inherit
@@ -112,7 +112,7 @@ jobs:
112112
MAKE_OPS_PRE: "helm-package VERSION=${{ needs.release-version.outputs.release-version-bump }}"
113113
IMG: "apecloud/kubeblocks-charts"
114114
VERSION: "${{ needs.release-version.outputs.release-version }}"
115-
GO_VERSION: "1.24"
115+
GO_VERSION: "1.25"
116116
APECD_REF: "v0.1.24"
117117
DOCKERFILE_PATH: "./docker/Dockerfile-charts"
118118
secrets: inherit
@@ -137,7 +137,7 @@ jobs:
137137
MAKE_OPS_PRE: "generate"
138138
IMG: "apecloud/kubeblocks"
139139
VERSION: "${{ needs.release-version.outputs.release-version }}-ubi"
140-
GO_VERSION: "1.24"
140+
GO_VERSION: "1.25"
141141
APECD_REF: "v0.1.64"
142142
DOCKERFILE_PATH: "./docker/Dockerfile-ubi"
143143
BUILDX_ARGS: |

‎.github/workflows/release-version.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ run-name: ref_name:${{ github.ref_name }} release_version:${{ inputs.release_ver
1212

1313
env:
1414
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
15-
GO_VERSION: "1.24"
15+
GO_VERSION: "1.25"
1616

1717
jobs:
1818
release-message:
@@ -96,7 +96,7 @@ jobs:
9696
update_release_notes_script=".github/scripts/update_release_notes.py"
9797
if [[ -f "${update_release_notes_script}" ]]; then
9898
check_file_log="check_addon_stable_versions.log"
99-
touch ${check_file_log}
99+
touch ${check_file_log}
100100
python3 ${update_release_notes_script} \
101101
--git-branch "${GIT_BRANCH}" \
102102
--git-tag "${RELEASE_VERSION}" \
@@ -195,7 +195,7 @@ jobs:
195195
git commit -a -m "chore: auto update apis docs"
196196
fi
197197
echo file_changes=$FILE_CHANGES >> $GITHUB_OUTPUT
198-
198+
199199
RELEASE_COMMIT="$(git rev-parse HEAD)"
200200
echo 'RELEASE_COMMIT='${RELEASE_COMMIT} >> $GITHUB_ENV
201201
@@ -230,7 +230,7 @@ jobs:
230230
git commit -a -m "chore: auto upgrade kubeblocks addons version"
231231
fi
232232
echo file_changes=$FILE_CHANGES >> $GITHUB_OUTPUT
233-
233+
234234
RELEASE_COMMIT="$(git rev-parse HEAD)"
235235
echo 'RELEASE_COMMIT='${RELEASE_COMMIT} >> $GITHUB_ENV
236236

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ $(LOCALBIN):
353353

354354
## Tool Versions
355355
KUSTOMIZE_VERSION ?= v5.1.1
356-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
356+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
357357
ENVTEST_VERSION ?= release-0.21
358358

359359
## Tool Binaries

‎apis/operations/v1alpha1/opsrequest_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ type FromBackup struct {
515515

516516
// Specifies the namespace of the Backup namespace.
517517
// If not specified, the namespace of the OpsRequest will be used.
518-
// +kubebuilder:validation:Required
518+
// +optional
519519
Namespace string `json:"namespace,omitempty"`
520520

521521
// Defines container environment variables for the restore process.

‎apis/workloads/v1/zz_generated.deepcopy.go‎

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

0 commit comments

Comments
 (0)