Skip to content

Commit 0849c60

Browse files
committed
fix errors from "make verify"
1 parent 9e153ac commit 0849c60

14 files changed

+4249
-82
lines changed

.github/dependabot.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/dependabot.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
33

44
# Update Go dependencies and GitHub Actions dependencies daily.
55
version: 2
66
updates:
7-
- package-ecosystem: gomod
8-
directory: /
9-
schedule:
10-
interval: daily
11-
groups:
12-
all:
13-
patterns: ["*"]
14-
- package-ecosystem: github-actions
15-
directory: /
16-
schedule:
17-
interval: daily
18-
groups:
19-
all:
20-
patterns: ["*"]
7+
- package-ecosystem: gomod
8+
directory: /
9+
schedule:
10+
interval: daily
11+
groups:
12+
all:
13+
patterns: ["*"]
14+
- package-ecosystem: github-actions
15+
directory: /
16+
schedule:
17+
interval: daily
18+
groups:
19+
all:
20+
patterns: ["*"]

.github/workflows/govulncheck.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/go/base/.github/workflows/govulncheck.yaml instead.
3+
4+
# Run govulncheck at midnight every night on the main branch,
5+
# to alert us to recent vulnerabilities which affect the Go code in this
6+
# project.
7+
name: govulncheck
8+
on:
9+
workflow_dispatch: {}
10+
schedule:
11+
- cron: '0 0 * * *'
12+
13+
permissions:
14+
contents: read
15+
16+
jobs:
17+
govulncheck:
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
22+
23+
- id: go-version
24+
run: |
25+
make print-go-version >> "$GITHUB_OUTPUT"
26+
27+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
28+
with:
29+
go-version: ${{ steps.go-version.outputs.result }}
30+
31+
- run: make verify-govulncheck

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
self_upgrade:
1616
runs-on: ubuntu-latest
1717

18+
if: github.repository_owner == 'cert-manager'
19+
1820
permissions:
1921
contents: write
2022
pull-requests: write

.golangci.yaml

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ issues:
99
- gosimple
1010
- nilerr
1111
- nilnil
12-
1312
# TODO(mael): add the following linters one by one and fix the issues
1413
# they report. I didn't have time to do that when I migrated to
1514
# makefile-modules.
@@ -74,12 +73,68 @@ issues:
7473
linters:
7574
# Explicitly define all enabled linters
7675
disable-all: true
77-
enable: []
76+
enable:
77+
- asasalint
78+
- asciicheck
79+
- bidichk
80+
- bodyclose
81+
- contextcheck
82+
- copyloopvar
83+
- decorder
84+
- dogsled
85+
- dupword
86+
- durationcheck
87+
- errcheck
88+
- errchkjson
89+
- errname
90+
- exhaustive
91+
- forbidigo
92+
- gci
93+
- ginkgolinter
94+
- gocheckcompilerdirectives
95+
- gochecksumtype
96+
- gocritic
97+
- gofmt
98+
- goheader
99+
- goprintffuncname
100+
- gosec
101+
- gosimple
102+
- gosmopolitan
103+
- govet
104+
- grouper
105+
- importas
106+
- ineffassign
107+
- interfacebloat
108+
- loggercheck
109+
- makezero
110+
- mirror
111+
- misspell
112+
- musttag
113+
- nakedret
114+
- nilerr
115+
- nilnil
116+
- noctx
117+
- nosprintfhostport
118+
- predeclared
119+
- promlinter
120+
- protogetter
121+
- reassign
122+
- sloglint
123+
- staticcheck
124+
- tagalign
125+
- tenv
126+
- testableexamples
127+
- typecheck
128+
- unconvert
129+
- unparam
130+
- unused
131+
- usestdlibvars
132+
- wastedassign
78133
linters-settings:
79134
gci:
80135
sections:
81136
- standard # Standard section: captures all standard packages.
82137
- default # Default section: contains all imports that could not be matched to another section type.
83-
- prefix(github.com/jetstack/jetstack-secure) # Custom section: groups all imports with the specified Prefix.
138+
- prefix(github.com/jetstack/preflight) # Custom section: groups all imports with the specified Prefix.
84139
- blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
85140
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
##################################
3131

3232
# Some modules build their dependencies from variables, we want these to be
33-
# evalutated at the last possible moment. For this we use second expansion to
33+
# evaluated at the last possible moment. For this we use second expansion to
3434
# re-evaluate the generate and verify targets a second time.
3535
#
3636
# See https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html

deploy/charts/venafi-kubernetes-agent/crd_bases/crd.header.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{/* DO NOT EDIT. Use 'make generate-crds-venconn' to regenerate. */}}
2-
{{- if .Values.crds.venafiConnection.enabled }}
2+
{{- if .Values.crds.venafiConnection.include }}
33
{{- if (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
44
apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition

0 commit comments

Comments
 (0)