Skip to content

build: Upgrade tools and distroless base image #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .go-tools
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github.com/oligot/[email protected]
github.com/segmentio/[email protected]
gotest.tools/gotestsum@v1.9.0
sigs.k8s.io/controller-runtime/tools/[email protected]20230208013708-22718275bffe
github.com/google/go-containerregistry/cmd/crane@v0.13.0
gotest.tools/gotestsum@v1.10.0
sigs.k8s.io/controller-runtime/tools/[email protected]20230427153817-0ef07535542b
github.com/google/go-containerregistry/cmd/crane@v0.14.0
github.com/drone/envsubst/cmd/[email protected]
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ repos:
- id: end-of-file-fixer
stages: [commit]
- repo: https://github.com/jorisroovers/gitlint
rev: v0.19.0dev
rev: v0.19.1
hooks:
- id: gitlint
stages: [commit-msg]
Expand All @@ -61,13 +61,13 @@ repos:
stages: [commit]
args: ["-e", "SC2211", "-x"]
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.33.0
rev: v0.34.0
hooks:
- id: markdownlint
stages: [commit]
exclude: ^(CHANGELOG.md|charts/.+/README.md)$
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.4.2
rev: v1.5.1
hooks:
- id: insert-license
name: License headers - Go
Expand Down
30 changes: 15 additions & 15 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
clusterctl 1.3.3
flux2 0.39.0
gcloud 417.0.1
ginkgo 2.8.0
gojq 0.12.11
golang 1.20
golangci-lint 1.51.1
goreleaser 1.15.2
helm 3.11.1
clusterctl 1.4.1
flux2 0.41.2
gcloud 428.0.0
ginkgo 2.9.2
gojq 0.12.12
golang 1.20.3
golangci-lint 1.52.2
goreleaser 1.17.2
helm 3.11.3
helm-docs 1.11.0
kind 0.17.0
kube-controller-tools 0.11.3
kubebuilder 3.9.0
kubectl 1.26.1
kustomize 5.0.0
pre-commit 3.0.4
kind 0.18.0
kube-controller-tools 0.11.4
kubebuilder 3.10.0
kubectl 1.27.1
kustomize 5.0.1
pre-commit 3.3.0
shfmt 3.6.0
upx 4.0.2
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Copyright 2023 D2iQ, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.11.4
name: clusteraddons.clusteraddons.labs.d2iq.io
spec:
group: clusteraddons.labs.d2iq.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.11.4
name: clusteraddonsets.clusteraddons.labs.d2iq.io
spec:
group: clusteraddons.labs.d2iq.io
Expand Down
1 change: 0 additions & 1 deletion charts/capi-runtime-extensions/templates/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: capi-runtime-extensions-manager-role
rules:
- apiGroups:
Expand Down
4 changes: 3 additions & 1 deletion pkg/k8s/deleter/deleter.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ func deleteServicesWithLoadBalancer(
svc := &services.Items[i]
if needsDelete(svc) {
log.Info(fmt.Sprintf("Deleting Service %s/%s", svc.Namespace, svc.Name))
if err = c.Delete(ctx, svc); client.IgnoreNotFound(err) != nil {
if err = c.Delete(ctx, svc); client.IgnoreNotFound( //nolint:gocritic // Error is checked.
err,
) != nil {
log.Error(
err,
fmt.Sprintf(
Expand Down