Skip to content

Commit cc4c425

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #665 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 504b28c + a600f68 commit cc4c425

File tree

13 files changed

+43
-46
lines changed

13 files changed

+43
-46
lines changed

‎.github/workflows/renovate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
go-version: ${{ steps.go-version.outputs.result }}
5151

5252
- name: Self-hosted Renovate
53-
uses: renovatebot/github-action@aec779d4f7845f8431ddf403cf9659d4702ddde0 # v43.0.18
53+
uses: renovatebot/github-action@a3c115cd6676c8a5bc72f9715f108759e570daf5 # v43.0.19
5454
with:
5555
configurationFile: .github/renovate.json5
5656
token: ${{ steps.octo-sts.outputs.token }}

‎.golangci.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ linters:
5050
- makezero
5151
- mirror
5252
- misspell
53+
- modernize
5354
- musttag
5455
- nakedret
5556
- nilerr
@@ -77,9 +78,10 @@ formatters:
7778
sections:
7879
- standard # Standard section: captures all standard packages.
7980
- default # Default section: contains all imports that could not be matched to another section type.
80-
- prefix(github.com/cert-manager/istio-csr) # Custom section: groups all imports with the specified Prefix.
81+
- localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
8182
- blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
8283
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
84+
custom-order: true
8385
exclusions:
8486
generated: lax
8587
paths: [third_party, builtin$, examples$]

‎cmd/app/app.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func NewCommand(ctx context.Context) *cobra.Command {
8989

9090
mlog := opts.Logr.WithName("manager")
9191
eventBroadcaster := record.NewBroadcaster()
92-
eventBroadcaster.StartLogging(func(format string, args ...interface{}) { mlog.V(3).Info(fmt.Sprintf(format, args...)) })
92+
eventBroadcaster.StartLogging(func(format string, args ...any) { mlog.V(3).Info(fmt.Sprintf(format, args...)) })
9393
eventBroadcaster.StartRecordingToSink(&clientv1.EventSinkImpl{Interface: cl.CoreV1().Events(opts.CertManager.Namespace)})
9494

9595
mgr, err := ctrl.NewManager(opts.RestConfig, ctrl.Options{

‎klone.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,70 +10,70 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
13+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
18+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
23+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
28+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
33+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
38+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
43+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
48+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
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: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
53+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
5454
repo_path: modules/klone
5555
- folder_name: licenses
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
58+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
5959
repo_path: modules/licenses
6060
- folder_name: oci-build
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
63+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
6464
repo_path: modules/oci-build
6565
- folder_name: oci-publish
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
68+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
6969
repo_path: modules/oci-publish
7070
- folder_name: repository-base
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
73+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
7474
repo_path: modules/repository-base
7575
- folder_name: tools
7676
repo_url: https://github.com/cert-manager/makefile-modules.git
7777
repo_ref: main
78-
repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
78+
repo_hash: 2121d6bf1ec6440011bc03021015af1c18ec0eba
7979
repo_path: modules/tools

‎make/_shared/go/.golangci.override.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ linters:
4545
- makezero
4646
- mirror
4747
- misspell
48+
- modernize
4849
- musttag
4950
- nakedret
5051
- nilerr
@@ -69,10 +70,11 @@ formatters:
6970
enable: [ gci, gofmt ]
7071
settings:
7172
gci:
73+
custom-order: true
7274
sections:
7375
- standard # Standard section: captures all standard packages.
7476
- default # Default section: contains all imports that could not be matched to another section type.
75-
- prefix({{REPO-NAME}}) # Custom section: groups all imports with the specified Prefix.
77+
- localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
7678
- blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
7779
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
7880
exclusions:

‎make/_shared/go/01_mod.mk‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ generate-golangci-lint-config: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(bin_dir)/s
117117
cp $(golangci_lint_config) $(bin_dir)/scratch/golangci-lint.yaml.tmp
118118
$(YQ) -i 'del(.linters.enable)' $(bin_dir)/scratch/golangci-lint.yaml.tmp
119119
$(YQ) eval-all -i '. as $$item ireduce ({}; . * $$item)' $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_override)
120-
$(YQ) -i '(.. | select(tag == "!!str")) |= sub("{{REPO-NAME}}", "$(repo_name)")' $(bin_dir)/scratch/golangci-lint.yaml.tmp
121120
mv $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_config)
122121

123122
shared_generate_targets += generate-golangci-lint-config
@@ -147,9 +146,9 @@ fix-golangci-lint: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(NEEDS_GCI) $(bin_dir)/
147146
@find . -name go.mod -not \( -path "./$(bin_dir)/*" -or -path "./make/_shared/*" \) \
148147
| while read d; do \
149148
target=$$(dirname $${d}); \
150-
echo "Running 'GOVERSION=$(VENDORED_GO_VERSION) $(bin_dir)/tools/golangci-lint fmt -c $(CURDIR)/$(golangci_lint_config)' in directory '$${target}'"; \
149+
echo "Running 'GOVERSION=$(VENDORED_GO_VERSION) $(bin_dir)/tools/golangci-lint run --fix -c $(CURDIR)/$(golangci_lint_config) --timeout $(golangci_lint_timeout)' in directory '$${target}'"; \
151150
pushd "$${target}" >/dev/null; \
152-
GOVERSION=$(VENDORED_GO_VERSION) $(GOLANGCI-LINT) fmt -c $(CURDIR)/$(golangci_lint_config) || exit; \
151+
GOVERSION=$(VENDORED_GO_VERSION) $(GOLANGCI-LINT) run --fix -c $(CURDIR)/$(golangci_lint_config) --timeout $(golangci_lint_timeout) || exit; \
153152
popd >/dev/null; \
154153
echo ""; \
155154
done

‎make/_shared/repository-base/base/.github/workflows/renovate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
go-version: ${{ steps.go-version.outputs.result }}
5151

5252
- name: Self-hosted Renovate
53-
uses: renovatebot/github-action@aec779d4f7845f8431ddf403cf9659d4702ddde0 # v43.0.18
53+
uses: renovatebot/github-action@a3c115cd6676c8a5bc72f9715f108759e570daf5 # v43.0.19
5454
with:
5555
configurationFile: .github/renovate.json5
5656
token: ${{ steps.octo-sts.outputs.token }}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ tools += yq=v4.48.1
8686
tools += ko=0.18.0
8787
# https://github.com/protocolbuffers/protobuf/releases
8888
# renovate: datasource=github-releases packageName=protocolbuffers/protobuf
89-
tools += protoc=v32.1
89+
tools += protoc=v33.0
9090
# https://github.com/aquasecurity/trivy/releases
9191
# renovate: datasource=github-releases packageName=aquasecurity/trivy
9292
tools += trivy=v0.67.2
@@ -167,7 +167,7 @@ tools += cmctl=v2.3.0
167167
tools += cmrel=v1.12.15-0.20241121151736-e3cbe5171488
168168
# https://pkg.go.dev/github.com/golangci/golangci-lint/v2/cmd/golangci-lint?tab=versions
169169
# renovate: datasource=go packageName=github.com/golangci/golangci-lint/v2
170-
tools += golangci-lint=v2.5.0
170+
tools += golangci-lint=v2.6.0
171171
# https://pkg.go.dev/golang.org/x/vuln?tab=versions
172172
# renovate: datasource=go packageName=golang.org/x/vuln
173173
tools += govulncheck=v1.1.4
@@ -499,7 +499,7 @@ $(DOWNLOAD_DIR)/tools/vault@$(VAULT_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLO
499499
@source $(lock_script) $@; \
500500
$(CURL) https://releases.hashicorp.com/vault/$(VAULT_VERSION:v%=%)/vault_$(VAULT_VERSION:v%=%)_$(HOST_OS)_$(HOST_ARCH).zip -o $(outfile).zip; \
501501
$(checkhash_script) $(outfile).zip $(vault_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
502-
unzip -qq -c $(outfile).zip > $(outfile); \
502+
unzip -p $(outfile).zip vault > $(outfile); \
503503
chmod +x $(outfile); \
504504
rm -f $(outfile).zip
505505

@@ -580,10 +580,10 @@ $(DOWNLOAD_DIR)/tools/ko@$(KO_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR
580580
chmod +x $(outfile); \
581581
rm -f $(outfile).tar.gz
582582

583-
protoc_linux_amd64_SHA256SUM=e9c129c176bb7df02546c4cd6185126ca53c89e7d2f09511e209319704b5dd7e
584-
protoc_linux_arm64_SHA256SUM=4a802ed23d70f7bad7eb19e5a3e724b3aa967250d572cadfd537c1ba939aee6a
585-
protoc_darwin_amd64_SHA256SUM=f9caa5b4d0b537acffb0ffd7d53225511a5574ef903fca550ea9e7600987f13b
586-
protoc_darwin_arm64_SHA256SUM=a7b51b2113862690fa52c62f8891a6037bafb9db88d4f9924c486de9d9bb89d5
583+
protoc_linux_amd64_SHA256SUM=d99c011b799e9e412064244f0be417e5d76c9b6ace13a2ac735330fa7d57ad8f
584+
protoc_linux_arm64_SHA256SUM=4b96bc91f8b54d829b8c3ca2207ff1ceb774843321e4fa5a68502faece584272
585+
protoc_darwin_amd64_SHA256SUM=e4e50a703147a92d1a5a2d3a34c9e41717f67ade67d4be72b9a466eb8f22fe87
586+
protoc_darwin_arm64_SHA256SUM=3cf55dd47118bd2efda9cd26b74f8bbbfcf5beb1bf606bc56ad4c001b543f6d3
587587

588588
.PRECIOUS: $(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH)
589589
$(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -593,7 +593,7 @@ $(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWN
593593
@source $(lock_script) $@; \
594594
$(CURL) https://github.com/protocolbuffers/protobuf/releases/download/$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION:v%=%)-$(OS)-$(ARCH).zip -o $(outfile).zip; \
595595
$(checkhash_script) $(outfile).zip $(protoc_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
596-
unzip -qq -c $(outfile).zip bin/protoc > $(outfile); \
596+
unzip -p $(outfile).zip bin/protoc > $(outfile); \
597597
chmod +x $(outfile); \
598598
rm -f $(outfile).zip
599599

‎pkg/certmanager/certmanager.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23+
"maps"
2324
"sync"
2425
"time"
2526

@@ -230,9 +231,7 @@ func (m *manager) Sign(ctx context.Context, identities string, csrPEM []byte, du
230231
},
231232
}
232233

233-
for k, v := range m.opts.AdditionalAnnotations {
234-
cr.ObjectMeta.Annotations[k] = v
235-
}
234+
maps.Copy(cr.ObjectMeta.Annotations, m.opts.AdditionalAnnotations)
236235
// Create CertificateRequest and wait for it to be successfully signed.
237236
cr, err := m.certManagerClient.Create(ctx, cr, metav1.CreateOptions{})
238237
if err != nil {

‎pkg/server/internal/extensions/extensions_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
)
2929

3030
var (
31-
disallowedX509KeyUsages = []interface{}{
31+
disallowedX509KeyUsages = []any{
3232
x509.KeyUsageContentCommitment,
3333
x509.KeyUsageDataEncipherment,
3434
x509.KeyUsageKeyAgreement,
@@ -38,12 +38,12 @@ var (
3838
x509.KeyUsageDecipherOnly,
3939
}
4040

41-
allowedX509KeyUsages = []interface{}{
41+
allowedX509KeyUsages = []any{
4242
x509.KeyUsageDigitalSignature,
4343
x509.KeyUsageKeyEncipherment,
4444
}
4545

46-
disallowedX509ExtKeyUsages = []interface{}{
46+
disallowedX509ExtKeyUsages = []any{
4747
x509.ExtKeyUsageAny,
4848
x509.ExtKeyUsageCodeSigning,
4949
x509.ExtKeyUsageEmailProtection,
@@ -58,7 +58,7 @@ var (
5858
x509.ExtKeyUsageMicrosoftKernelCodeSigning,
5959
}
6060

61-
allowedX509ExtKeyUsages = []interface{}{
61+
allowedX509ExtKeyUsages = []any{
6262
x509.ExtKeyUsageServerAuth,
6363
x509.ExtKeyUsageClientAuth,
6464
}
@@ -319,13 +319,13 @@ func TestValidateKeyUsageExtension(t *testing.T) {
319319
}
320320

321321
// Adapted from https://github.com/mxschmitt/golang-combinations
322-
func powerset(set []interface{}) (subsets [][]interface{}) {
322+
func powerset(set []any) (subsets [][]any) {
323323
length := uint(len(set))
324324

325325
// Go through all possible combinations of objects
326326
// from 1 (only first object in subset) to 2^length (all objects in subset)
327327
for subsetBits := 1; subsetBits < (1 << length); subsetBits++ {
328-
var subset []interface{}
328+
var subset []any
329329

330330
for object := range length {
331331
// checks if object is contained in subset

0 commit comments

Comments
 (0)