Skip to content
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
3 changes: 1 addition & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ jobs:
- name: Set up Go 1.23
uses: actions/setup-go@v6
with:
go-version: '1.26.1'
go-version: '1.26.4'
id: go
- name: Check out addon-operator code
uses: actions/checkout@v5

- name: Restore Go modules
id: go-modules-cache
uses: actions/cache@v4
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ jobs:
- name: Set up Go 1.26
uses: actions/setup-go@v6
with:
go-version: '1.26.1'

go-version: '1.26.4'
- name: Check out addon-operator code
uses: actions/checkout@v5

- name: Restore Go modules
id: go-modules-cache
uses: actions/[email protected]
Expand All @@ -41,10 +39,9 @@ jobs:
steps:
- uses: actions/setup-python@v6
with:
python-version: 3.8
python-version: 3.15.0
- name: Check out addon-operator code
uses: actions/checkout@v5

- name: Run codespell
run: |
pip install codespell==v1.17.1
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ jobs:
- name: Set up Go 1.23
uses: actions/setup-go@v6
with:
go-version: '1.26.1'
go-version: '1.26.4'
id: go
- name: Check out addon-operator code
uses: actions/checkout@v5

- name: Restore Go modules
id: go-modules-cache
uses: actions/cache@v4
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ YQ = $(LOCALBIN)/yq
## TODO: remap in yaml file (version.yaml or smthng)
## Tool Versions
# GO_BUILDER_VERSION must be without 'v' prefix
GO_BUILDER_VERSION = 1.26.1
GO_BUILDER_VERSION = 1.26.4
GOLANGCI_LINT_VERSION = v2.11.4
YQ_VERSION ?= v4.50.1

Expand All @@ -46,7 +46,7 @@ update-k8s-version: go-check
echo "Updating kubectl version in Dockerfile to match k8s.io/api version: $$kubectlVer"; \
sed -i "s/ARG kubectlVersion=.*/ARG kubectlVersion=$$kubectlVer/" Dockerfile; \
echo "kubectl version in Dockerfile updated to: $$kubectlVer"

.PHONY: update-workflows-go-version
update-workflows-go-version: yq
for file in $$(find .github/workflows -name "*.yaml"); do \
Expand Down Expand Up @@ -109,4 +109,4 @@ endef

define error-if-empty
@if [[ -z $(1) ]]; then echo "$(2) not installed"; false; fi
endef
endef
85 changes: 38 additions & 47 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ require (
github.com/goccy/go-graphviz v0.2.9
github.com/gofrs/uuid/v5 v5.4.0
github.com/google/cel-go v0.29.0
github.com/gookit/color v1.5.4 // indirect
github.com/gookit/color v1.6.0 // indirect
github.com/hashicorp/go-multierror v1.1.1
github.com/kennygrant/sanitize v1.2.4
github.com/onsi/gomega v1.41.0
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.11.1
github.com/tidwall/gjson v1.19.0
github.com/werf/nelm v1.31.0
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.20.2
Expand All @@ -38,15 +37,22 @@ require (
k8s.io/kubectl v0.35.8
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2
sigs.k8s.io/controller-runtime v0.23.3
sigs.k8s.io/kustomize/kyaml v0.20.1
sigs.k8s.io/kustomize/kyaml v0.21.1
sigs.k8s.io/yaml v1.6.0
)

require github.com/go-openapi/swag/loading v0.26.0
require (
github.com/go-openapi/swag/loading v0.26.0
github.com/werf/nelm/v2 v2.1.0
)

require (
dario.cat/mergo v1.0.1 // indirect
dario.cat/mergo v1.0.2 // indirect
github.com/ProtonMail/go-crypto v1.4.1 // indirect
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
github.com/cloudflare/circl v1.6.3 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fluxcd/cli-utils v0.37.2-flux.1 // indirect
github.com/goccy/go-json v0.10.6 // indirect
github.com/oklog/ulid/v2 v2.1.1 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
Expand All @@ -69,16 +75,15 @@ require (
github.com/go-openapi/swag/stringutils v0.26.0 // indirect
github.com/go-openapi/swag/typeutils v0.26.0 // indirect
github.com/go-openapi/swag/yamlutils v0.26.0 // indirect
github.com/go-resty/resty/v2 v2.17.1 // indirect
github.com/go-resty/resty/v2 v2.17.2 // indirect
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
github.com/gosimple/slug v1.15.0 // indirect
github.com/gosimple/unidecode v1.0.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
github.com/ohler55/ojg v1.26.7 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/ohler55/ojg v1.28.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/yannh/kubeconform v0.6.7 // indirect
github.com/yannh/kubeconform v0.7.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel/metric v1.45.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
Expand All @@ -88,7 +93,6 @@ require (
)

require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/BurntSushi/toml v1.6.0 // indirect
github.com/DataDog/gostackparse v0.7.0 // indirect
Expand All @@ -97,39 +101,30 @@ require (
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/Masterminds/squirrel v1.5.4 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/alecthomas/chroma/v2 v2.15.0 // indirect
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/avelino/slugify v0.0.0-20180501145920-855f152bd774 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymanbagabas/go-udiff v0.2.0 // indirect
github.com/aymanbagabas/go-udiff v0.4.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/chai2010/gettext-go v1.0.3 // indirect
github.com/chanced/caps v1.0.2 // indirect
github.com/containerd/containerd v1.7.36 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
github.com/disintegration/imaging v1.6.2 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/djherbis/buffer v1.2.0 // indirect
github.com/djherbis/nio/v3 v3.0.1 // indirect
github.com/dlclark/regexp2 v1.11.4 // indirect
github.com/docker/cli v29.4.0+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v28.3.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.3 // indirect
github.com/docker/go-connections v0.6.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/dlclark/regexp2 v1.11.5 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fatih/color v1.19.0 // indirect
github.com/flopp/go-findfont v0.1.0 // indirect
github.com/fluxcd/flagger v1.36.1 // indirect
github.com/fogleman/gg v1.3.0 // indirect
Expand All @@ -142,7 +137,7 @@ require (
github.com/go-openapi/jsonpointer v0.23.1 // indirect
github.com/go-openapi/jsonreference v0.21.6 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-yaml v1.15.23 // indirect
github.com/goccy/go-yaml v1.19.2 // indirect
github.com/gofrs/flock v0.13.0 // indirect
github.com/gojuno/minimock/v3 v3.4.7 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
Expand All @@ -151,36 +146,34 @@ require (
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-containerregistry v0.21.3 // indirect
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hofstadter-io/cinful v1.0.0 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/itchyny/gojq v0.12.17 // indirect
github.com/itchyny/timefmt-go v0.1.6 // indirect
github.com/jedib0t/go-pretty/v6 v6.5.5 // indirect
github.com/jellydator/ttlcache/v3 v3.1.1 // indirect
github.com/itchyny/gojq v0.12.19 // indirect
github.com/itchyny/timefmt-go v0.1.8 // indirect
github.com/jedib0t/go-pretty/v6 v6.7.8 // indirect
github.com/jellydator/ttlcache/v3 v3.4.0 // indirect
github.com/jmoiron/sqlx v1.4.0 // indirect
github.com/jonboulle/clockwork v0.5.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.5 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/lib/pq v1.12.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/looplab/fsm v1.0.2 // indirect
github.com/looplab/fsm v1.0.3 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-runewidth v0.0.21 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/term v0.5.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
Expand All @@ -193,34 +186,33 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/client_model v0.6.2
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rubenv/sql-migrate v1.8.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/samber/lo v1.49.1 // indirect
github.com/samber/lo v1.53.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cast v1.10.0 // indirect
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/tetratelabs/wazero v1.8.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/match v1.2.0 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tidwall/sjson v1.2.5 // indirect
github.com/wI2L/jsondiff v0.5.0 // indirect
github.com/werf/common-go v0.0.0-20251113140850-a1a98e909e9b // indirect
github.com/werf/kubedog v0.13.1-0.20260912145640-ad1e8a134607 // indirect
github.com/wI2L/jsondiff v0.7.0 // indirect
github.com/werf/common-go v0.0.0-20260831162604-46c3b45163be // indirect
github.com/werf/kubedog v0.13.1-0.20260915153156-438ef109f804 // indirect
github.com/werf/lockgate v0.1.1 // indirect
github.com/werf/logboek v0.6.1 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
go.opentelemetry.io/otel v1.45.0
go.opentelemetry.io/otel/trace v1.45.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
Expand All @@ -247,9 +239,8 @@ require (
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20260603220949-865597e52e25 // indirect
oras.land/oras-go v1.2.6 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/kustomize/api v0.20.1 // indirect
sigs.k8s.io/kustomize/api v0.21.1 // indirect
)

// swag v0.22 breaks schemas_test.go:TestMapMergeAnchor, seems it doesn't support anchoring. Have to figure out that.
Expand Down
Loading
Loading