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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- (Feature) (LM) Inventory Generator
- (Feature) (License) Activation CLI
- (Bugfix) (DP) Propagate Timeout Across Subcommands
- (Maintenance) Bump Dependencies

## [1.3.1](https://github.com/arangodb/kube-arangodb/tree/1.3.1) (2025-10-07)
- (Documentation) Add ArangoPlatformStorage Docs & Examples
Expand Down
30 changes: 14 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ ifeq ($(shell uname),Darwin)
REALPATH ?= grealpath
endif

KUBERNETES_VERSION_MINOR:=31
KUBERNETES_VERSION_PATCH:=8
KUBERNETES_VERSION_MINOR:=32
KUBERNETES_VERSION_PATCH:=9

ENVOY_IMAGE=envoyproxy/envoy:v1.32.5
ENVOY_IMAGE=envoyproxy/envoy:v1.36.2

PROJECT := arangodb_operator
SCRIPTDIR := $(shell pwd)
Expand Down Expand Up @@ -149,7 +149,7 @@ else
COMPILE_DEBUG_FLAGS :=
endif

PROTOC_VERSION := 21.1
PROTOC_VERSION := 33.0
ifeq ($(shell uname),Darwin)
PROTOC_ARCHIVE_SUFFIX := osx-universal_binary
else
Expand Down Expand Up @@ -898,20 +898,18 @@ tools-min: update-vendor
@echo ">> Fetching golangci-lint linter"
@GOBIN=$(GOPATH)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
@echo ">> Fetching goimports"
@GOBIN=$(GOPATH)/bin go install golang.org/x/tools/cmd/goimports@v0.19.0
@GOBIN=$(GOPATH)/bin go install golang.org/x/tools/cmd/goimports@v0.38.0
@echo ">> Fetching license check"
@GOBIN=$(GOPATH)/bin go install github.com/google/addlicense@v1.1.1
@GOBIN=$(GOPATH)/bin go install github.com/google/addlicense@v1.2.0
@echo ">> Fetching yamlfmt"
@GOBIN=$(GOPATH)/bin go install github.com/google/yamlfmt/cmd/yamlfmt@v0.10.0
@GOBIN=$(GOPATH)/bin go install github.com/google/yamlfmt/cmd/yamlfmt@v0.20.0
@echo ">> Fetching protolinter"
@GOBIN=$(GOPATH)/bin go install github.com/yoheimuta/protolint/cmd/protolint@v0.47.5
@GOBIN=$(GOPATH)/bin go install github.com/yoheimuta/protolint/cmd/protolint@v0.56.4

.PHONY: tools
tools: tools-min
@echo ">> Fetching gci"
@GOBIN=$(GOPATH)/bin go install github.com/daixiang0/gci@v0.13.4
@echo ">> Fetching yamlfmt"
@GOBIN=$(GOPATH)/bin go install github.com/google/yamlfmt/cmd/yamlfmt@v0.10.0
@GOBIN=$(GOPATH)/bin go install github.com/daixiang0/gci@v0.13.7
@echo ">> Downloading protobuf compiler..."
@curl -L ${PROTOC_URL} -o $(GOPATH)/protoc.zip
@echo ">> Unzipping protobuf compiler..."
Expand All @@ -922,9 +920,9 @@ tools: tools-min
@git clone --branch "master" --depth 1 https://github.com/googleapis/googleapis.git $(GOPATH)/include/googleapis
@rm -Rf $(VENDORDIR)/include/googleapis/.git
@echo ">> Fetching protoc go plugins..."
@GOBIN=$(GOPATH)/bin go install github.com/golang/protobuf/protoc-gen-go@v1.5.2
@GOBIN=$(GOPATH)/bin go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
@GOBIN=$(GOPATH)/bin go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.23.0
@GOBIN=$(GOPATH)/bin go install github.com/golang/protobuf/protoc-gen-go@v1.5.4
@GOBIN=$(GOPATH)/bin go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1
@GOBIN=$(GOPATH)/bin go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.27.3
@echo ">> Fetching govulncheck"
@GOBIN=$(GOPATH)/bin go install golang.org/x/vuln/cmd/govulncheck@v1.1.4

Expand Down Expand Up @@ -1041,7 +1039,7 @@ generate-internal:
ROOT=$(ROOT) go test --count=1 "$(REPOPATH)/internal/..."

generate-proto:
PATH="$(PATH):$(GOBUILDDIR)/bin" $(GOBUILDDIR)/bin/protoc -I.:$(GOBUILDDIR)/include/ -I.:$(GOBUILDDIR)/include/googleapis/ \
PATH="$(GOBUILDDIR)/bin:$(PATH)" $(GOBUILDDIR)/bin/protoc -I.:$(GOBUILDDIR)/include/ -I.:$(GOBUILDDIR)/include/googleapis/ \
--go_out=. --go_opt=paths=source_relative \
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
--grpc-gateway_out=. --grpc-gateway_opt=paths=source_relative \
Expand Down Expand Up @@ -1085,7 +1083,7 @@ sync: sync-charts
ci-check:
@$(MAKE) tidy vendor generate update-generated synchronize-v2alpha1-with-v1 sync fmt yamlfmt license protolint
@git checkout -- go.sum # ignore changes in go.sum
@if [ ! -z "$$(git status --porcelain)" ]; then echo "There are uncommited changes!"; git status; exit 1; fi
@if [ ! -z "$$(git status --porcelain)" ]; then echo "There are uncommited changes!"; git status; git diff; exit 1; fi

.PHONY: reset
reset:
Expand Down
1 change: 0 additions & 1 deletion examples/metrics/deployment-operator-servicemonitor.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This example shows how to integrate with the Prometheus Operator
# to bring metrics from kube-arangodb to Prometheus.

apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down
93 changes: 45 additions & 48 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/arangodb/kube-arangodb

go 1.23.8
go 1.24.0

toolchain go1.24.5

Expand All @@ -10,19 +10,19 @@ replace (
github.com/stretchr/testify => github.com/stretchr/testify v1.9.0
github.com/ugorji/go => github.com/ugorji/go v0.0.0-20181209151446-772ced7fd4c2

k8s.io/api => k8s.io/api v0.31.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.8
k8s.io/apimachinery => k8s.io/apimachinery v0.31.8
k8s.io/apiserver => k8s.io/apiserver v0.31.8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.8
k8s.io/client-go => k8s.io/client-go v0.31.8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.8
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.8
k8s.io/api => k8s.io/api v0.32.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.9
k8s.io/apimachinery => k8s.io/apimachinery v0.32.9
k8s.io/apiserver => k8s.io/apiserver v0.32.9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.9
k8s.io/client-go => k8s.io/client-go v0.32.9
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.9
k8s.io/code-generator => ./deps/k8s.io/code-generator
k8s.io/component-base => k8s.io/component-base v0.31.8
k8s.io/kubectl => k8s.io/kubectl v0.31.8
k8s.io/kubernetes => k8s.io/kubernetes v0.31.8
k8s.io/metrics => k8s.io/metrics v0.31.8
k8s.io/component-base => k8s.io/component-base v0.32.9
k8s.io/kubectl => k8s.io/kubectl v0.32.9
k8s.io/kubernetes => k8s.io/kubernetes v0.32.9
k8s.io/metrics => k8s.io/metrics v0.32.9
)

require (
Expand All @@ -49,25 +49,25 @@ require (
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2
github.com/prometheus-operator/prometheus-operator/pkg/client v0.0.0-00010101000000-000000000000
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_model v0.6.1
github.com/prometheus/client_model v0.6.2
github.com/prometheus/prom2json v1.3.3
github.com/robfig/cron v1.2.0
github.com/rs/zerolog v1.33.0
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
golang.org/x/sync v0.14.0
golang.org/x/sys v0.33.0
golang.org/x/text v0.25.0
golang.org/x/sync v0.17.0
golang.org/x/sys v0.37.0
golang.org/x/text v0.30.0
golang.org/x/time v0.11.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9
google.golang.org/grpc v1.72.1
google.golang.org/protobuf v1.36.6
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8
google.golang.org/grpc v1.76.0
google.golang.org/protobuf v1.36.10
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.32.2
k8s.io/apiextensions-apiserver v0.32.2
k8s.io/apimachinery v0.32.2
k8s.io/client-go v0.32.2
k8s.io/api v0.32.9
k8s.io/apiextensions-apiserver v0.32.9
k8s.io/apimachinery v0.32.9
k8s.io/client-go v0.32.9
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
sigs.k8s.io/yaml v1.4.0
)
Expand All @@ -79,22 +79,22 @@ require (
github.com/arangodb-managed/integration-apis v0.2.1
github.com/aws/aws-sdk-go v1.55.6
github.com/coreos/go-oidc/v3 v3.14.1
github.com/envoyproxy/go-control-plane/envoy v1.32.4
github.com/envoyproxy/go-control-plane/envoy v1.35.0
github.com/go-logr/zerologr v1.2.3
github.com/golang-jwt/jwt/v5 v5.2.2
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
github.com/jedib0t/go-pretty/v6 v6.6.5
github.com/regclient/regclient v0.8.3
golang.org/x/oauth2 v0.30.0
google.golang.org/api v0.235.0
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9
helm.sh/helm/v3 v3.17.3
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b
helm.sh/helm/v3 v3.17.4
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
)

require (
cel.dev/expr v0.20.0 // indirect
cel.dev/expr v0.24.0 // indirect
cloud.google.com/go v0.121.1 // indirect
cloud.google.com/go/auth v0.16.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
Expand All @@ -105,7 +105,7 @@ require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
Expand All @@ -121,7 +121,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
github.com/containerd/containerd v1.7.27 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
Expand All @@ -132,7 +132,7 @@ require (
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v25.0.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v25.0.6+incompatible // indirect
github.com/docker/docker v28.5.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
Expand All @@ -148,8 +148,8 @@ require (
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand All @@ -160,7 +160,6 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
Expand All @@ -176,7 +175,6 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmoiron/sqlx v1.4.0 // indirect
Expand Down Expand Up @@ -236,24 +234,23 @@ require (
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/tools v0.27.0 // indirect
golang.org/x/crypto v0.43.0 // indirect
golang.org/x/net v0.46.0 // indirect
golang.org/x/term v0.36.0 // indirect
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiserver v0.32.2 // indirect
k8s.io/cli-runtime v0.32.2 // indirect
k8s.io/component-base v0.32.2 // indirect
k8s.io/kubectl v0.32.2 // indirect
k8s.io/apiserver v0.32.9 // indirect
k8s.io/cli-runtime v0.32.9 // indirect
k8s.io/component-base v0.32.9 // indirect
k8s.io/kubectl v0.32.9 // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/controller-runtime v0.16.3 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
Expand Down
Loading