diff --git a/.env b/.env index 599249271..3906a4f7c 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ OPERATOR_SDK_VERSION=v1.42.0 REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak,gabrielm-splunk,minjieqiu,qingw-splunk -GO_VERSION=1.25.7 +GO_VERSION=1.25.8 AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip KUBECTL_VERSION=v1.29.1 AZ_CLI_VERSION=2.79.0 diff --git a/Dockerfile b/Dockerfile index 4c7171a05..33f8a9f80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,10 @@ ARG PLATFORMS=linux/amd64,linux/arm64 ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal -ARG BASE_IMAGE_VERSION=8.10-1770223153 +ARG BASE_IMAGE_VERSION=8.10-1775152441 # Build the manager binary -FROM golang:1.25.7 AS builder +FROM golang:1.25.8 AS builder WORKDIR /workspace @@ -63,6 +63,7 @@ RUN if grep -q 'Ubuntu' /etc/os-release; then \ microdnf update -y libstdc++ && \ microdnf update -y libxml2 && \ microdnf update -y libgcc && \ + microdnf update -y gnutls && \ microdnf clean all; \ fi diff --git a/Dockerfile.distroless b/Dockerfile.distroless index 37121e4a6..a2ac2afc0 100644 --- a/Dockerfile.distroless +++ b/Dockerfile.distroless @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25.7 AS builder +FROM golang:1.25.8 AS builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/Makefile b/Makefile index aaf7724b5..04afe0a15 100644 --- a/Makefile +++ b/Makefile @@ -170,12 +170,12 @@ docker-push: ## Push docker image with the manager. # Defaults: # Build Platform: linux/amd64,linux/arm64 # Build Base OS: registry.access.redhat.com/ubi8/ubi-minimal -# Build Base OS Version: 8.10-1770223153 +# Build Base OS Version: 8.10-1775152441 # Pass only what is required, the rest will be defaulted # Setup defaults for build arguments PLATFORMS ?= linux/amd64,linux/arm64 BASE_IMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal -BASE_IMAGE_VERSION ?= 8.10-1770223153 +BASE_IMAGE_VERSION ?= 8.10-1775152441 docker-buildx: @if [ -z "${IMG}" ]; then \ diff --git a/go.mod b/go.mod index 413c9ed40..8b5adb30c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/splunk/splunk-operator -go 1.25.7 +go 1.25.8 require ( cloud.google.com/go/storage v1.36.0 @@ -61,7 +61,7 @@ require ( github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/buger/jsonparser v1.1.1 // indirect + github.com/buger/jsonparser v1.1.2 // indirect github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect diff --git a/go.sum b/go.sum index 08e4e56de..a0d78e0ef 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= +github.com/buger/jsonparser v1.1.2 h1:frqHqw7otoVbk5M8LlE/L7HTnIq2v9RX6EJ48i9AxJk= +github.com/buger/jsonparser v1.1.2/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=