Skip to content

Commit a18d272

Browse files
odubajDTtoddbaert
andauthored
chore: bump k8s libs (#644)
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com> Co-authored-by: Todd Baert <toddbaert@gmail.com>
1 parent 4f0477c commit a18d272

13 files changed

+305
-1077
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ undeploy: generate ## Undeploy controller from the K8s cluster specified in ~/.k
174174
.PHONY: deploy-operator
175175
deploy-operator:
176176
kubectl create ns 'open-feature-operator-system' --dry-run=client -o yaml | kubectl apply -f -
177-
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.11.0/cert-manager.yaml
177+
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml
178178
kubectl wait --for=condition=Available=True deploy --all -n 'cert-manager' --timeout=$(WAIT_TIMEOUT_SECONDS)s
179179
make deploy
180180
kubectl wait --for=condition=Available=True deploy --all -n 'open-feature-operator-system' --timeout=$(WAIT_TIMEOUT_SECONDS)s

apis/core/v1beta1/featureflag_webhook.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
ctrl "sigs.k8s.io/controller-runtime"
3030
logf "sigs.k8s.io/controller-runtime/pkg/log"
3131
"sigs.k8s.io/controller-runtime/pkg/webhook"
32+
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
3233
)
3334

3435
// log is for logging in this package.
@@ -47,32 +48,32 @@ func (ff *FeatureFlag) SetupWebhookWithManager(mgr ctrl.Manager) error {
4748
var _ webhook.Validator = &FeatureFlag{}
4849

4950
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
50-
func (ff *FeatureFlag) ValidateCreate() error {
51+
func (ff *FeatureFlag) ValidateCreate() (admission.Warnings, error) {
5152
featureFlagLog.Info("validate create", "name", ff.Name)
5253

5354
if err := validateFeatureFlagFlags(ff.Spec.FlagSpec.Flags); err != nil {
54-
return err
55+
return []string{}, err
5556
}
5657

57-
return nil
58+
return []string{}, nil
5859
}
5960

6061
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
61-
func (ff *FeatureFlag) ValidateUpdate(old runtime.Object) error {
62+
func (ff *FeatureFlag) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
6263
featureFlagLog.Info("validate update", "name", ff.Name)
6364

6465
if err := validateFeatureFlagFlags(ff.Spec.FlagSpec.Flags); err != nil {
65-
return err
66+
return []string{}, err
6667
}
6768

68-
return nil
69+
return []string{}, nil
6970
}
7071

7172
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type
72-
func (ff *FeatureFlag) ValidateDelete() error {
73+
func (ff *FeatureFlag) ValidateDelete() (admission.Warnings, error) {
7374
featureFlagLog.Info("validate delete", "name", ff.Name)
7475

75-
return nil
76+
return []string{}, nil
7677
}
7778

7879
func validateFeatureFlagFlags(flags Flags) error {

apis/go.mod

+34-33
Original file line numberDiff line numberDiff line change
@@ -6,65 +6,66 @@ require (
66
github.com/open-feature/flagd-schemas v0.2.9-0.20240408192555-ea4f119d2bd7
77
github.com/stretchr/testify v1.8.4
88
github.com/xeipuuv/gojsonschema v1.2.0
9-
k8s.io/api v0.26.4
10-
k8s.io/apimachinery v0.26.4
11-
sigs.k8s.io/controller-runtime v0.14.6
9+
k8s.io/api v0.28.10
10+
k8s.io/apimachinery v0.28.10
11+
sigs.k8s.io/controller-runtime v0.16.6
1212
)
1313

1414
require (
1515
github.com/beorn7/perks v1.0.1 // indirect
16-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
16+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1717
github.com/davecgh/go-spew v1.1.1 // indirect
18-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
18+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
1919
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2020
github.com/fsnotify/fsnotify v1.6.0 // indirect
21-
github.com/go-logr/logr v1.2.3 // indirect
22-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
23-
github.com/go-openapi/jsonreference v0.20.0 // indirect
24-
github.com/go-openapi/swag v0.19.14 // indirect
21+
github.com/go-logr/logr v1.2.4 // indirect
22+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
23+
github.com/go-openapi/jsonreference v0.20.2 // indirect
24+
github.com/go-openapi/swag v0.22.3 // indirect
2525
github.com/gogo/protobuf v1.3.2 // indirect
2626
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
27-
github.com/golang/protobuf v1.5.2 // indirect
28-
github.com/google/gnostic v0.5.7-v3refs // indirect
27+
github.com/golang/protobuf v1.5.4 // indirect
28+
github.com/google/gnostic-models v0.6.8 // indirect
2929
github.com/google/go-cmp v0.5.9 // indirect
30-
github.com/google/gofuzz v1.1.0 // indirect
31-
github.com/google/uuid v1.1.2 // indirect
30+
github.com/google/gofuzz v1.2.0 // indirect
31+
github.com/google/uuid v1.3.0 // indirect
3232
github.com/imdario/mergo v0.3.6 // indirect
3333
github.com/josharian/intern v1.0.0 // indirect
3434
github.com/json-iterator/go v1.1.12 // indirect
35-
github.com/mailru/easyjson v0.7.6 // indirect
36-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
35+
github.com/mailru/easyjson v0.7.7 // indirect
36+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3737
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3838
github.com/modern-go/reflect2 v1.0.2 // indirect
3939
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4040
github.com/pkg/errors v0.9.1 // indirect
4141
github.com/pmezard/go-difflib v1.0.0 // indirect
42-
github.com/prometheus/client_golang v1.14.0 // indirect
43-
github.com/prometheus/client_model v0.3.0 // indirect
44-
github.com/prometheus/common v0.37.0 // indirect
45-
github.com/prometheus/procfs v0.8.0 // indirect
42+
github.com/prometheus/client_golang v1.16.0 // indirect
43+
github.com/prometheus/client_model v0.4.0 // indirect
44+
github.com/prometheus/common v0.44.0 // indirect
45+
github.com/prometheus/procfs v0.10.1 // indirect
4646
github.com/spf13/pflag v1.0.5 // indirect
4747
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
4848
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
49-
golang.org/x/net v0.7.0 // indirect
50-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
51-
golang.org/x/sys v0.5.0 // indirect
52-
golang.org/x/term v0.5.0 // indirect
53-
golang.org/x/text v0.7.0 // indirect
49+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
50+
golang.org/x/net v0.23.0 // indirect
51+
golang.org/x/oauth2 v0.8.0 // indirect
52+
golang.org/x/sys v0.18.0 // indirect
53+
golang.org/x/term v0.18.0 // indirect
54+
golang.org/x/text v0.14.0 // indirect
5455
golang.org/x/time v0.3.0 // indirect
55-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
56+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
5657
google.golang.org/appengine v1.6.7 // indirect
57-
google.golang.org/protobuf v1.28.1 // indirect
58+
google.golang.org/protobuf v1.33.0 // indirect
5859
gopkg.in/inf.v0 v0.9.1 // indirect
5960
gopkg.in/yaml.v2 v2.4.0 // indirect
6061
gopkg.in/yaml.v3 v3.0.1 // indirect
61-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
62-
k8s.io/client-go v0.26.1 // indirect
63-
k8s.io/component-base v0.26.1 // indirect
64-
k8s.io/klog/v2 v2.80.1 // indirect
65-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
66-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
67-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
62+
k8s.io/apiextensions-apiserver v0.28.9 // indirect
63+
k8s.io/client-go v0.28.9 // indirect
64+
k8s.io/component-base v0.28.9 // indirect
65+
k8s.io/klog/v2 v2.100.1 // indirect
66+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
67+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
68+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6869
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6970
sigs.k8s.io/yaml v1.3.0 // indirect
7071
)

0 commit comments

Comments
 (0)