Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: parametrize golangci-lint config path, add renovate annotations, bump KIC #85

Merged
merged 2 commits into from
Apr 16, 2024
Merged

chore: parametrize golangci-lint config path, add renovate annotations, bump KIC #85

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f13a5
chore: parametrize golangci-lint config path, add renovate annotation…
programmer04 Apr 15, 2024
9341360
Update Makefile
programmer04 Apr 16, 2024
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
20 changes: 15 additions & 5 deletions .tools_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
# renovate: datasource=github-releases depName=kubernetes/code-generator
programmer04 marked this conversation as resolved.
Show resolved Hide resolved
code-generator: "0.29.1"
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
controller-tools: "0.14.0"
# renovate: datasource=github-releases depName=kubernetes-sigs/kustomize
kustomize: "5.3.0"
golangci-lint: "1.56.1"
skaffold: "2.3.1"
dlv: "1.22.0"
# renovate: datasource=github-releases depName=golangci/golangci-lint
golangci-lint: "1.57.2"
# renovate: datasource=github-releases depName=GoogleContainerTools/skaffold
skaffold: "2.11.1"
# renovate: datasource=github-releases depName=go-delve/delve
dlv: "1.22.1"
# renovate: datasource=github-releases depName=operator-framework/operator-sdk
operator-sdk: "1.23.0"
yq: "4.34.1"
# renovate: datasource=github-releases depName=mikefarah/yq
yq: "4.43.1"
# renovate: datasource=github-releases depName=gotestyourself/gotestsum
gotestsum: "1.11.0"
crd-ref-docs: "0.0.11"
# renovate: datasource=github-releases depName=elastic/crd-ref-docs
crd-ref-docs: "0.0.12"
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,10 @@ _build.operator:
build: generate
$(MAKE) build.operator

GOLANGCI_LINT_CONFIG = $(PROJECT_DIR)/.golangci.yaml
programmer04 marked this conversation as resolved.
Show resolved Hide resolved
.PHONY: lint
lint: golangci-lint
$(GOLANGCI_LINT) run -v --config .golangci.yaml $(GOLANGCI_LINT_FLAGS)
$(GOLANGCI_LINT) run -v --config $(GOLANGCI_LINT_CONFIG) $(GOLANGCI_LINT_FLAGS)

.PHONY: verify
verify: verify.manifests verify.generators
Expand Down Expand Up @@ -332,7 +333,7 @@ test.integration_provision_dataplane_fail:
@$(MAKE) _test.integration \
WEBHOOK_ENABLED=true \
GOTESTFLAGS="-run=TestGatewayProvisionDataPlaneFail $(GOTESTFLAGS)" \
COVERPROFILE="coverage.integration.out"
COVERPROFILE="coverage.integration.out"

.PHONY: _test.e2e
_test.e2e: gotestsum
Expand Down
30 changes: 14 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/cloudflare/cfssl v1.6.5
github.com/go-logr/logr v1.4.1
github.com/google/uuid v1.6.0
github.com/kong/kubernetes-ingress-controller/v3 v3.1.3
github.com/kong/kubernetes-ingress-controller/v3 v3.1.1-0.20240415080630-14ec732c21fb
github.com/kong/kubernetes-telemetry v0.1.3
github.com/kong/kubernetes-testing-framework v0.46.0
github.com/kong/semver/v4 v4.0.1
Expand All @@ -36,28 +36,26 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/kong/go-kong v0.51.1-0.20240125175037-0c077f5b9ac7 // indirect
github.com/kong/go-kong v0.54.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/onsi/ginkgo/v2 v2.15.0 // indirect
github.com/onsi/gomega v1.31.1 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/tidwall/gjson v1.17.0 // indirect
github.com/tidwall/gjson v1.17.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
k8s.io/apiserver v0.29.3 // indirect
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
Expand All @@ -66,7 +64,7 @@ require (
require (
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/container v1.33.1 // indirect
cloud.google.com/go/container v1.35.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/gammazero/deque v0.2.0 // indirect
github.com/gammazero/workerpool v1.1.3 // indirect
Expand All @@ -85,9 +83,9 @@ require (
go.opencensus.io v0.24.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/sync v0.6.0 // indirect
google.golang.org/api v0.171.0 // indirect
google.golang.org/grpc v1.62.1 // indirect
golang.org/x/sync v0.7.0 // indirect
google.golang.org/api v0.172.0 // indirect
google.golang.org/grpc v1.63.2 // indirect
sigs.k8s.io/kind v0.22.0 // indirect
sigs.k8s.io/kustomize/api v0.17.1
sigs.k8s.io/kustomize/kyaml v0.17.0 // indirect
Expand All @@ -99,7 +97,7 @@ require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/docker v26.0.0+incompatible // indirect
github.com/docker/docker v26.0.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
Expand All @@ -123,12 +121,12 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.52.3 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand Down
Loading
Loading