Skip to content

Commit 0444845

Browse files
Merge pull request #257 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 40816ea + 36dff89 commit 0444845

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
13+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
18+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
23+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
28+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
33+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
38+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
43+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
48+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
53+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
58+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
63+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
68+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
73+
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
7474
repo_path: modules/tools

make/_shared/tools/00_mod.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ tools += operator-sdk=v1.34.1
126126
tools += gh=v2.49.0
127127
# https:///github.com/redhat-openshift-ecosystem/openshift-preflight/releases
128128
tools += preflight=1.9.2
129-
# https://github.com/daixiang0/gci/releases/
129+
# https://github.com/daixiang0/gci/releases
130130
tools += gci=v0.13.4
131+
# https://github.com/google/yamlfmt/releases
132+
tools += yamlfmt=v0.12.1
131133

132134
# https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
133135
K8S_CODEGEN_VERSION := v0.29.3
@@ -326,6 +328,7 @@ go_dependencies += govulncheck=golang.org/x/vuln/cmd/govulncheck
326328
go_dependencies += operator-sdk=github.com/operator-framework/operator-sdk/cmd/operator-sdk
327329
go_dependencies += gh=github.com/cli/cli/v2/cmd/gh
328330
go_dependencies += gci=github.com/daixiang0/gci
331+
go_dependencies += yamlfmt=github.com/google/yamlfmt/cmd/yamlfmt
329332

330333
#################
331334
# go build tags #

0 commit comments

Comments
 (0)