Skip to content

Commit 4e426ad

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #586 from cert-manager/self-upgrade-main
[CI] Self-upgrade merging self-upgrade-main into main
2 parents 2c4d9cf + 122b1f5 commit 4e426ad

File tree

8 files changed

+26
-28
lines changed

8 files changed

+26
-28
lines changed

‎.github/workflows/govulncheck.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
make print-go-version >> "$GITHUB_OUTPUT"
3030
31-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
31+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
3232
with:
3333
go-version: ${{ steps.go-version.outputs.result }}
3434

‎.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
make print-go-version >> "$GITHUB_OUTPUT"
4444
45-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
45+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
4646
with:
4747
go-version: ${{ steps.go-version.outputs.result }}
4848

‎klone.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,65 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
13+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
18+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
1919
repo_path: modules/cert-manager
2020
- folder_name: controller-gen
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
23+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
2424
repo_path: modules/controller-gen
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
28+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
33+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
3434
repo_path: modules/go
3535
- folder_name: helm
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
38+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
3939
repo_path: modules/helm
4040
- folder_name: help
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
43+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
4444
repo_path: modules/help
4545
- folder_name: kind
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
48+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
4949
repo_path: modules/kind
5050
- folder_name: klone
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
53+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
5454
repo_path: modules/klone
5555
- folder_name: oci-build
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
58+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
5959
repo_path: modules/oci-build
6060
- folder_name: oci-publish
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
63+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
6464
repo_path: modules/oci-publish
6565
- folder_name: repository-base
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
68+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
6969
repo_path: modules/repository-base
7070
- folder_name: tools
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: cec6f63b919c285418ad88f306ce799e8ff402d1
73+
repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
7474
repo_path: modules/tools

‎make/_shared/go/base/.github/workflows/govulncheck.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
make print-go-version >> "$GITHUB_OUTPUT"
3030
31-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
31+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
3232
with:
3333
go-version: ${{ steps.go-version.outputs.result }}
3434

‎make/_shared/oci-build/00_mod.mk‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
1616

1717
# Use distroless as minimal base image to package the manager binary
1818
# To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
19-
base_image_static := quay.io/jetstack/base-static@sha256:8be2dc621c1863a7fa290634c4eb7f28dbcd4ea60fb0a386adb80d2027a80444
19+
base_image_static := quay.io/jetstack/base-static@sha256:713aaf3b2c45b103d37778943f2c384120eabb97b9097eea4b5cbbd32880b86d
2020

2121
# Use custom apko-built image as minimal base image to package the manager binary
2222
# To get latest SHA run "crane digest quay.io/jetstack/base-static-csi:latest"
23-
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:b3c11dedbac22b060c935569c63a32faaeb8bc6109aa00f42fb15c143eb63617
23+
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:3499c6d3073503bd13e015c27b039e58a790e5623906af1cf42ebbf85a8ff7f6
2424

2525
# Utility functions
2626
fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))
@@ -43,8 +43,7 @@ go_$1_goexperiment ?= $(GOEXPERIMENT)
4343
go_$1_flags ?= -tags=
4444
oci_$1_additional_layers ?=
4545
oci_$1_linux_capabilities ?=
46-
oci_$1_image_annotation ?=
47-
oci_$1_image_label ?=
46+
oci_$1_build_args ?=
4847
endef
4948

5049
$(foreach build_name,$(build_names),$(eval $(call default_per_build_variables,$(build_name))))

‎make/_shared/oci-build/01_mod.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ $(oci_build_targets): oci-build-%: ko-config-% | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS
6363
LDFLAGS="$(go_$*_ldflags)" \
6464
$(KO) build $(go_$*_mod_dir)/$(go_$*_main_dir) \
6565
--platform=$(oci_platforms) \
66-
--image-annotation=$(oci_$*_image_annotation) \
67-
--image-label=$(oci_$*_image_label) \
66+
$(oci_$*_build_args) \
6867
--oci-layout-path=$(oci_layout_path_$*) \
6968
--sbom-dir=$(CURDIR)/$(oci_layout_path_$*).sbom \
7069
--sbom=spdx \

‎make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
make print-go-version >> "$GITHUB_OUTPUT"
4444
45-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
45+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
4646
with:
4747
go-version: ${{ steps.go-version.outputs.result }}
4848

‎make/_shared/tools/00_mod.mk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ ADDITIONAL_TOOLS ?=
161161
tools += $(ADDITIONAL_TOOLS)
162162

163163
# https://go.dev/dl/
164-
VENDORED_GO_VERSION := 1.23.8
164+
VENDORED_GO_VERSION := 1.24.2
165165

166166
# Print the go version which can be used in GH actions
167167
.PHONY: print-go-version
@@ -380,10 +380,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
380380
# File downloads #
381381
##################
382382

383-
go_linux_amd64_SHA256SUM=45b87381172a58d62c977f27c4683c8681ef36580abecd14fd124d24ca306d3f
384-
go_linux_arm64_SHA256SUM=9d6d938422724a954832d6f806d397cf85ccfde8c581c201673e50e634fdc992
385-
go_darwin_amd64_SHA256SUM=4a0f0a5eb539013c1f4d989e0864aed45973c0a9d4b655ff9fd56013e74c1303
386-
go_darwin_arm64_SHA256SUM=d4f53dcaecd67d9d2926eab7c3d674030111c2491e68025848f6839e04a4d3d1
383+
go_linux_amd64_SHA256SUM=68097bd680839cbc9d464a0edce4f7c333975e27a90246890e9f1078c7e702ad
384+
go_linux_arm64_SHA256SUM=756274ea4b68fa5535eb9fe2559889287d725a8da63c6aae4d5f23778c229f4b
385+
go_darwin_amd64_SHA256SUM=238d9c065d09ff6af229d2e3b8b5e85e688318d69f4006fb85a96e41c216ea83
386+
go_darwin_arm64_SHA256SUM=b70f8b3c5b4ccb0ad4ffa5ee91cd38075df20fdbd953a1daedd47f50fbcff47a
387387

388388
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
389389
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)