From 6af522f65b6388d389dad9d84e77dab10bc4a8e5 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 24 May 2024 17:13:22 +0000 Subject: [PATCH 1/2] Fix incorrect wrangler package import Signed-off-by: Brad Davidson --- pkg/controllers/cisnetworkpolicy/cleanup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controllers/cisnetworkpolicy/cleanup.go b/pkg/controllers/cisnetworkpolicy/cleanup.go index 7ce0d1ff1c..4dab1f7782 100644 --- a/pkg/controllers/cisnetworkpolicy/cleanup.go +++ b/pkg/controllers/cisnetworkpolicy/cleanup.go @@ -6,7 +6,7 @@ import ( "time" "github.com/k3s-io/k3s/pkg/server" - coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + coreclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" From 46b0c95af6c4b22f0e6af1f8b2f7ea1cc68edb55 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 24 May 2024 17:52:30 +0000 Subject: [PATCH 2/2] Fix mid-word line wrapping that codespell just noticed Signed-off-by: Brad Davidson --- developer-docs/updating_rke2_charts.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developer-docs/updating_rke2_charts.md b/developer-docs/updating_rke2_charts.md index a5b1c001e9..0dd6502254 100644 --- a/developer-docs/updating_rke2_charts.md +++ b/developer-docs/updating_rke2_charts.md @@ -19,8 +19,8 @@ the controllers part of `rke2 server` binary. ## How to update a chart? -Before going into updating the chart, note a chart update normally means updating the images that this chart is consumin -g. In general, rke2 is consuming hardened images that are built using a FIPS compliant process. In other words, **do not +Before going into updating the chart, note a chart update normally means updating the images that this chart is consuming. +In general, rke2 is consuming hardened images that are built using a FIPS compliant process. In other words, **do not use the upstream images**. Instead, refer to the Github project building that image and use the code of the upstream project to yield a hardened image. The Github projects building hardened images are under our [github rancher](https://github.com/rancher/) and start with the name `image-build-`, for example: [image-build-coredns](https://github.com/rancher/image-build-coredns).