Skip to content

Commit 9b7f822

Browse files
hessjcghessjcg
committed
deps: Update dependencies to latest.
1 parent 0898f42 commit 9b7f822

File tree

13 files changed

+290
-222
lines changed

13 files changed

+290
-222
lines changed

‎.golangci.bck.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Copyright 2022 Google LLC.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
# .golangci.yml
15+
linters:
16+
disable-all: true
17+
enable:
18+
- goimports
19+
- revive
20+
- importas
21+
issues:
22+
exclude-use-default: false
23+
linters-settings:
24+
importas:
25+
no-unaliased: true
26+
alias:
27+
- pkg: "github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/internal/api/v1alpha1"
28+
alias: "cloudsqlapi"
29+
revive:
30+
rules:
31+
- name: blank-imports
32+
- name: context-as-argument
33+
- name: context-keys-type
34+
- name: dot-imports
35+
- name: error-return
36+
- name: error-strings
37+
- name: error-naming
38+
# - name: exported
39+
- name: if-return
40+
- name: increment-decrement
41+
- name: var-naming
42+
- name: var-declaration
43+
- name: package-comments
44+
- name: range
45+
- name: receiver-naming
46+
- name: time-naming
47+
- name: unexported-return
48+
- name: indent-error-flow
49+
- name: errorf
50+
- name: empty-block
51+
- name: superfluous-else
52+
- name: unused-parameter
53+
- name: unreachable-code
54+
- name: redefines-builtin-id
55+
- name: range-val-in-closure
56+
- name: range-val-address
57+
- name: import-shadowing
58+
run:
59+
timeout: 5m

‎.golangci.yml‎

Lines changed: 52 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,55 @@
1-
# Copyright 2022 Google LLC.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
# .golangci.yml
1+
version: "2"
152
linters:
16-
disable-all: true
3+
default: none
174
enable:
18-
- goimports
19-
- revive
205
- importas
21-
issues:
22-
exclude-use-default: false
23-
linters-settings:
24-
importas:
25-
no-unaliased: true
26-
alias:
27-
- pkg: "github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/internal/api/v1alpha1"
28-
alias: "cloudsqlapi"
29-
revive:
30-
rules:
31-
- name: blank-imports
32-
- name: context-as-argument
33-
- name: context-keys-type
34-
- name: dot-imports
35-
- name: error-return
36-
- name: error-strings
37-
- name: error-naming
38-
# - name: exported
39-
- name: if-return
40-
- name: increment-decrement
41-
- name: var-naming
42-
- name: var-declaration
43-
- name: package-comments
44-
- name: range
45-
- name: receiver-naming
46-
- name: time-naming
47-
- name: unexported-return
48-
- name: indent-error-flow
49-
- name: errorf
50-
- name: empty-block
51-
- name: superfluous-else
52-
- name: unused-parameter
53-
- name: unreachable-code
54-
- name: redefines-builtin-id
55-
- name: range-val-in-closure
56-
- name: range-val-address
57-
- name: import-shadowing
58-
run:
59-
timeout: 5m
6+
- revive
7+
settings:
8+
importas:
9+
alias:
10+
- pkg: github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/internal/api/v1alpha1
11+
alias: cloudsqlapi
12+
no-unaliased: true
13+
revive:
14+
rules:
15+
- name: blank-imports
16+
- name: context-as-argument
17+
- name: context-keys-type
18+
- name: dot-imports
19+
- name: error-return
20+
- name: error-strings
21+
- name: error-naming
22+
- name: if-return
23+
- name: increment-decrement
24+
- name: var-naming
25+
- name: var-declaration
26+
- name: package-comments
27+
- name: range
28+
- name: receiver-naming
29+
- name: time-naming
30+
- name: unexported-return
31+
- name: indent-error-flow
32+
- name: errorf
33+
- name: empty-block
34+
- name: superfluous-else
35+
- name: unused-parameter
36+
- name: unreachable-code
37+
- name: redefines-builtin-id
38+
- name: range-val-in-closure
39+
- name: range-val-address
40+
- name: import-shadowing
41+
exclusions:
42+
generated: lax
43+
paths:
44+
- third_party$
45+
- builtin$
46+
- examples$
47+
formatters:
48+
enable:
49+
- goimports
50+
exclusions:
51+
generated: lax
52+
paths:
53+
- third_party$
54+
- builtin$
55+
- examples$

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Use distroless as minimal base image to package the manager binary
1616
# Refer to https://github.com/GoogleContainerTools/distroless for more details
17-
FROM gcr.io/distroless/static:nonroot@sha256:c0f429e16b13e583da7e5a6ec20dd656d325d88e6819cafe0adb0828976529dc
17+
FROM gcr.io/distroless/static:nonroot@sha256:627d6c5a23ad24e6bdff827f16c7b60e0289029b0c79e9f7ccd54ae3279fb45f
1818

1919
# For multi-arch builds, use automatic platform build arguments
2020
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope

‎Dockerfile-operator‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
2828

2929
# Use distroless as minimal base image to package the manager binary
3030
# Refer to https://github.com/GoogleContainerTools/distroless for more details
31-
FROM gcr.io/distroless/static:nonroot@sha256:c0f429e16b13e583da7e5a6ec20dd656d325d88e6819cafe0adb0828976529dc
31+
FROM gcr.io/distroless/static:nonroot@sha256:627d6c5a23ad24e6bdff827f16c7b60e0289029b0c79e9f7ccd54ae3279fb45f
3232

3333
# For multi-arch builds, use automatic platform build arguments
3434
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SHELL = /usr/bin/env bash -o pipefail
5151
.SHELLFLAGS = -ec
5252

5353
## The version to use for the cert-manager operator
54-
CERT_MANAGER_VERSION=v1.17.2# renovate datasource=github-tags depName=cert-manager/cert-manager
54+
CERT_MANAGER_VERSION=v1.18.2# renovate datasource=github-tags depName=cert-manager/cert-manager
5555

5656
##@ General
5757

@@ -155,7 +155,7 @@ build_push_docker: # Build docker image with the operator. set IMG env var befor
155155
go_lint: golangci-lint # Run go lint tools, fail if unchecked errors
156156
# Implements golang CI based on settings described here:
157157
# See https://betterprogramming.pub/how-to-improve-code-quality-with-an-automatic-check-in-go-d18a5eb85f09
158-
$(GOLANGCI_LINT) run --fix --fast ./...
158+
$(GOLANGCI_LINT) run --fix ./...
159159

160160
.PHONY: tf_lint
161161
tf_lint: terraform # Run terraform fmt to ensure terraform code is consistent
@@ -439,11 +439,11 @@ CRD_REF_DOCS ?= $(LOCALBIN)/crd-ref-docs
439439
# additional whitespace will break the renovate regex rules.
440440

441441
KUBECTL_VERSION=v1.32.2# renovate datasource=github-tags depName=kubernetes/kubernetes
442-
TERRAFORM_VERSION=v1.11.4# renovate datasource=github-tags depName=hashicorp/terraform
442+
TERRAFORM_VERSION=v1.12.2# renovate datasource=github-tags depName=hashicorp/terraform
443443

444444
CONTROLLER_TOOLS_VERSION=v0.17.3# renovate datasource=go depName=sigs.k8s.io/controller-tools
445445
CRD_REF_DOCS_VERSION=v0.1.0# renovate datasource=go depName=github.com/elastic/crd-ref-docs
446-
GOLANGCI_LINT_VERSION=v1.64.8# renovate datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint
446+
GOLANGCI_LINT_VERSION=v2.2.2# renovate datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint
447447
GO_LICENSES_VERSION=v1.6.0# renovate datasource=go depName=github.com/google/go-licenses
448448

449449
KUSTOMIZE_VERSION=v5.6.0# don't manage with renovate, this repo has non-standard tags
@@ -498,7 +498,7 @@ $(TERRAFORM): $(LOCALBIN)
498498
.PHONY: golangci-lint
499499
golangci-lint: $(GOLANGCI_LINT) ## Download controller-gen locally if necessary.
500500
$(GOLANGCI_LINT): $(LOCALBIN)
501-
test -s $@ || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
501+
test -s $@ || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
502502

503503
.PHONY: go-licenses
504504
go-licenses: $(GO_LICENSES) ## Download controller-gen locally if necessary.

0 commit comments

Comments
 (0)