🌱 Update Builder Image group (#199)

* 🌱 Update Builder Image group | datasource | package | from | to | | ----------- | -------------------------------- | ------- | ------- | | github-tags | aquasecurity/trivy | v0.52.2 | v0.55.0 | | github-tags | golangci/golangci-lint | v1.59.1 | v1.60.3 | | github-tags | kubernetes-sigs/cluster-api | v1.7.3 | v1.8.2 | | github-tags | kubernetes-sigs/controller-tools | v0.15.0 | v0.16.2 | | github-tags | kubernetes-sigs/kind | v0.23.0 | v0.24.0 | * Fix linter Signed-off-by: Roman Hros <[email protected]> --------- Signed-off-by: Roman Hros <[email protected]> Co-authored-by: cluster-stack-bot[bot] <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Co-authored-by: Roman Hros <[email protected]>
SovereignCloudStack · Sep 10, 2024 · 5834b9b · 5834b9b
1 parent d13f2c3
commit 5834b9b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/.builder-image-version.txt b/.builder-image-version.txt
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml
@@ -22,7 +22,7 @@ jobs:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.3
+      image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.4
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/.github/workflows/schedule-scan-image.yaml b/.github/workflows/schedule-scan-image.yaml
@@ -9,7 +9,7 @@ jobs:
     name: Trivy
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.3
+      image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.4
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
@@ -19,24 +19,24 @@
 # Install Lychee
 FROM docker.io/lycheeverse/lychee:0.15.1 as lychee
 # Install Hadolint
-FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint
+FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:3c206a451cec6d486367e758645269fd7d696c5ccb6ff59d8b03b0e45268a199 as hadolint
 
 FROM cgr.dev/chainguard/wolfi-base:latest as wolfi
 
 # update: datasource=github-tags depName=kubernetes-sigs/cluster-api
-ENV CLUSTERCTL_VERSION="v1.7.3"
+ENV CLUSTERCTL_VERSION="v1.8.2"
 # update: datasource=github-tags depName=golangci/golangci-lint
-ENV GOLANGCI_VERSION="v1.59.1"
+ENV GOLANGCI_VERSION="v1.60.3"
 # update: datasource=github-tags depName=kubernetes-sigs/kind
-ENV KIND_VERSION="v0.23.0"
+ENV KIND_VERSION="v0.24.0"
 # update: datasource=github-tags depName=kubernetes/kubernetes
 ARG KUBECTL_VERSION="v1.31.0"
 # update: datasource=github-tags depName=kubernetes-sigs/kustomize extractVersion=^kustomize\/v(?<version>.+)$
 ENV KUSTOMIZE_VERSION="v5.3.0"
 # update: datasource=github-tags depName=aquasecurity/trivy
-ENV TRIVY_VERSION="v0.52.2"
+ENV TRIVY_VERSION="v0.55.0"
 # update: datasource=github-tags depName=kubernetes-sigs/controller-tools
-ENV CONTROLLER_GEN_VERSION="v0.15.0"
+ENV CONTROLLER_GEN_VERSION="v0.16.2"
 
 # hadolint ignore=DL3018
 RUN apk add -U --no-cache \

diff --git a/internal/controller/openstackclusterstackrelease_controller.go b/internal/controller/openstackclusterstackrelease_controller.go
@@ -111,7 +111,7 @@ func (r *OpenStackClusterStackReleaseReconciler) Reconcile(ctx context.Context,
 			apiv1alpha1.ClusterStackReleaseAssetsReadyCondition,
 			apiv1alpha1.IssueWithReleaseAssetsReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"%s", err.Error(),
 		)
 		record.Warnf(openstackclusterstackrelease, "IssueWithReleaseAssets", err.Error())
 		logger.Error(err, "failed to create release")
@@ -127,7 +127,7 @@ func (r *OpenStackClusterStackReleaseReconciler) Reconcile(ctx context.Context,
 				apiv1alpha1.AssetsClientAPIAvailableCondition,
 				apiv1alpha1.FailedCreateAssetsClientReason,
 				clusterv1beta1.ConditionSeverityError,
-				err.Error(),
+				"%s", err.Error(),
 			)
 			record.Warnf(openstackclusterstackrelease, "FailedCreateAssetsClient", err.Error())
 			logger.Error(err, "failed to create assets client")

diff --git a/internal/controller/openstacknodeimagerelease_controller.go b/internal/controller/openstacknodeimagerelease_controller.go
@@ -108,7 +108,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 				apiv1alpha1.CloudAvailableCondition,
 				apiv1alpha1.SecretNotFoundReason,
 				clusterv1beta1.ConditionSeverityError,
-				err.Error(),
+				"%s", err.Error(),
 			)
 			record.Warnf(openstacknodeimagerelease, "SecretNotFound", err.Error())
 			logger.Error(err, "failed to get secret")
@@ -118,7 +118,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 			apiv1alpha1.CloudAvailableCondition,
 			apiv1alpha1.CloudNotSetReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"%s", err.Error(),
 		)
 		record.Warnf(openstacknodeimagerelease, "CloudNotSet", err.Error())
 		return ctrl.Result{}, fmt.Errorf("failed to get cloud from secret: %w", err)
@@ -172,7 +172,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 			apiv1alpha1.OpenStackImageServiceClientAvailableCondition,
 			apiv1alpha1.OpenStackImageServiceClientNotSetReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"%s", err.Error(),
 		)
 		record.Warnf(openstacknodeimagerelease, "OpenStackImageServiceClientNotSet", err.Error())
 		logger.Error(err, "failed to create an image client")
@@ -187,7 +187,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 			apiv1alpha1.OpenStackImageReadyCondition,
 			apiv1alpha1.IssueWithOpenStackImageReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"%s", err.Error(),
 		)
 		record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToFind", err.Error())
 		logger.Error(err, "failed to find an image")
@@ -207,7 +207,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 				apiv1alpha1.OpenStackImageReadyCondition,
 				apiv1alpha1.IssueWithOpenStackImageReason,
 				clusterv1beta1.ConditionSeverityError,
-				err.Error(),
+				"%s", err.Error(),
 			)
 			record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToCreate", err.Error())
 			logger.Error(err, "failed to create an image")
@@ -225,7 +225,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 				apiv1alpha1.OpenStackImageReadyCondition,
 				apiv1alpha1.IssueWithOpenStackImageReason,
 				clusterv1beta1.ConditionSeverityError,
-				err.Error(),
+				"%s", err.Error(),
 			)
 			record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToImport", err.Error())
 			logger.Error(err, "failed to import an image")
@@ -246,7 +246,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 			apiv1alpha1.OpenStackImageReadyCondition,
 			apiv1alpha1.IssueWithOpenStackImageReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"%s", err.Error(),
 		)
 		record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToGet", err.Error())
 		logger.Error(err, "failed to get an image")
@@ -268,7 +268,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 				apiv1alpha1.OpenStackImageReadyCondition,
 				apiv1alpha1.OpenStackImageImportTimeOutReason,
 				clusterv1beta1.ConditionSeverityError,
-				err.Error(),
+				"%s", err.Error(),
 			)
 			record.Warnf(openstacknodeimagerelease, "OpenStackImageImportTimeout", err.Error())
 			logger.Error(err, "timeout - import duration exceeded")
@@ -294,7 +294,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 			apiv1alpha1.OpenStackImageReadyCondition,
 			apiv1alpha1.IssueWithOpenStackImageReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"%s", err.Error(),
 		)
 		openstacknodeimagerelease.Status.Ready = false
 		record.Warnf(openstacknodeimagerelease, "OpenStackImageStatusUnexpected", err.Error())
@@ -317,7 +317,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
 			apiv1alpha1.OpenStackImageReadyCondition,
 			apiv1alpha1.IssueWithOpenStackImageReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"%s", err.Error(),
 		)
 		openstacknodeimagerelease.Status.Ready = false
 		record.Warnf(openstacknodeimagerelease, "OpenStackImageStatusUnknown", err.Error())