Skip to content

Commit e426209

Browse files
jschoonejschoone
authored
Merge branch 'main' into renovate/major-5-github-actions
2 parents a6ef8c0 + a5c5915 commit e426209

File tree

18 files changed

+296
-219
lines changed

18 files changed

+296
-219
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
password: ${{ secrets.GITHUB_TOKEN }}
5555

5656
- name: Install Cosign
57-
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
57+
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
5858

5959
- name: Setup Env
6060
run: |
@@ -65,7 +65,7 @@ jobs:
6565
6666
# Load Golang cache build from GitHub
6767
- name: Load cso Golang cache build from GitHub
68-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
68+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
6969
id: cache
7070
with:
7171
path: /tmp/.cache/cso

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
password: ${{ secrets.GITHUB_TOKEN }}
4545

4646
- name: Install Cosign
47-
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
47+
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
4848

4949
- name: Install Bom
5050
shell: bash

‎.github/workflows/schedule-cache-cleaner-cso-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
# Load Golang cache build from GitHub
1717
- name: Load cso Golang cache build from GitHub
18-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
18+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
1919
id: cache
2020
with:
2121
path: /tmp/.cache/cso

‎.github/workflows/schedule-update-bot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.LOG_LEVEL }}" >> "$GITHUB_ENV"
4747
4848
- name: Renovate
49-
uses: renovatebot/github-action@13da59cf7cfbd3bfea72ce26752ed22edf747ce9 # v43.0.2
49+
uses: renovatebot/github-action@f8af9272cd94a4637c29f60dea8731afd3134473 # v43.0.12
5050
env:
5151
RENOVATE_HOST_RULES: '[{"hostType": "docker", "matchHost": "ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5252
RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '[".*"]'

‎charts/templates/deployment.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
- -source
3030
- {{ .Values.controllerManager.manager.source }}
3131
env:
32+
{{- with .Values.controllerManager.manager.extraEnv }}
33+
{{- toYaml . | nindent 8 }}
34+
{{- end }}
3235
{{- if eq .Values.controllerManager.manager.source "github" }}
3336
- name: GIT_PROVIDER
3437
valueFrom:

‎charts/values.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ clusterStackVariables:
1010
ociUsername: ""
1111
controllerManager:
1212
manager:
13+
extraEnv: []
1314
source: oci
1415
args:
1516
- --leader-elect=true

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ module github.com/SovereignCloudStack/cluster-stack-operator
22

33
go 1.23.0
44

5-
toolchain go1.24.4
5+
toolchain go1.24.7
66

77
require (
88
github.com/go-logr/logr v1.4.3
99
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
10-
github.com/google/cel-go v0.25.0
10+
github.com/google/cel-go v0.25.1
1111
github.com/google/go-github/v52 v52.0.0
1212
github.com/onsi/ginkgo/v2 v2.23.4
1313
github.com/onsi/gomega v1.37.0
@@ -28,7 +28,7 @@ require (
2828

2929
require (
3030
al.essio.dev/pkg/shellescape v1.5.1 // indirect
31-
cel.dev/expr v0.23.1 // indirect
31+
cel.dev/expr v0.24.0 // indirect
3232
github.com/BurntSushi/toml v1.4.0 // indirect
3333
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3434
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
22
al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
3-
cel.dev/expr v0.23.1 h1:K4KOtPCJQjVggkARsjG9RWXP6O4R73aHeJMa/dmCQQg=
4-
cel.dev/expr v0.23.1/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
3+
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
4+
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
55
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
66
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
77
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
@@ -98,8 +98,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
9898
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
9999
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
100100
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
101-
github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY=
102-
github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI=
101+
github.com/google/cel-go v0.25.1 h1:mUiYu2f1+ogC75VDDQXM342z9IHgA08J6+pTR0tXUqI=
102+
github.com/google/cel-go v0.25.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
103103
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
104104
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
105105
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

‎images/builder/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# If you make changes to this Dockerfile run `make builder-image-push`.
1818

1919
# Install Lychee
20-
FROM docker.io/library/alpine:3.22.0 AS lychee
20+
FROM docker.io/library/alpine:3.22.1 AS lychee
2121
# update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
2222
ENV LYCHEE_VERSION="v0.15.1"
2323
# hadolint ignore=DL3018
@@ -34,7 +34,7 @@ FROM cgr.dev/chainguard/wolfi-base:latest AS wolfi
3434
# update: datasource=github-tags depName=kubernetes-sigs/cluster-api
3535
ARG CLUSTERCTL_VERSION="v1.8.1"
3636
# update: datasource=github-tags depName=helm/helm
37-
ENV HELM_VERSION="v3.18.3"
37+
ENV HELM_VERSION="v3.19.0"
3838
# update: datasource=github-tags depName=kubernetes-sigs/kind
3939
ARG KIND_VERSION="v0.24.0"
4040
# update: datasource=github-tags depName=kubernetes/kubernetes
@@ -58,19 +58,19 @@ RUN apk add -U --no-cache \
5858
trivy=~${TRIVY_VERSION#v}
5959

6060
# Install Golang CI Lint
61-
FROM docker.io/library/alpine:3.22.0 AS golangci
61+
FROM docker.io/library/alpine:3.22.1 AS golangci
6262
# update: datasource=github-tags depName=golangci/golangci-lint versioning=semver
63-
ENV GOLANGCI_VERSION="v2.2.1"
63+
ENV GOLANGCI_VERSION="v2.4.0"
6464
WORKDIR /
6565
# hadolint ignore=DL3018,DL4006
6666
RUN apk add --no-cache curl && \
6767
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_VERSION}
6868

6969
# Install Hadolint
70-
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:3c206a451cec6d486367e758645269fd7d696c5ccb6ff59d8b03b0e45268a199 AS hadolint
70+
FROM docker.io/hadolint/hadolint:v2.13.1-alpine@sha256:84c2f9088a8cb0ea2bd16b5349186770d16441e77eec1a1d1e0574cf7dff47ac AS hadolint
7171

7272
# Install Trivy
73-
FROM docker.io/aquasec/trivy:0.64.0 AS trivy
73+
FROM docker.io/aquasec/trivy:0.66.0 AS trivy
7474

7575
############################
7676
# CSO Build Image Base #

‎images/cache/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515

16-
FROM docker.io/library/alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715 as import-cache
16+
FROM docker.io/library/alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 as import-cache
1717

1818
RUN --mount=type=bind,target=/host-tmp \
1919
--mount=type=cache,target=/root/.cache \
@@ -27,7 +27,7 @@ RUN --mount=type=bind,target=/host-tmp \
2727
tar xzf /host-tmp/go-pkg-cache.tar.gz --no-same-owner -C /go/pkg; \
2828
fi
2929

30-
FROM docker.io/library/alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715 as cache-creator
30+
FROM docker.io/library/alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 as cache-creator
3131
RUN --mount=type=cache,target=/root/.cache \
3232
--mount=type=cache,target=/go/pkg \
3333
tar czf /tmp/go-build-cache.tar.gz -C /root/.cache/go-build . ; \

0 commit comments

Comments
 (0)