Skip to content

Commit

Permalink
Merge pull request #4997 from turkenh/bump-runtime-on-release-1.14
Browse files Browse the repository at this point in the history
[release-1.14] Bump crossplane runtime to v1.14.2
  • Loading branch information
turkenh committed Nov 14, 2023
2 parents 98003b7 + d18ef77 commit d12f043
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -8,7 +8,7 @@ require (
github.com/Masterminds/semver v1.5.0
github.com/alecthomas/kong v0.8.1
github.com/bufbuild/buf v1.27.1
github.com/crossplane/crossplane-runtime v1.14.0
github.com/crossplane/crossplane-runtime v1.14.2
github.com/docker/docker v24.0.6+incompatible
github.com/docker/go-connections v0.4.0
github.com/emicklei/dot v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -158,8 +158,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0q
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
github.com/crossplane/crossplane-runtime v1.14.0 h1:MFo93iOJLvYaMCaCoyH2vFWsHebdA1kv3QdOm7hcm5k=
github.com/crossplane/crossplane-runtime v1.14.0/go.mod h1:aOP+5W2wKpvthVs3pFNbVOe1jwrKYbJho0ThGNCVz9o=
github.com/crossplane/crossplane-runtime v1.14.2 h1:pV5JMzyzi/kcbeVBVPCat5MHH8zS94MBUapAyGx/Ry0=
github.com/crossplane/crossplane-runtime v1.14.2/go.mod h1:aOP+5W2wKpvthVs3pFNbVOe1jwrKYbJho0ThGNCVz9o=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/apiextensions/claim/reconciler_test.go
Expand Up @@ -757,7 +757,7 @@ func TestReconcile(t *testing.T) {
var customStatusUpdate test.MockSubResourceUpdateFn
mockGet := func(ctx context.Context, key client.ObjectKey, obj client.Object) error {
if o, ok := obj.(*claim.Unstructured); ok {
tc.args.claim.DeepCopyInto(&o.Unstructured)
tc.args.claim.Unstructured.DeepCopyInto(&o.Unstructured)
return nil
}
if customGet != nil {
Expand All @@ -768,7 +768,7 @@ func TestReconcile(t *testing.T) {

mockStatusUpdate := func(ctx context.Context, obj client.Object, opts ...client.SubResourceUpdateOption) error {
if o, ok := obj.(*claim.Unstructured); ok {
o.DeepCopyInto(&tc.args.claim.Unstructured)
o.Unstructured.DeepCopyInto(&tc.args.claim.Unstructured)
}
if customStatusUpdate != nil {
return customStatusUpdate(ctx, obj, opts...)
Expand Down
Expand Up @@ -1011,14 +1011,14 @@ func TestEnqueueForCompositionRevisionFunc(t *testing.T) {
obj1.SetCompositionUpdatePolicy(&automatic)
obj1.SetCompositionReference(&corev1.ObjectReference{Name: "dachshund"})

obj2 := composite.Unstructured{Unstructured: *obj1.DeepCopy()}
obj2 := composite.Unstructured{Unstructured: *obj1.Unstructured.DeepCopy()}
obj2.SetName("obj2")

obj3 := composite.Unstructured{Unstructured: *obj1.DeepCopy()}
obj3 := composite.Unstructured{Unstructured: *obj1.Unstructured.DeepCopy()}
obj3.SetName("obj3")
obj3.SetCompositionReference(&corev1.ObjectReference{Name: "bernese"})

obj4 := composite.Unstructured{Unstructured: *obj1.DeepCopy()}
obj4 := composite.Unstructured{Unstructured: *obj1.Unstructured.DeepCopy()}
obj4.SetName("obj4")
manual := xpv1.UpdateManual
obj4.SetCompositionUpdatePolicy(&manual)
Expand Down

0 comments on commit d12f043

Please sign in to comment.