Bump overall dependencies #161

pjbgf · 2023-04-14T18:55:30Z

Summary of changes:

Bump go dependencies and update vendored files.
Bump dapper version on drone to v0.6.0.
Nginx updated to v1.24.0.
Kubectl updated to v1.24.15.
Deprecate use of rancher/plugins in favour of the upstream latest version.
Deprecate use of rancher/docker in favour of the upstream latest version.

Dockerfile.dapper

superseb · 2023-04-20T13:54:56Z

vendor folder should be dropped entirely at this point, other repositories have dropped that a long time ago.

pjbgf · 2023-04-20T14:39:21Z

@superseb thank you for the review. Given the size of the PR and the moving parts, do you think those changes can be tackled as a follow-up PR, or should I just add to this?

package/Dockerfile

pjbgf · 2023-04-21T10:06:19Z

@superseb removed Go mod vendoring. PTAL

Dockerfile.dapper

go.mod

package/Dockerfile

kinarashah · 2023-04-28T17:33:33Z

@pjbgf Do you have an ETA for when Seb's review comments will be addressed? We need a new tag with cri-dockerd bump for v1.26, so I could cherry-pick your commit and update remaining deps if you're busy. Thanks!

pjbgf · 2023-04-30T07:47:23Z

All the changes were made, @superseb @kinarashah. PTAL

superseb · 2023-05-01T06:28:20Z

Dockerfile.dapper

-    DOCKER_URL=DOCKER_URL_${ARCH}
-
-RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker
+RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2


Why deviate from the default binary install like in every other project? Based on their own docs, go get/go install is discouraged (https://golangci-lint.run/usage/install/#install-from-source). This also blocks auto updating because it doesn't match our generic rules.

The change was aligned with the current version in master which uses go get.

This has now changed to use upstream's install.sh instead.

package/Dockerfile

superseb · 2023-05-01T06:32:02Z

package/Dockerfile

-FROM nginx:1.21.6-alpine
+FROM nginx:1.24.0-alpine
+
+ENV DOCKER_VERSION=23.0.3


Was this tested to be compatible with the oldest Docker we support?

I am not completely sure what version we do support, but generally that is defined via DOCKER_API_VERSION, which we are not setting in this project apart from the entrypoint.sh. What API version is this project meant to support?

@kinarashah can you please help testing this?

You can override the rke-tools image to test using the system_images option in cluster.yml (CLI only)

Basically comes down to API support for the versions we do support (see support matrix)

Aligned this with support matrix, and bumped to latest patch: 20.10.25.

I'm fine with 23.0.3 as long as its API compatible with the versions we support. But in the PR I am viewing it still says 23.0.3 while you say you bumped it to 20.10.25

Nice spot, that is now fixed as well.

I kept the docker within the 20.x series as that is aligned with other projects and our support matrix.

The choice of 20.10.24 over 20.10.25, was due to although the project has a tag for 20.10.25, it does not have the artefacts published for them.

superseb · 2023-05-01T06:34:44Z

One final question is if we are going for Go 1.20 in 2.7 Q2 release as we are moving to k8s 1.26 which is 1.19, do we want to keep that version across the board or is it up to the teams?

kpsingh219 · 2023-06-20T13:23:49Z

Is it possible to know when this will be merged ?

pjbgf · 2023-07-10T12:41:40Z

@kpsingh219 I am not entirely sure. It will largely dependent on reviews and testing.

pjbgf · 2023-07-10T12:43:16Z

One final question is if we are going for Go 1.20 in 2.7 Q2 release as we are moving to k8s 1.26 which is 1.19, do we want to keep that version across the board or is it up to the teams?

I think the main constraint is running supported version only. Apart from that, I would assume that's up to the teams/projects.

macedogm

Approving from a pure security perspective regarding the bumps. We still need @kinarashah's review and probably tag someone from QA to test all the pieces together.

superseb · 2023-08-03T05:28:16Z

package/Dockerfile

+FROM nginx:1.24.0-alpine
+
+ENV DOCKER_VERSION=23.0.3
+ENV PLUGINS_VERSION=v1.2.0


I guess this is a nit, but naming it more specifically allows us to put this automated bump in Renovate with a more descriptive variable (for example CNI_PLUGINS_VERSION instead of PLUGINS_VERSION)

Good shout, amended it accordingly.

manuelbuil · 2023-08-03T07:33:44Z

Note that CNI plugins v0.9.1 included flannel binary but v1.2.0 does not include it. Flannel has its own repo now: https://github.com/flannel-io/cni-plugin

pjbgf · 2023-08-03T12:27:51Z

@manuelbuil thank you for pointing that out, that should be fixed now. PTAL

I noticed that all the plugins are being kept on /tmp and only a few are copied over to /opt/cni/bin. At no point flannel is copied over (as far as I can see), is that intentional?

manuelbuil · 2023-08-03T12:34:02Z

@manuelbuil thank you for pointing that out, that should be fixed now. PTAL

I noticed that all the plugins are being kept on /tmp and only a few are copied over to /opt/cni/bin. At no point flannel is copied over (as far as I can see), is that intentional?

You are pointing to weave script which is another CNI plugin. All plugins should go into /opt/cni/bin but I think the code that adds that plugin to rke is the one responsible to copy those binaries

pjbgf · 2023-08-03T12:44:02Z

You are pointing to weave script which is another CNI plugin.

@manuelbuil That was intentional, as that was I trying to highlight the current version on master. All plugins are copied into /tmp and not to /opt/cni/bin. Within the code base the only copy across to the latter directory is via the weave cni script.

As per latest tag published 3 months ago:

pjbgf · 2023-08-03T15:04:35Z

Following up from off-line chat with @manuelbuil, we will keep binaries as per current public image. If necessary, a future PR will move things around.

I added a test to verify all binaries being packaged up are in place and are valid for the target architecture.

pjbgf · 2023-08-03T15:07:08Z

The build is failing as confd is not a valid arm64 binary. Ideally we would fix that (rancher/confd#8) and bump the version. The good news is that the tests work.

- github.com/minio/minio-go/v7 to version 7.0.52. - github.com/sirupsen/logrus to version 1.9.0. - github.com/urfave/cli to version 1.22.12. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

It looks like the rancher fork of plugins was created in order to add arm64 support. Given that upstream supports that architecture natively nowadays, this has been removed. Ref: rancher/plugins#2 Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Moved all the environment var declarations to the top of the Dockerfile, for easier maintainance going forwards. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Migrate from the deprecated golint to golangci-lint + revive, and during the process the depracted io/ioutil package was also migrated. Instead of manually downloading the docker CLI within dapper, that is now installed with zypper instead. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

This change was needed as flannel was previously baked into the cni plugins, but this is no longer the case. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Verify expected binaries on the target image, ensuring they are valid for the target architecture. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

The previous version had an invalid arm64 image, this bump should fix it. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

pjbgf · 2023-08-16T12:17:08Z

PR rebased.

doflamingo721

Changes looks good to me.

superseb · 2023-09-11T12:18:49Z

@pjbgf please create an issue which can be used to QA this PR

macedogm requested review from kinarashah and macedogm April 17, 2023 12:02

This was referenced Apr 18, 2023

bump cri-dockerd to v0.3.1 #162

Merged

[Feature] K8s 1.26 support rancher/rancher#41113

Closed

superseb reviewed Apr 20, 2023

View reviewed changes

Dockerfile.dapper Outdated Show resolved Hide resolved

kinarashah reviewed Apr 21, 2023

View reviewed changes

package/Dockerfile Show resolved Hide resolved

superseb reviewed Apr 21, 2023

View reviewed changes

Dockerfile.dapper Outdated Show resolved Hide resolved

superseb reviewed Apr 21, 2023

View reviewed changes

go.mod Show resolved Hide resolved

superseb reviewed Apr 21, 2023

View reviewed changes

package/Dockerfile Outdated Show resolved Hide resolved

superseb reviewed Apr 21, 2023

View reviewed changes

package/Dockerfile Outdated Show resolved Hide resolved

vardhaman22 mentioned this pull request Apr 27, 2023

[dev 2.7] K8s 1.26.4 rancher/kontainer-driver-metadata#1133

Merged

pjbgf force-pushed the bump-deps branch from ee74932 to fbd9465 Compare April 30, 2023 07:42

superseb reviewed May 1, 2023

View reviewed changes

package/Dockerfile Outdated Show resolved Hide resolved

superseb reviewed May 1, 2023

View reviewed changes

pjbgf force-pushed the bump-deps branch 3 times, most recently from 0e0c861 to 7936f85 Compare July 10, 2023 12:05

pjbgf force-pushed the bump-deps branch 2 times, most recently from ecd9765 to aa14d98 Compare July 12, 2023 12:54

macedogm previously approved these changes Jul 13, 2023

View reviewed changes

superseb reviewed Aug 3, 2023

View reviewed changes

pjbgf force-pushed the bump-deps branch 3 times, most recently from 2374c1b to f7721f7 Compare August 3, 2023 07:01

pjbgf added 10 commits August 16, 2023 13:16

Bump Go dependencies

fb9d42d

- github.com/minio/minio-go/v7 to version 7.0.52. - github.com/sirupsen/logrus to version 1.9.0. - github.com/urfave/cli to version 1.22.12. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Update dependencies

7be9922

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Remove use of plugins fork

ab02ce4

It looks like the rancher fork of plugins was created in order to add arm64 support. Given that upstream supports that architecture natively nowadays, this has been removed. Ref: rancher/plugins#2 Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Dockerfile: Move version vars to top of file

d1fc711

Moved all the environment var declarations to the top of the Dockerfile, for easier maintainance going forwards. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Remove Go mod vendoring

7c4ee3f

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Rename PLUGINS_VERSION to CNI_PLUGINS_VERSION

16e6eae

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Download flannel from flannel-io

e995f6b

This change was needed as flannel was previously baked into the cni plugins, but this is no longer the case. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

tests: Verify binaries

ff642cd

Verify expected binaries on the target image, ensuring they are valid for the target architecture. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

Bump rancher/confd to v0.16.5-rc1

5bfcb93

The previous version had an invalid arm64 image, this bump should fix it. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>

pjbgf force-pushed the bump-deps branch from b9d17e5 to 5bfcb93 Compare August 16, 2023 12:16

snasovich requested a review from doflamingo721 August 16, 2023 15:38

doflamingo721 approved these changes Aug 18, 2023

View reviewed changes

macedogm mentioned this pull request Sep 1, 2023

Fix entrypoint.sh for cgroup v2 usage #164

Merged

superseb merged commit 5604180 into rancher:master Sep 11, 2023

pjbgf mentioned this pull request Sep 12, 2023

[QA] Test rancher/rke-tools:v0.1.91 rancher/rke#3367

Closed

pjbgf deleted the bump-deps branch September 14, 2023 09:32

pjbgf mentioned this pull request Sep 19, 2023

Add support for rke-tools components rancher/renovate-config#143

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump overall dependencies #161

Bump overall dependencies #161

pjbgf commented Apr 14, 2023 •

edited

Loading

superseb commented Apr 20, 2023

pjbgf commented Apr 20, 2023

pjbgf commented Apr 21, 2023

kinarashah commented Apr 28, 2023 •

edited

Loading

pjbgf commented Apr 30, 2023

superseb May 1, 2023

pjbgf Jul 10, 2023

superseb May 1, 2023

pjbgf May 2, 2023

superseb Jul 28, 2023

pjbgf Jul 31, 2023

superseb Aug 3, 2023

pjbgf Aug 3, 2023

pjbgf Aug 3, 2023

superseb commented May 1, 2023

kpsingh219 commented Jun 20, 2023

pjbgf commented Jul 10, 2023

pjbgf commented Jul 10, 2023

macedogm left a comment

superseb Aug 3, 2023

pjbgf Aug 3, 2023

manuelbuil commented Aug 3, 2023

pjbgf commented Aug 3, 2023

manuelbuil commented Aug 3, 2023

pjbgf commented Aug 3, 2023

pjbgf commented Aug 3, 2023

pjbgf commented Aug 3, 2023

pjbgf commented Aug 16, 2023

doflamingo721 left a comment

superseb commented Sep 11, 2023

Bump overall dependencies #161

Bump overall dependencies #161

Conversation

pjbgf commented Apr 14, 2023 • edited Loading

superseb commented Apr 20, 2023

pjbgf commented Apr 20, 2023

pjbgf commented Apr 21, 2023

kinarashah commented Apr 28, 2023 • edited Loading

pjbgf commented Apr 30, 2023

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

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

superseb commented May 1, 2023

kpsingh219 commented Jun 20, 2023

pjbgf commented Jul 10, 2023

pjbgf commented Jul 10, 2023

macedogm left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

manuelbuil commented Aug 3, 2023

pjbgf commented Aug 3, 2023

manuelbuil commented Aug 3, 2023

pjbgf commented Aug 3, 2023

pjbgf commented Aug 3, 2023

pjbgf commented Aug 3, 2023

pjbgf commented Aug 16, 2023

doflamingo721 left a comment

Choose a reason for hiding this comment

superseb commented Sep 11, 2023

pjbgf commented Apr 14, 2023 •

edited

Loading

kinarashah commented Apr 28, 2023 •

edited

Loading