Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Upgrade to latest dependencies #505

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
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ require (
k8s.io/apimachinery v0.28.5
k8s.io/client-go v0.28.5
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
knative.dev/eventing v0.40.1-0.20240130192152-02bde5498cb7
knative.dev/hack v0.0.0-20240123160146-ab9b69024c39
knative.dev/hack/schema v0.0.0-20240123160146-ab9b69024c39
knative.dev/pkg v0.0.0-20240129160226-b6659cc45066
knative.dev/reconciler-test v0.0.0-20240130133634-9a526085b198
knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2
knative.dev/hack v0.0.0-20240201013652-f3881d90c189
knative.dev/hack/schema v0.0.0-20240201013652-f3881d90c189
knative.dev/pkg v0.0.0-20240201013110-e85c3cf6d5f1
knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67
)

require github.com/stretchr/testify v1.8.4
Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -882,16 +882,16 @@ k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5Ohx
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.40.1-0.20240130192152-02bde5498cb7 h1:Jm5NBGr6pEVO94NiD6RlDDzJh7RrXZeYEwbGUIJ4ZLQ=
knative.dev/eventing v0.40.1-0.20240130192152-02bde5498cb7/go.mod h1:B3/ep06tqwcAfcH7R5eGKi7bgZTfqb59MPoqfV8Jirg=
knative.dev/hack v0.0.0-20240123160146-ab9b69024c39 h1:Or4ri7cAUQNEWwMPaGGaIe1hsPHGdVtr8lIaHh2JF7s=
knative.dev/hack v0.0.0-20240123160146-ab9b69024c39/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/hack/schema v0.0.0-20240123160146-ab9b69024c39 h1:Y6kMlgayMq0sXvc/7kg+cjLe/1/SnTVA9GNO2lH87nI=
knative.dev/hack/schema v0.0.0-20240123160146-ab9b69024c39/go.mod h1:3pWwBLnTZSM9psSgCAvhKOHIPTzqfEMlWRpDu6IYhK0=
knative.dev/pkg v0.0.0-20240129160226-b6659cc45066 h1:CZSdKszK3MTCuchbQK643y/nHLQs87ESuFQn011XsJ8=
knative.dev/pkg v0.0.0-20240129160226-b6659cc45066/go.mod h1:cGCJe6wkr0vQMAXTaUHi0XA/12JbxSTK15TnyBmn7ms=
knative.dev/reconciler-test v0.0.0-20240130133634-9a526085b198 h1:QaFXvqgPSA95CAuS71VTM/RHRkMIm4dSZLjRBvpSEzU=
knative.dev/reconciler-test v0.0.0-20240130133634-9a526085b198/go.mod h1:GYf5f0+DBK7736Y9VydjMkmkCqbWKIlRWN+SQ5tJ7A0=
knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2 h1:sTS/eCfl+75LEBj94vsn5vTeFommX4zR3/zlQ6J8lTY=
knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2/go.mod h1:B3/ep06tqwcAfcH7R5eGKi7bgZTfqb59MPoqfV8Jirg=
knative.dev/hack v0.0.0-20240201013652-f3881d90c189 h1:a8htyuf5+S0NGxxdKXeQ49XOD9dEC1LHoofRQPgFKrU=
knative.dev/hack v0.0.0-20240201013652-f3881d90c189/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/hack/schema v0.0.0-20240201013652-f3881d90c189 h1:HQp1cYW/ituWSZWkIBLtboASAL1+KAnpbLDVwdrhKyA=
knative.dev/hack/schema v0.0.0-20240201013652-f3881d90c189/go.mod h1:3pWwBLnTZSM9psSgCAvhKOHIPTzqfEMlWRpDu6IYhK0=
knative.dev/pkg v0.0.0-20240201013110-e85c3cf6d5f1 h1:xGmWQyA+hwyFT1BN5RWi8wx0DxwZQZni8SPN/FZ02kI=
knative.dev/pkg v0.0.0-20240201013110-e85c3cf6d5f1/go.mod h1:cGCJe6wkr0vQMAXTaUHi0XA/12JbxSTK15TnyBmn7ms=
knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67 h1:cgAtVlJJaWRBM5MzuN7ig++Z61FO5j2EoAqRBITSLRw=
knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67/go.mod h1:GYf5f0+DBK7736Y9VydjMkmkCqbWKIlRWN+SQ5tJ7A0=
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
16 changes: 8 additions & 8 deletions vendor/knative.dev/eventing/pkg/eventingtls/trust_bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func PropagateTrustBundles(ctx context.Context, k8s kubernetes.Interface, trustB
// Update owner references
expected.OwnerReferences = withOwnerReferences(obj, gvk, []metav1.OwnerReference{})

if err := createConfigMap(ctx, k8s, obj, expected); err != nil {
if err := createConfigMap(ctx, k8s, expected); err != nil {
return err
}
continue
Expand All @@ -132,7 +132,7 @@ func PropagateTrustBundles(ctx context.Context, k8s kubernetes.Interface, trustB
expected.OwnerReferences = withOwnerReferences(obj, gvk, p.userCm.OwnerReferences)

if !equality.Semantic.DeepDerivative(expected, p.userCm) {
if err := updateConfigMap(ctx, k8s, obj, expected); err != nil {
if err := updateConfigMap(ctx, k8s, expected); err != nil {
return err
}
}
Expand Down Expand Up @@ -269,18 +269,18 @@ func deleteConfigMap(ctx context.Context, k8s kubernetes.Interface, sb kmeta.Acc
return nil
}

func updateConfigMap(ctx context.Context, k8s kubernetes.Interface, sb kmeta.Accessor, expected *corev1.ConfigMap) error {
_, err := k8s.CoreV1().ConfigMaps(sb.GetNamespace()).Update(ctx, expected, metav1.UpdateOptions{})
func updateConfigMap(ctx context.Context, k8s kubernetes.Interface, expected *corev1.ConfigMap) error {
_, err := k8s.CoreV1().ConfigMaps(expected.Namespace).Update(ctx, expected, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("failed to update ConfigMap %s/%s: %w", sb.GetNamespace(), expected.Name, err)
return fmt.Errorf("failed to update ConfigMap %s/%s: %w", expected.Namespace, expected.Name, err)
}
return nil
}

func createConfigMap(ctx context.Context, k8s kubernetes.Interface, sb kmeta.Accessor, expected *corev1.ConfigMap) error {
_, err := k8s.CoreV1().ConfigMaps(sb.GetNamespace()).Create(ctx, expected, metav1.CreateOptions{})
func createConfigMap(ctx context.Context, k8s kubernetes.Interface, expected *corev1.ConfigMap) error {
_, err := k8s.CoreV1().ConfigMaps(expected.Namespace).Create(ctx, expected, metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("failed to create ConfigMap %s/%s: %w", sb.GetNamespace(), expected.Name, err)
return fmt.Errorf("failed to create ConfigMap %s/%s: %w", expected.Namespace, expected.Name, err)
}
return nil
}
10 changes: 5 additions & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/eventing v0.40.1-0.20240130192152-02bde5498cb7
# knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2
## explicit; go 1.21
knative.dev/eventing/pkg/apis
knative.dev/eventing/pkg/apis/config
Expand Down Expand Up @@ -1148,16 +1148,16 @@ knative.dev/eventing/test/test_images
knative.dev/eventing/test/test_images/event-sender
knative.dev/eventing/test/test_images/performance
knative.dev/eventing/test/test_images/print
# knative.dev/hack v0.0.0-20240123160146-ab9b69024c39
# knative.dev/hack v0.0.0-20240201013652-f3881d90c189
## explicit; go 1.18
knative.dev/hack
# knative.dev/hack/schema v0.0.0-20240123160146-ab9b69024c39
# knative.dev/hack/schema v0.0.0-20240201013652-f3881d90c189
## explicit; go 1.18
knative.dev/hack/schema/commands
knative.dev/hack/schema/docs
knative.dev/hack/schema/registry
knative.dev/hack/schema/schema
# knative.dev/pkg v0.0.0-20240129160226-b6659cc45066
# knative.dev/pkg v0.0.0-20240201013110-e85c3cf6d5f1
## explicit; go 1.18
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down Expand Up @@ -1244,7 +1244,7 @@ knative.dev/pkg/webhook/json
knative.dev/pkg/webhook/resourcesemantics
knative.dev/pkg/webhook/resourcesemantics/defaulting
knative.dev/pkg/webhook/resourcesemantics/validation
# knative.dev/reconciler-test v0.0.0-20240130133634-9a526085b198
# knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67
## explicit; go 1.21
knative.dev/reconciler-test/cmd/eventshub
knative.dev/reconciler-test/pkg/environment
Expand Down
Loading