build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, … #1251

jiuxia211 · 2024-07-21T03:37:29Z

…sigs.k8s.io/controller-runtime,github.com/onsi/gomega

What this PR does / why we need it:

This PR updates multiple dependencies to their latest versions to ensure compatibility and benefit from the latest features and bug fixes. Specifically, it bumps the following dependencies:

k8s.io/client-go from 0.26.3 to 0.30.2
k8s.io/apimachinery from 0.27.4 to 0.30.2
k8s.io/api from 0.26.3 to 0.30.2
sigs.k8s.io/controller-runtime from 0.14.6 to 0.18.4
github.com/onsi/gomega from 1.30.0 to 1.33.1

Which issue(s) this PR fixes:

Fixes #

Does this PR introduced a user-facing change?

None

Additional documentation, usage docs, etc.:

…sigs.k8s.io/controller-runtime,github.com/onsi/gomega

wenchajun · 2024-07-21T12:47:27Z

Thanks for the PR. You'll need to sign your commit by:

git commit -s --amend
git push -f

wenchajun · 2024-07-21T12:49:53Z

I see

./hack/update-codegen.sh
>> Temporary output directory /tmp/tmp.9aV294mKFK
ERROR: generate-groups.sh has been removed.
ERROR: Please use k8s.io/code-generator/kube_codegen.sh instead.

wenchajun · 2024-07-21T12:56:20Z

go.mod

@@ -1,85 +1,85 @@
 module github.com/fluent/fluent-operator/v2

-go 1.21
+go 1.22.0


https://github.com/fluent/fluent-operator/blob/master/cmd/fluent-manager/Dockerfile#L2
this should be upgraded too.

The files in the dockerfile also need to be upgraded to the latest.

…orage Signed-off-by: jiuxia211 <[email protected]>

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

jiuxia211 · 2024-07-21T21:21:22Z

I see

./hack/update-codegen.sh
>> Temporary output directory /tmp/tmp.9aV294mKFK
ERROR: generate-groups.sh has been removed.
ERROR: Please use k8s.io/code-generator/kube_codegen.sh instead.

I updated update-codegen.sh following https://github.com/weaveworks/flagger/tree/main/hack but it doesn't seem to produce any output or changes and I'm not quite sure why this is happening

benjaminhuo · 2024-07-22T01:41:43Z

Great, thanks @jiuxia211 !
Looks like only one problem remains:

cc @wanjunlei

wenchajun · 2024-07-22T01:49:53Z

I see
./hack/update-codegen.sh
>> Temporary output directory /tmp/tmp.9aV294mKFK
ERROR: generate-groups.sh has been removed.
ERROR: Please use k8s.io/code-generator/kube_codegen.sh instead.
I updated update-codegen.sh following https://github.com/weaveworks/flagger/tree/main/hack but it doesn't seem to produce any output or changes and I'm not quite sure why this is happening

You can run the command in your machine

make verify-codegen

>> Temporary output directory /tmp/tmp.oapWI9rc0l
ERROR: generate-groups.sh has been removed.
ERROR: Please use k8s.io/code-generator/kube_codegen.sh instead.

>> Removing /tmp/tmp.oapWI9rc0l
make: ***Makefile:91: verify-codegen] Error 1

wenchajun · 2024-07-22T01:51:17Z

https://github.com/fluent/fluent-operator/blob/master/.github/workflows/build-fd-image.yaml#L179
this shoud be updated too.

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

wenchajun · 2024-07-23T08:26:17Z

cmd/fluent-manager/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.21.5-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22.5-alpine3.20 as builder



Why is it 1.22.5 and not 1.22.0?

Go released 1.22.5 recently, it might be ok?

I wiil change them

benjaminhuo · 2024-07-23T08:39:38Z

cmd/fluent-watcher/fluentd/Dockerfile.amd64

- && gem install elasticsearch-xpack -v 7.13.3 \
- && gem install fluent-plugin-detect-exceptions -v 0.0.14 \
- && gem install \
-         fluent-plugin-s3 \


the built-in fluentd plugins shouldn't be remove I think

@wanjunlei @wenchajun what do you think?

in the latest fluentd build workflow:

fluentd image is actually first build and pushed to ghcr, not dockerhub https://github.com/fluent/fluent-operator/blob/master/.github/workflows/build-fd-image.yaml#L252-L268
https://github.com/fluent/fluent-operator/blob/master/.github/workflows/build-fd-image.yaml#L294-L310
https://github.com/fluent/fluent-operator/blob/master/.github/workflows/build-fd-image.yaml#L471-L472

And after all the arm64 and amd64 fluentd images are built and push to ghcr, all these images are synced to dockerhub kubespere org https://github.com/fluent/fluent-operator/blob/master/.github/workflows/build-fd-image.yaml#L494-L505

Using a image on dockerhub kubesphere org as base image is not ok in my opinion

Sorry, this is a modification I didn't realize. I made a mistake when I copied it.

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

benjaminhuo · 2024-07-24T01:57:31Z

This is great, thank you @jiuxia211 !

benjaminhuo · 2024-08-26T10:23:21Z

@jiuxia211 is it possible for you to upgrade these new dependencies?

Thanks

jiuxia211 · 2024-08-26T14:44:39Z

@jiuxia211 is it possible for you to upgrade these new dependencies?

Thanks

OK, assign it to me

build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, …

c47bd31

…sigs.k8s.io/controller-runtime,github.com/onsi/gomega

wenchajun reviewed Jul 21, 2024

View reviewed changes

fix: update ResourceRequirements to VolumeResourceRequirements for st…

a673c89

…orage Signed-off-by: jiuxia211 <[email protected]>

jiuxia211 force-pushed the master branch from 6fd1f68 to a673c89 Compare July 21, 2024 20:55

jiuxia211 added 3 commits July 22, 2024 04:58

update dockerfile

7342a64

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

fix: generate-groups.sh removed error

c6b9184

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

update envtest for Makefile

333cc7e

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

jiuxia211 added 2 commits July 23, 2024 15:43

fix: make verify-coodegen error

e680a09

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

update go version of workflows

115391f

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

wenchajun reviewed Jul 23, 2024

View reviewed changes

benjaminhuo reviewed Jul 23, 2024

View reviewed changes

fix: unsuitable go version

8c5b6e2

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

wenchajun approved these changes Jul 23, 2024

View reviewed changes

wenchajun assigned benjaminhuo and wanjunlei Jul 23, 2024

benjaminhuo approved these changes Jul 24, 2024

View reviewed changes

benjaminhuo merged commit ffb0121 into fluent:master Jul 24, 2024
9 of 10 checks passed

benjaminhuo mentioned this pull request Jul 24, 2024

Bump all dependencies to latest to upgrade controller-runtime #1050

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, … #1251

build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, … #1251

jiuxia211 commented Jul 21, 2024

wenchajun commented Jul 21, 2024

wenchajun commented Jul 21, 2024

wenchajun Jul 21, 2024

wenchajun Jul 21, 2024

jiuxia211 commented Jul 21, 2024

benjaminhuo commented Jul 22, 2024

wenchajun commented Jul 22, 2024

wenchajun commented Jul 22, 2024

wenchajun Jul 23, 2024

benjaminhuo Jul 23, 2024

jiuxia211 Jul 23, 2024 •

edited

Loading

benjaminhuo Jul 23, 2024

benjaminhuo Jul 23, 2024

benjaminhuo Jul 23, 2024

jiuxia211 Jul 23, 2024

benjaminhuo commented Jul 24, 2024

benjaminhuo commented Aug 26, 2024

jiuxia211 commented Aug 26, 2024

build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, … #1251

build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, … #1251

Conversation

jiuxia211 commented Jul 21, 2024

What this PR does / why we need it:

Which issue(s) this PR fixes:

Does this PR introduced a user-facing change?

Additional documentation, usage docs, etc.:

wenchajun commented Jul 21, 2024

wenchajun commented Jul 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiuxia211 commented Jul 21, 2024

benjaminhuo commented Jul 22, 2024

wenchajun commented Jul 22, 2024

wenchajun commented Jul 22, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiuxia211 Jul 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benjaminhuo commented Jul 24, 2024

benjaminhuo commented Aug 26, 2024

jiuxia211 commented Aug 26, 2024

jiuxia211 Jul 23, 2024 •

edited

Loading