Skip to content

Commit 191dd22

Browse files
cbarbian-sapcbarbian-sap
authored
Merge pull request #144 from SAP/update-modules
update dependencies
2 parents 4ec7940 + a95ca5a commit 191dd22

File tree

7 files changed

+203
-181
lines changed

7 files changed

+203
-181
lines changed

‎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.24.0 AS builder
2+
FROM --platform=$BUILDPLATFORM golang:1.24.3 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎crds/cache.cs.sap.com_redis.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ spec:
330330
pod labels will be ignored. The default value is empty.
331331
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
332332
Also, matchLabelKeys cannot be set when labelSelector isn't set.
333-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
334333
items:
335334
type: string
336335
type: array
@@ -345,7 +344,6 @@ spec:
345344
pod labels will be ignored. The default value is empty.
346345
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
347346
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
348-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
349347
items:
350348
type: string
351349
type: array
@@ -511,7 +509,6 @@ spec:
511509
pod labels will be ignored. The default value is empty.
512510
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
513511
Also, matchLabelKeys cannot be set when labelSelector isn't set.
514-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
515512
items:
516513
type: string
517514
type: array
@@ -526,7 +523,6 @@ spec:
526523
pod labels will be ignored. The default value is empty.
527524
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
528525
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
529-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
530526
items:
531527
type: string
532528
type: array
@@ -689,7 +685,6 @@ spec:
689685
pod labels will be ignored. The default value is empty.
690686
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
691687
Also, matchLabelKeys cannot be set when labelSelector isn't set.
692-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
693688
items:
694689
type: string
695690
type: array
@@ -704,7 +699,6 @@ spec:
704699
pod labels will be ignored. The default value is empty.
705700
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
706701
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
707-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
708702
items:
709703
type: string
710704
type: array
@@ -870,7 +864,6 @@ spec:
870864
pod labels will be ignored. The default value is empty.
871865
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
872866
Also, matchLabelKeys cannot be set when labelSelector isn't set.
873-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
874867
items:
875868
type: string
876869
type: array
@@ -885,7 +878,6 @@ spec:
885878
pod labels will be ignored. The default value is empty.
886879
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
887880
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
888-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
889881
items:
890882
type: string
891883
type: array
@@ -2431,7 +2423,7 @@ spec:
24312423
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
24322424
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
24332425
The volume will be mounted read-only (ro) and non-executable files (noexec).
2434-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
2426+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
24352427
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
24362428
properties:
24372429
pullPolicy:
@@ -4236,7 +4228,7 @@ spec:
42364228
Cannot be updated.
42374229
items:
42384230
description: EnvFromSource represents the source of a set
4239-
of ConfigMaps
4231+
of ConfigMaps or Secrets
42404232
properties:
42414233
configMapRef:
42424234
description: The ConfigMap to select from
@@ -4257,8 +4249,8 @@ spec:
42574249
type: object
42584250
x-kubernetes-map-type: atomic
42594251
prefix:
4260-
description: An optional identifier to prepend to each
4261-
key in the ConfigMap. Must be a C_IDENTIFIER.
4252+
description: Optional text to prepend to the name of each
4253+
environment variable. Must be a C_IDENTIFIER.
42624254
type: string
42634255
secretRef:
42644256
description: The Secret to select from
@@ -4521,6 +4513,12 @@ spec:
45214513
- port
45224514
type: object
45234515
type: object
4516+
stopSignal:
4517+
description: |-
4518+
StopSignal defines which signal will be sent to a container when it is being stopped.
4519+
If not specified, the default is defined by the container runtime in use.
4520+
StopSignal can only be set for Pods with a non-empty .spec.os.name
4521+
type: string
45244522
type: object
45254523
livenessProbe:
45264524
description: |-
@@ -5672,7 +5670,6 @@ spec:
56725670
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
56735671
56745672
If this value is nil, the behavior is equivalent to the Honor policy.
5675-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
56765673
type: string
56775674
nodeTaintsPolicy:
56785675
description: |-
@@ -5683,7 +5680,6 @@ spec:
56835680
- Ignore: node taints are ignored. All nodes are included.
56845681
56855682
If this value is nil, the behavior is equivalent to the Ignore policy.
5686-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
56875683
type: string
56885684
topologyKey:
56895685
description: |-
@@ -5797,7 +5793,8 @@ spec:
57975793
managedTypes:
57985794
description: Managed types.
57995795
items:
5800-
description: TypeInfo represents a Kubernetes type.
5796+
description: TypeVersionInfo represents a Kubernetes type
5797+
version.
58015798
properties:
58025799
group:
58035800
description: API group.

‎go.mod‎

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,67 @@
11
module github.com/sap/redis-operator
22

3-
go 1.24.0
3+
go 1.24.3
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.3.0
77
github.com/cert-manager/cert-manager v1.17.0
88
github.com/google/uuid v1.6.0
9-
github.com/onsi/ginkgo/v2 v2.22.2
10-
github.com/onsi/gomega v1.36.2
9+
github.com/onsi/ginkgo/v2 v2.23.4
10+
github.com/onsi/gomega v1.37.0
1111
github.com/pkg/errors v0.9.1
12-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.0
12+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.83.0
1313
github.com/redis/go-redis/v9 v9.7.0
14-
github.com/sap/admission-webhook-runtime v0.1.57
15-
github.com/sap/component-operator-runtime v0.3.69
16-
github.com/sap/go-generics v0.2.26
17-
golang.org/x/mod v0.23.0
18-
k8s.io/api v0.32.1
19-
k8s.io/apiextensions-apiserver v0.32.1
20-
k8s.io/apimachinery v0.32.1
21-
k8s.io/client-go v0.32.1
22-
k8s.io/code-generator v0.32.1
23-
k8s.io/kube-aggregator v0.32.1
24-
sigs.k8s.io/controller-runtime v0.20.1
14+
github.com/sap/admission-webhook-runtime v0.1.66
15+
github.com/sap/component-operator-runtime v0.3.101
16+
github.com/sap/go-generics v0.2.32
17+
golang.org/x/mod v0.24.0
18+
k8s.io/api v0.33.1
19+
k8s.io/apiextensions-apiserver v0.33.1
20+
k8s.io/apimachinery v0.33.1
21+
k8s.io/client-go v0.33.1
22+
k8s.io/code-generator v0.33.1
23+
k8s.io/kube-aggregator v0.33.1
24+
sigs.k8s.io/controller-runtime v0.21.0
2525
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250205173218-2e8ba92873fd
2626
sigs.k8s.io/controller-tools v0.17.1
2727
sigs.k8s.io/yaml v1.4.0
2828
)
2929

3030
require (
31-
dario.cat/mergo v1.0.1 // indirect
31+
dario.cat/mergo v1.0.2 // indirect
3232
github.com/Masterminds/goutils v1.1.1 // indirect
33-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
33+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
3434
github.com/beorn7/perks v1.0.1 // indirect
35+
github.com/blang/semver/v4 v4.0.0 // indirect
3536
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3637
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3738
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
38-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
39-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
39+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
40+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4041
github.com/fatih/color v1.18.0 // indirect
41-
github.com/fsnotify/fsnotify v1.8.0 // indirect
42-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
43-
github.com/go-logr/logr v1.4.2 // indirect
42+
github.com/fsnotify/fsnotify v1.9.0 // indirect
43+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
44+
github.com/go-logr/logr v1.4.3 // indirect
4445
github.com/go-logr/zapr v1.3.0 // indirect
45-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
46+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4647
github.com/go-openapi/jsonreference v0.21.0 // indirect
47-
github.com/go-openapi/swag v0.23.0 // indirect
48+
github.com/go-openapi/swag v0.23.1 // indirect
4849
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4950
github.com/gobuffalo/flect v1.0.3 // indirect
51+
github.com/gobwas/glob v0.2.3 // indirect
5052
github.com/gogo/protobuf v1.3.2 // indirect
51-
github.com/golang/protobuf v1.5.4 // indirect
5253
github.com/google/btree v1.1.3 // indirect
5354
github.com/google/gnostic-models v0.6.9 // indirect
54-
github.com/google/go-cmp v0.6.0 // indirect
55-
github.com/google/gofuzz v1.2.0 // indirect
56-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
57-
github.com/gorilla/websocket v1.5.3 // indirect
55+
github.com/google/go-cmp v0.7.0 // indirect
56+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
57+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5858
github.com/hashicorp/errwrap v1.1.0 // indirect
5959
github.com/hashicorp/go-multierror v1.1.1 // indirect
6060
github.com/huandu/xstrings v1.5.0 // indirect
6161
github.com/iancoleman/strcase v0.3.0 // indirect
6262
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6363
github.com/josharian/intern v1.0.0 // indirect
6464
github.com/json-iterator/go v1.1.12 // indirect
65-
github.com/klauspost/compress v1.17.11 // indirect
6665
github.com/mailru/easyjson v0.9.0 // indirect
6766
github.com/mattn/go-colorable v0.1.13 // indirect
6867
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -73,39 +72,42 @@ require (
7372
github.com/modern-go/reflect2 v1.0.2 // indirect
7473
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7574
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
76-
github.com/prometheus/client_golang v1.20.5 // indirect
77-
github.com/prometheus/client_model v0.6.1 // indirect
78-
github.com/prometheus/common v0.61.0 // indirect
79-
github.com/prometheus/procfs v0.15.1 // indirect
75+
github.com/prometheus/client_golang v1.22.0 // indirect
76+
github.com/prometheus/client_model v0.6.2 // indirect
77+
github.com/prometheus/common v0.64.0 // indirect
78+
github.com/prometheus/procfs v0.16.1 // indirect
8079
github.com/shopspring/decimal v1.4.0 // indirect
8180
github.com/spf13/afero v1.12.0 // indirect
82-
github.com/spf13/cast v1.7.1 // indirect
83-
github.com/spf13/cobra v1.8.1 // indirect
81+
github.com/spf13/cast v1.9.2 // indirect
82+
github.com/spf13/cobra v1.9.1 // indirect
8483
github.com/spf13/pflag v1.0.6 // indirect
8584
github.com/x448/float16 v0.8.4 // indirect
85+
go.uber.org/automaxprocs v1.6.0 // indirect
8686
go.uber.org/multierr v1.11.0 // indirect
8787
go.uber.org/zap v1.27.0 // indirect
88-
golang.org/x/crypto v0.32.0 // indirect
89-
golang.org/x/net v0.34.0 // indirect
90-
golang.org/x/oauth2 v0.25.0 // indirect
91-
golang.org/x/sync v0.10.0 // indirect
92-
golang.org/x/sys v0.29.0 // indirect
93-
golang.org/x/term v0.28.0 // indirect
94-
golang.org/x/text v0.21.0 // indirect
95-
golang.org/x/time v0.10.0 // indirect
96-
golang.org/x/tools v0.29.0 // indirect
97-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
98-
google.golang.org/protobuf v1.36.1 // indirect
88+
golang.org/x/crypto v0.38.0 // indirect
89+
golang.org/x/net v0.40.0 // indirect
90+
golang.org/x/oauth2 v0.30.0 // indirect
91+
golang.org/x/sync v0.14.0 // indirect
92+
golang.org/x/sys v0.33.0 // indirect
93+
golang.org/x/term v0.32.0 // indirect
94+
golang.org/x/text v0.25.0 // indirect
95+
golang.org/x/time v0.11.0 // indirect
96+
golang.org/x/tools v0.31.0 // indirect
97+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
98+
google.golang.org/protobuf v1.36.6 // indirect
9999
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
100100
gopkg.in/inf.v0 v0.9.1 // indirect
101101
gopkg.in/yaml.v2 v2.4.0 // indirect
102102
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
103+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
104104
k8s.io/klog/v2 v2.130.1 // indirect
105-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
106-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
105+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
106+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
107107
sigs.k8s.io/cli-utils v0.37.2 // indirect
108108
sigs.k8s.io/gateway-api v1.1.0 // indirect
109109
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
110-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
110+
sigs.k8s.io/randfill v1.0.0 // indirect
111+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
112+
sigs.k8s.io/structured-merge-diff/v6 v6.1.0 // indirect
111113
)

0 commit comments

Comments
 (0)