Skip to content

Commit 5834b9b

Browse files
cluster-stack-bot[bot]chess-knight
cluster-stack-bot[bot]
and
chess-knight
authored
🌱 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]>
1 parent d13f2c3 commit 5834b9b

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

‎.builder-image-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.3
1+
0.1.4

‎.github/workflows/pr-lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
2323
runs-on: ubuntu-latest
2424
container:
25-
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.3
25+
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.4
2626
credentials:
2727
username: ${{ github.actor }}
2828
password: ${{ secrets.github_token }}

‎.github/workflows/schedule-scan-image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Trivy
1010
runs-on: ubuntu-latest
1111
container:
12-
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.3
12+
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.4
1313
credentials:
1414
username: ${{ github.actor }}
1515
password: ${{ secrets.github_token }}

‎images/builder/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@
1919
# Install Lychee
2020
FROM docker.io/lycheeverse/lychee:0.15.1 as lychee
2121
# Install Hadolint
22-
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint
22+
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:3c206a451cec6d486367e758645269fd7d696c5ccb6ff59d8b03b0e45268a199 as hadolint
2323

2424
FROM cgr.dev/chainguard/wolfi-base:latest as wolfi
2525

2626
# update: datasource=github-tags depName=kubernetes-sigs/cluster-api
27-
ENV CLUSTERCTL_VERSION="v1.7.3"
27+
ENV CLUSTERCTL_VERSION="v1.8.2"
2828
# update: datasource=github-tags depName=golangci/golangci-lint
29-
ENV GOLANGCI_VERSION="v1.59.1"
29+
ENV GOLANGCI_VERSION="v1.60.3"
3030
# update: datasource=github-tags depName=kubernetes-sigs/kind
31-
ENV KIND_VERSION="v0.23.0"
31+
ENV KIND_VERSION="v0.24.0"
3232
# update: datasource=github-tags depName=kubernetes/kubernetes
3333
ARG KUBECTL_VERSION="v1.31.0"
3434
# update: datasource=github-tags depName=kubernetes-sigs/kustomize extractVersion=^kustomize\/v(?<version>.+)$
3535
ENV KUSTOMIZE_VERSION="v5.3.0"
3636
# update: datasource=github-tags depName=aquasecurity/trivy
37-
ENV TRIVY_VERSION="v0.52.2"
37+
ENV TRIVY_VERSION="v0.55.0"
3838
# update: datasource=github-tags depName=kubernetes-sigs/controller-tools
39-
ENV CONTROLLER_GEN_VERSION="v0.15.0"
39+
ENV CONTROLLER_GEN_VERSION="v0.16.2"
4040

4141
# hadolint ignore=DL3018
4242
RUN apk add -U --no-cache \

‎internal/controller/openstackclusterstackrelease_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (r *OpenStackClusterStackReleaseReconciler) Reconcile(ctx context.Context,
111111
apiv1alpha1.ClusterStackReleaseAssetsReadyCondition,
112112
apiv1alpha1.IssueWithReleaseAssetsReason,
113113
clusterv1beta1.ConditionSeverityError,
114-
err.Error(),
114+
"%s", err.Error(),
115115
)
116116
record.Warnf(openstackclusterstackrelease, "IssueWithReleaseAssets", err.Error())
117117
logger.Error(err, "failed to create release")
@@ -127,7 +127,7 @@ func (r *OpenStackClusterStackReleaseReconciler) Reconcile(ctx context.Context,
127127
apiv1alpha1.AssetsClientAPIAvailableCondition,
128128
apiv1alpha1.FailedCreateAssetsClientReason,
129129
clusterv1beta1.ConditionSeverityError,
130-
err.Error(),
130+
"%s", err.Error(),
131131
)
132132
record.Warnf(openstackclusterstackrelease, "FailedCreateAssetsClient", err.Error())
133133
logger.Error(err, "failed to create assets client")

‎internal/controller/openstacknodeimagerelease_controller.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
108108
apiv1alpha1.CloudAvailableCondition,
109109
apiv1alpha1.SecretNotFoundReason,
110110
clusterv1beta1.ConditionSeverityError,
111-
err.Error(),
111+
"%s", err.Error(),
112112
)
113113
record.Warnf(openstacknodeimagerelease, "SecretNotFound", err.Error())
114114
logger.Error(err, "failed to get secret")
@@ -118,7 +118,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
118118
apiv1alpha1.CloudAvailableCondition,
119119
apiv1alpha1.CloudNotSetReason,
120120
clusterv1beta1.ConditionSeverityError,
121-
err.Error(),
121+
"%s", err.Error(),
122122
)
123123
record.Warnf(openstacknodeimagerelease, "CloudNotSet", err.Error())
124124
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
172172
apiv1alpha1.OpenStackImageServiceClientAvailableCondition,
173173
apiv1alpha1.OpenStackImageServiceClientNotSetReason,
174174
clusterv1beta1.ConditionSeverityError,
175-
err.Error(),
175+
"%s", err.Error(),
176176
)
177177
record.Warnf(openstacknodeimagerelease, "OpenStackImageServiceClientNotSet", err.Error())
178178
logger.Error(err, "failed to create an image client")
@@ -187,7 +187,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
187187
apiv1alpha1.OpenStackImageReadyCondition,
188188
apiv1alpha1.IssueWithOpenStackImageReason,
189189
clusterv1beta1.ConditionSeverityError,
190-
err.Error(),
190+
"%s", err.Error(),
191191
)
192192
record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToFind", err.Error())
193193
logger.Error(err, "failed to find an image")
@@ -207,7 +207,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
207207
apiv1alpha1.OpenStackImageReadyCondition,
208208
apiv1alpha1.IssueWithOpenStackImageReason,
209209
clusterv1beta1.ConditionSeverityError,
210-
err.Error(),
210+
"%s", err.Error(),
211211
)
212212
record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToCreate", err.Error())
213213
logger.Error(err, "failed to create an image")
@@ -225,7 +225,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
225225
apiv1alpha1.OpenStackImageReadyCondition,
226226
apiv1alpha1.IssueWithOpenStackImageReason,
227227
clusterv1beta1.ConditionSeverityError,
228-
err.Error(),
228+
"%s", err.Error(),
229229
)
230230
record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToImport", err.Error())
231231
logger.Error(err, "failed to import an image")
@@ -246,7 +246,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
246246
apiv1alpha1.OpenStackImageReadyCondition,
247247
apiv1alpha1.IssueWithOpenStackImageReason,
248248
clusterv1beta1.ConditionSeverityError,
249-
err.Error(),
249+
"%s", err.Error(),
250250
)
251251
record.Warnf(openstacknodeimagerelease, "OpenStackImageFailedToGet", err.Error())
252252
logger.Error(err, "failed to get an image")
@@ -268,7 +268,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
268268
apiv1alpha1.OpenStackImageReadyCondition,
269269
apiv1alpha1.OpenStackImageImportTimeOutReason,
270270
clusterv1beta1.ConditionSeverityError,
271-
err.Error(),
271+
"%s", err.Error(),
272272
)
273273
record.Warnf(openstacknodeimagerelease, "OpenStackImageImportTimeout", err.Error())
274274
logger.Error(err, "timeout - import duration exceeded")
@@ -294,7 +294,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
294294
apiv1alpha1.OpenStackImageReadyCondition,
295295
apiv1alpha1.IssueWithOpenStackImageReason,
296296
clusterv1beta1.ConditionSeverityError,
297-
err.Error(),
297+
"%s", err.Error(),
298298
)
299299
openstacknodeimagerelease.Status.Ready = false
300300
record.Warnf(openstacknodeimagerelease, "OpenStackImageStatusUnexpected", err.Error())
@@ -317,7 +317,7 @@ func (r *OpenStackNodeImageReleaseReconciler) Reconcile(ctx context.Context, req
317317
apiv1alpha1.OpenStackImageReadyCondition,
318318
apiv1alpha1.IssueWithOpenStackImageReason,
319319
clusterv1beta1.ConditionSeverityError,
320-
err.Error(),
320+
"%s", err.Error(),
321321
)
322322
openstacknodeimagerelease.Status.Ready = false
323323
record.Warnf(openstacknodeimagerelease, "OpenStackImageStatusUnknown", err.Error())

0 commit comments

Comments
 (0)