Skip to content

Commit dd8d6e0

Browse files
committed
fixup: deps
Signed-off-by: Todd Baert <todd.baert@dynatrace.com>
1 parent ca5dc33 commit dd8d6e0

10 files changed

Lines changed: 141 additions & 283 deletions

File tree

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
description: "Tag of Kind image"
77
type: "string"
88
env:
9-
GO_VERSION: "~1.23"
9+
GO_VERSION: "~1.25"
1010
defaults:
1111
run:
1212
shell: bash

.github/workflows/golangci-lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ on:
1717
- "!docs/**"
1818
env:
1919
# renovate: datasource=github-releases depName=golangci/golangci-lint
20-
GOLANGCI_LINT_VERSION: "v1.63.4"
21-
GO_VERSION: "~1.23"
20+
GOLANGCI_LINT_VERSION: "v2.11.4"
21+
GO_VERSION: "~1.25"
2222
jobs:
2323
golangci-lint:
2424
name: golangci-lint
@@ -38,7 +38,7 @@ jobs:
3838
run: make workspace-init
3939

4040
- name: golangci-lint
41-
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
41+
uses: golangci/golangci-lint-action@9fae48acfc02a90574d7c304a1758ef9895495fa # v7.0.1
4242
with:
4343
working-directory: ./
4444
version: ${{ env.GOLANGCI_LINT_VERSION }}

.github/workflows/release-please.yml

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

88
env:
99
# Default minimum version of Go to support.
10-
DEFAULT_GO_VERSION: "~1.23"
10+
DEFAULT_GO_VERSION: "~1.25"
1111
REGISTRY: ghcr.io
1212
IMAGE_NAME: ${{ github.repository }}
1313
GITHUB_PAGES_BRANCH: gh-pages

.golangci.yml

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
1+
version: "2"
2+
13
run:
2-
timeout: 5m
3-
go: '1.23'
4-
linters:
5-
enable:
6-
- gofmt # Gofmt checks whether code was gofmt-ed. By default, this tool runs with -s option to check for code simplification
7-
- gci # Gci controls golang package import order and makes it always deterministic.
8-
- errorlint # errorlint can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
9-
- containedctx # containedctx is a linter that detects struct contained context.Context field
10-
- dogsled # Checks assignments with too many blank identifiers (e.g. x, , , _, := f())
11-
- nilnil # Checks that there is no simultaneous return of nil error and an invalid value.
12-
- noctx # noctx finds sending http request without context.Context
13-
- gocyclo # measure cyclomatic complexity
14-
- gocognit # measure cognitive complexity
15-
- funlen # limit function length
16-
- dupl # Detect code duplication
4+
go: '1.25'
175

18-
issues:
19-
exclude-rules:
20-
- linters:
21-
- containedctx
22-
- gocyclo
23-
- gocognit
24-
- funlen
25-
path: _test\.go
6+
formatters:
7+
enable:
8+
- gofmt
9+
- gci
2610

27-
linters-settings:
28-
gocyclo:
29-
min-complexity: 10
30-
gocognit:
31-
min-complexity: 20
32-
funlen:
33-
lines: 120
34-
statements: 120
11+
linters:
12+
default: none
13+
enable:
14+
- errorlint
15+
- containedctx
16+
- dogsled
17+
- nilnil
18+
- noctx
19+
- gocyclo
20+
- gocognit
21+
- funlen
22+
- dupl
23+
settings:
24+
gocyclo:
25+
min-complexity: 10
26+
gocognit:
27+
min-complexity: 20
28+
funlen:
29+
lines: 120
30+
statements: 120
31+
exclusions:
32+
rules:
33+
- linters:
34+
- containedctx
35+
- gocyclo
36+
- gocognit
37+
- funlen
38+
path: _test\.go

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.23.5-alpine3.20 AS builder
2+
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ e2e-test-validate-local:
9797

9898
.PHONY: lint
9999
lint:
100-
go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@latest
100+
go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
101101
${GOPATH}/bin/golangci-lint run --timeout=3m --config=./.golangci.yml -v ./... # Run linters
102102

103103
.PHONY: generate-crdocs

api/go.mod

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,34 @@
11
module github.com/open-feature/open-feature-operator/apis
22

3-
go 1.23.0
4-
5-
toolchain go1.23.3
3+
go 1.25.0
64

75
require (
8-
github.com/open-feature/flagd-schemas v0.2.9-0.20250529171004-2852d7772e6b
96
github.com/stretchr/testify v1.10.0
10-
github.com/xeipuuv/gojsonschema v1.2.0
117
k8s.io/api v0.32.3
128
k8s.io/apimachinery v0.32.3
139
sigs.k8s.io/controller-runtime v0.20.1
1410
sigs.k8s.io/gateway-api v1.2.1
1511
)
1612

1713
require (
18-
github.com/beorn7/perks v1.0.1 // indirect
19-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2014
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
21-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
22-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
23-
github.com/fsnotify/fsnotify v1.8.0 // indirect
2415
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2516
github.com/go-logr/logr v1.4.2 // indirect
26-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
27-
github.com/go-openapi/jsonreference v0.21.0 // indirect
28-
github.com/go-openapi/swag v0.23.0 // indirect
2917
github.com/gogo/protobuf v1.3.2 // indirect
30-
github.com/golang/protobuf v1.5.4 // indirect
31-
github.com/google/btree v1.1.3 // indirect
32-
github.com/google/gnostic-models v0.6.9 // indirect
33-
github.com/google/go-cmp v0.6.0 // indirect
3418
github.com/google/gofuzz v1.2.0 // indirect
3519
github.com/google/pprof v0.0.0-20250125003558-7fdb3d7e6fa0 // indirect
36-
github.com/google/uuid v1.6.0 // indirect
37-
github.com/josharian/intern v1.0.0 // indirect
3820
github.com/json-iterator/go v1.1.12 // indirect
39-
github.com/klauspost/compress v1.17.11 // indirect
40-
github.com/mailru/easyjson v0.9.0 // indirect
21+
github.com/kr/text v0.2.0 // indirect
4122
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4223
github.com/modern-go/reflect2 v1.0.2 // indirect
43-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
44-
github.com/pkg/errors v0.9.1 // indirect
4524
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
46-
github.com/prometheus/client_golang v1.20.5 // indirect
47-
github.com/prometheus/client_model v0.6.1 // indirect
48-
github.com/prometheus/common v0.62.0 // indirect
49-
github.com/prometheus/procfs v0.15.1 // indirect
50-
github.com/spf13/pflag v1.0.5 // indirect
5125
github.com/x448/float16 v0.8.4 // indirect
52-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
53-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
5426
golang.org/x/net v0.34.0 // indirect
55-
golang.org/x/oauth2 v0.25.0 // indirect
56-
golang.org/x/sync v0.10.0 // indirect
57-
golang.org/x/sys v0.29.0 // indirect
58-
golang.org/x/term v0.28.0 // indirect
5927
golang.org/x/text v0.21.0 // indirect
60-
golang.org/x/time v0.9.0 // indirect
6128
golang.org/x/tools v0.29.0 // indirect
62-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
63-
google.golang.org/protobuf v1.36.4 // indirect
64-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6529
gopkg.in/inf.v0 v0.9.1 // indirect
6630
gopkg.in/yaml.v3 v3.0.1 // indirect
67-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
68-
k8s.io/client-go v0.32.1 // indirect
6931
k8s.io/klog/v2 v2.130.1 // indirect
70-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
7132
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
7233
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
7334
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect

0 commit comments

Comments
 (0)