Skip to content

Commit 2468373

Browse files
jimmidysonjimmidyson
authored
build: Upgrade tools and distroless base image (#58)
1 parent a5b3c81 commit 2468373

File tree

8 files changed

+28
-29
lines changed

8 files changed

+28
-29
lines changed

‎.go-tools

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/oligot/[email protected]
22
github.com/segmentio/[email protected]
3-
gotest.tools/gotestsum@v1.9.0
4-
sigs.k8s.io/controller-runtime/tools/[email protected]20230208013708-22718275bffe
5-
github.com/google/go-containerregistry/cmd/crane@v0.13.0
3+
gotest.tools/gotestsum@v1.10.0
4+
sigs.k8s.io/controller-runtime/tools/[email protected]20230427153817-0ef07535542b
5+
github.com/google/go-containerregistry/cmd/crane@v0.14.0
66
github.com/drone/envsubst/cmd/[email protected]

‎.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ repos:
4242
- id: end-of-file-fixer
4343
stages: [commit]
4444
- repo: https://github.com/jorisroovers/gitlint
45-
rev: v0.19.0dev
45+
rev: v0.19.1
4646
hooks:
4747
- id: gitlint
4848
stages: [commit-msg]
@@ -61,13 +61,13 @@ repos:
6161
stages: [commit]
6262
args: ["-e", "SC2211", "-x"]
6363
- repo: https://github.com/igorshubovych/markdownlint-cli
64-
rev: v0.33.0
64+
rev: v0.34.0
6565
hooks:
6666
- id: markdownlint
6767
stages: [commit]
6868
exclude: ^(CHANGELOG.md|charts/.+/README.md)$
6969
- repo: https://github.com/Lucas-C/pre-commit-hooks
70-
rev: v1.4.2
70+
rev: v1.5.1
7171
hooks:
7272
- id: insert-license
7373
name: License headers - Go

‎.tool-versions

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
clusterctl 1.3.3
2-
flux2 0.39.0
3-
gcloud 417.0.1
4-
ginkgo 2.8.0
5-
gojq 0.12.11
6-
golang 1.20
7-
golangci-lint 1.51.1
8-
goreleaser 1.15.2
9-
helm 3.11.1
1+
clusterctl 1.4.1
2+
flux2 0.41.2
3+
gcloud 428.0.0
4+
ginkgo 2.9.2
5+
gojq 0.12.12
6+
golang 1.20.3
7+
golangci-lint 1.52.2
8+
goreleaser 1.17.2
9+
helm 3.11.3
1010
helm-docs 1.11.0
11-
kind 0.17.0
12-
kube-controller-tools 0.11.3
13-
kubebuilder 3.9.0
14-
kubectl 1.26.1
15-
kustomize 5.0.0
16-
pre-commit 3.0.4
11+
kind 0.18.0
12+
kube-controller-tools 0.11.4
13+
kubebuilder 3.10.0
14+
kubectl 1.27.1
15+
kustomize 5.0.1
16+
pre-commit 3.3.0
1717
shfmt 3.6.0
1818
upx 4.0.2

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright 2023 D2iQ, Inc. All rights reserved.
44
# SPDX-License-Identifier: Apache-2.0
55

6-
FROM --platform=linux/amd64 gcr.io/distroless/static@sha256:b1a9ecc1b37ec3bc9a2d8f8a0a5090ee5babda422f2b1c3724f108fa7e506e77 as linux-amd64
7-
FROM --platform=linux/arm64 gcr.io/distroless/static@sha256:2fc464bd828a7f713020c06f0bb4ff01670d08292ba4a01ffbc3b56a1d59da3a as linux-arm64
6+
FROM --platform=linux/amd64 gcr.io/distroless/static@sha256:1b4dbd7d38a0fd4bbaf5216a21a615d07b56747a96d3c650689cbb7fdc412b49 as linux-amd64
7+
FROM --platform=linux/arm64 gcr.io/distroless/static@sha256:05810557ec4b4bf01f4df548c06cc915bb29d81cb339495fe1ad2e668434bf8e as linux-arm64
88

99
FROM --platform=linux/${TARGETARCH} linux-${TARGETARCH}
1010

‎charts/capi-runtime-extensions/crds/clusteraddons.labs.d2iq.io_clusteraddons.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.3
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: clusteraddons.clusteraddons.labs.d2iq.io
98
spec:
109
group: clusteraddons.labs.d2iq.io

‎charts/capi-runtime-extensions/crds/clusteraddons.labs.d2iq.io_clusteraddonsets.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.3
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: clusteraddonsets.clusteraddons.labs.d2iq.io
98
spec:
109
group: clusteraddons.labs.d2iq.io

‎charts/capi-runtime-extensions/templates/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: capi-runtime-extensions-manager-role
76
rules:
87
- apiGroups:

‎pkg/k8s/deleter/deleter.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ func deleteServicesWithLoadBalancer(
7272
svc := &services.Items[i]
7373
if needsDelete(svc) {
7474
log.Info(fmt.Sprintf("Deleting Service %s/%s", svc.Namespace, svc.Name))
75-
if err = c.Delete(ctx, svc); client.IgnoreNotFound(err) != nil {
75+
if err = c.Delete(ctx, svc); client.IgnoreNotFound( //nolint:gocritic // Error is checked.
76+
err,
77+
) != nil {
7678
log.Error(
7779
err,
7880
fmt.Sprintf(

0 commit comments

Comments
 (0)