Upgrade layout from Kubebuilder v2 to Kubebuilder v3.1 #147

wenchajun · 2021-09-27T07:10:54Z

Follow https://book.kubebuilder.io/migration/v2vsv3.html to upgrade fluentbit-operator

zhu733756 · 2021-10-09T09:06:13Z

Can you add some simple descriptions of the upgrade steps? Since the changed files are huge to have a look at.

wenchajun · 2021-10-09T09:17:03Z

Follow https://book.kubebuilder.io/migration/v2vsv3.html to upgrade fluentbit-operator.
There are mainly the following points:

v3 projects use Go modules and request Go 1.15+. Dep is no longer supported for dependency management.
The PROJECT file now has a new layout. It stores more information about what resources are in use, to better enable plugins to make useful decisions when scaffolding.
Use apiextensions/v1 for generated CRDs (apiextensions/v1beta1 was deprecated in Kubernetes 1.16)
The manager flags --metrics-addr and enable-leader-election now are named --metrics-bind-address and --leader-elect to be more aligned with core Kubernetes Components.
Liveness and Readiness probes are now added by default using healthz.Ping
A new option to create the projects using ComponentConfig is introduced. For more info see its enhancement proposal and the Component config tutorial

zhu733756 · 2021-10-09T14:13:40Z

Makefile

+cd $$TMP_DIR ;\
+go mod init tmp ;\
+echo "Downloading $(2)" ;\
+GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\


Shall we use go install? For more information, see https://golang.org/doc/go-get-install-deprecation

It is automatically generated by kubebuilderv3.1.For the sake of uniformity, it may be not to modify.

It is automatically generated by kubebuilderv3.1.For the sake of uniformity, it may be not to modify.

Starting in Go 1.17, installing executables with go get is deprecated. go install may be used instead. However, this case would not block this pr.

zhu733756 · 2021-10-09T14:14:05Z

api/fluentbitoperator/v1alpha2/groupversion_info.go

@@ -24,11 +25,11 @@ import (
 )

 var (
-	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "logging.kubesphere.io", Version: "v1alpha2"}


I don't think we need to make these changes. Pls revert it.

See next comment. Need to fix here or api/generated/clientset/versioned/typed/fluentbitoperator/v1alpha2/fluentbitoperator_client.go:94:8

thanks，fixed

zhu733756 · 2021-10-09T14:16:12Z

make vet failed，pls re-check it. Details:

api/generated/clientset/versioned/typed/fluentbitoperator/v1alpha2/fluentbitoperator_client.go:94:8: undefined: v1alpha2.SchemeGroupVersion

zhu733756 · 2021-10-09T14:18:48Z

make vet failed，pls re-check it. Details:

api/generated/clientset/versioned/typed/fluentbitoperator/v1alpha2/fluentbitoperator_client.go:94:8: undefined: v1alpha2.SchemeGroupVersion

Maybe we need the github-actions-CI test to check it. :)

benjaminhuo · 2021-10-11T02:29:20Z

make vet failed，pls re-check it. Details:
api/generated/clientset/versioned/typed/fluentbitoperator/v1alpha2/fluentbitoperator_client.go:94:8: undefined: v1alpha2.SchemeGroupVersion
Maybe we need the github-actions-CI test to check it. :)

@zhu733756 Good point, would you investigate adding CI to this project?

zhu733756 · 2021-10-11T02:30:58Z

make vet failed，pls re-check it. Details:
api/generated/clientset/versioned/typed/fluentbitoperator/v1alpha2/fluentbitoperator_client.go:94:8: undefined: v1alpha2.SchemeGroupVersion
Maybe we need the github-actions-CI test to check it. :)
@zhu733756 Good point, would you investigate adding CI to this project?

Ok. Later, will post a pr to add it.

benjaminhuo · 2021-10-11T02:32:47Z

@bojand @keladhruv @nicktate @patrick-stephens We're upgrading kubebuilder to v3.1, you can take a look at this PR and help to review it if you're interested

zhu733756 · 2021-10-11T03:24:40Z

/lgtm

zhu733756 · 2021-10-12T08:42:12Z

make vet failed，pls re-check it. Details:
api/generated/clientset/versioned/typed/fluentbitoperator/v1alpha2/fluentbitoperator_client.go:94:8: undefined: v1alpha2.SchemeGroupVersion
Maybe we need the github-actions-CI test to check it. :)
@zhu733756 Good point, would you investigate adding CI to this project?

Makefile changed in pr #152

benjaminhuo · 2021-10-13T05:42:14Z

@wenchajun Pls rebase your PR because #152 has been merged.
You may need to adjust the kubebuilder CI installation part because #152 installs the v2.x kubebuilder

zhu733756 · 2021-10-13T06:22:34Z

@wenchajun Pls rebase your PR because #152 has been merged. You may need to adjust the kubebuilder CI installation part because #152 installs the v2.x kubebuilder

Since v3.0+ kubebuilder not include files like v2.3+, which will lead to the test files like suite_test.go being failed.
Pls consider this case. @wenchajun

See this fix:
kubernetes-sigs/kubebuilder#326 (comment)

benjaminhuo · 2021-10-14T06:27:28Z

.github/workflows/main.yaml

@@ -37,8 +37,8 @@ jobs:

      - name: Install kubebuilder-2.3.2
        run: |
-          curl -L "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.2/kubebuilder_2.3.2_linux_amd64.tar.gz" | tar -xz -C /tmp/
-          sudo mv /tmp/kubebuilder_2.3.2_linux_amd64 /usr/local/kubebuilder
+          curl -L -o kubebuilder https://go.kubebuilder.io/dl/latest/$(go env GOOS)/$(go env GOARCH)


We'd better use a fixed version instead of latest?

wenchajun · 2021-10-14T12:14:55Z

@wenchajun Pls rebase your PR because #152 has been merged. You may need to adjust the kubebuilder CI installation part because #152 installs the v2.x kubebuilder

Since v3.0+ kubebuilder not include files like v2.3+, which will lead to the test files like suite_test.go being failed. Pls consider this case. @wenchajun

See this fix: kubernetes-sigs/kubebuilder#326 (comment)

Kubebuilderv2 has some differences from v3. The same is true for E2E workflows. Maybe there are some changes here. I modify some E2E files . please review it .

benjaminhuo · 2021-10-15T06:30:17Z

@wenchajun #154 has been merged, would you resolve the conflict again?

benjaminhuo · 2021-10-15T06:30:32Z

@wenchajun Pls rebase your PR because #152 has been merged. You may need to adjust the kubebuilder CI installation part because #152 installs the v2.x kubebuilder

Since v3.0+ kubebuilder not include files like v2.3+, which will lead to the test files like suite_test.go being failed. Pls consider this case. @wenchajun
See this fix: kubernetes-sigs/kubebuilder#326 (comment)

Kubebuilderv2 has some differences from v3. The same is true for E2E workflows. Maybe there are some changes here. I modify some E2E files . please review it .

@zhu733756 would you review Elon's change

zhu733756 · 2021-10-15T06:36:07Z

@wenchajun Pls rebase your PR because #152 has been merged. You may need to adjust the kubebuilder CI installation part because #152 installs the v2.x kubebuilder

Since v3.0+ kubebuilder not include files like v2.3+, which will lead to the test files like suite_test.go being failed. Pls consider this case. @wenchajun
See this fix: kubernetes-sigs/kubebuilder#326 (comment)

Kubebuilderv2 has some differences from v3. The same is true for E2E workflows. Maybe there are some changes here. I modify some E2E files . please review it .

@zhu733756 would you review Elon's change

Ok.

Signed-off-by: chengdehao <[email protected]>

zhu733756 · 2021-10-15T07:25:51Z

/lgtm

See zhu733756#3

wenchajun force-pushed the v3 branch 5 times, most recently from 0cfde06 to 156c821 Compare September 28, 2021 08:13

benjaminhuo requested review from wanjunlei and zhu733756 October 7, 2021 09:25

zhu733756 reviewed Oct 9, 2021

View reviewed changes

benjaminhuo requested a review from bojand October 11, 2021 02:27

wenchajun force-pushed the v3 branch from 148f91d to f0db768 Compare October 11, 2021 02:28

benjaminhuo requested a review from nicktate October 11, 2021 02:30

benjaminhuo requested a review from keladhruv October 11, 2021 02:31

benjaminhuo requested a review from patrick-stephens October 11, 2021 02:33

wenchajun force-pushed the v3 branch from b712577 to a011eb1 Compare October 11, 2021 04:32

wenchajun force-pushed the v3 branch 2 times, most recently from 4ed9080 to 9d0dbdb Compare October 13, 2021 15:05

benjaminhuo reviewed Oct 14, 2021

View reviewed changes

wenchajun force-pushed the v3 branch 2 times, most recently from aec65bb to 2789bd6 Compare October 14, 2021 10:39

root added 2 commits October 15, 2021 14:40

Upgrade layout from Kubebuilder v2 to Kubebuilder v3.1

77d75aa

Signed-off-by: chengdehao <[email protected]>

update and Resolve the conflict

f54c8d8

Signed-off-by: chengdehao <[email protected]>

wenchajun force-pushed the v3 branch from 2789bd6 to f54c8d8 Compare October 15, 2021 06:45

wenchajun force-pushed the v3 branch from d84e85f to f54c8d8 Compare October 15, 2021 07:31

benjaminhuo merged commit bfe1101 into fluent:master Oct 15, 2021

wenchajun deleted the v3 branch February 14, 2022 06:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade layout from Kubebuilder v2 to Kubebuilder v3.1 #147

Upgrade layout from Kubebuilder v2 to Kubebuilder v3.1 #147

wenchajun commented Sep 27, 2021

zhu733756 commented Oct 9, 2021 •

edited

Loading

wenchajun commented Oct 9, 2021

zhu733756 Oct 9, 2021

wenchajun Oct 11, 2021 •

edited

Loading

zhu733756 Oct 11, 2021

zhu733756 Oct 9, 2021

zhu733756 Oct 9, 2021

wenchajun Oct 11, 2021

zhu733756 commented Oct 9, 2021

zhu733756 commented Oct 9, 2021 •

edited

Loading

benjaminhuo commented Oct 11, 2021

zhu733756 commented Oct 11, 2021

benjaminhuo commented Oct 11, 2021 •

edited

Loading

zhu733756 commented Oct 11, 2021

zhu733756 commented Oct 12, 2021

benjaminhuo commented Oct 13, 2021

zhu733756 commented Oct 13, 2021 •

edited

Loading

benjaminhuo Oct 14, 2021

wenchajun commented Oct 14, 2021

benjaminhuo commented Oct 15, 2021

benjaminhuo commented Oct 15, 2021

zhu733756 commented Oct 15, 2021 •

edited

Loading

zhu733756 commented Oct 15, 2021 •

edited

Loading

Upgrade layout from Kubebuilder v2 to Kubebuilder v3.1 #147

Upgrade layout from Kubebuilder v2 to Kubebuilder v3.1 #147

Conversation

wenchajun commented Sep 27, 2021

zhu733756 commented Oct 9, 2021 • edited Loading

wenchajun commented Oct 9, 2021

zhu733756 Oct 9, 2021

Choose a reason for hiding this comment

wenchajun Oct 11, 2021 • edited Loading

Choose a reason for hiding this comment

zhu733756 Oct 11, 2021

Choose a reason for hiding this comment

zhu733756 Oct 9, 2021

Choose a reason for hiding this comment

zhu733756 Oct 9, 2021

Choose a reason for hiding this comment

wenchajun Oct 11, 2021

Choose a reason for hiding this comment

zhu733756 commented Oct 9, 2021

zhu733756 commented Oct 9, 2021 • edited Loading

benjaminhuo commented Oct 11, 2021

zhu733756 commented Oct 11, 2021

benjaminhuo commented Oct 11, 2021 • edited Loading

zhu733756 commented Oct 11, 2021

zhu733756 commented Oct 12, 2021

benjaminhuo commented Oct 13, 2021

zhu733756 commented Oct 13, 2021 • edited Loading

benjaminhuo Oct 14, 2021

Choose a reason for hiding this comment

wenchajun commented Oct 14, 2021

benjaminhuo commented Oct 15, 2021

benjaminhuo commented Oct 15, 2021

zhu733756 commented Oct 15, 2021 • edited Loading

zhu733756 commented Oct 15, 2021 • edited Loading

zhu733756 commented Oct 9, 2021 •

edited

Loading

wenchajun Oct 11, 2021 •

edited

Loading

zhu733756 commented Oct 9, 2021 •

edited

Loading

benjaminhuo commented Oct 11, 2021 •

edited

Loading

zhu733756 commented Oct 13, 2021 •

edited

Loading

zhu733756 commented Oct 15, 2021 •

edited

Loading

zhu733756 commented Oct 15, 2021 •

edited

Loading