Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history 
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
@tamalsaha
tamalsaha committed Aug 16, 2023
1 parent 4e850a2 commit 907f725
Show file tree
Hide file tree
Showing 51 changed files with 3,230 additions and 527 deletions.
11 changes: 8 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85
kmodules.xyz/client-go v0.25.23
kmodules.xyz/client-go v0.25.30-0.20230816023640-cf58432a4653
kmodules.xyz/go-containerregistry v0.0.11
kubedb.dev/apimachinery v0.32.0
sigs.k8s.io/controller-runtime v0.13.1
Expand Down Expand Up @@ -179,7 +179,8 @@ require (
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
gomodules.xyz/encoding v0.0.7 // indirect
gomodules.xyz/flags v0.1.3 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
gomodules.xyz/jsonpath v0.0.2 // indirect
gomodules.xyz/mergo v0.3.13 // indirect
gomodules.xyz/pointer v0.1.0 // indirect
gomodules.xyz/sync v0.1.0 // indirect
Expand Down Expand Up @@ -208,9 +209,13 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8

replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.13.1-0.20230725210630-f8273f9c4412

replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6

replace k8s.io/apiserver => github.com/kmodules/apiserver v0.25.2-0.20220917044909-4ac5fceca518
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.25.2-0.20230712090038-ce87ebac4a3d

replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.26.0-alpha.0.0.20220917022409-54ac9f3f1315

Expand Down
26 changes: 12 additions & 14 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJ
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=
github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
Expand Down Expand Up @@ -789,6 +787,8 @@ github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAO
github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A=
github.com/golangplus/fmt v1.0.0/go.mod h1:zpM0OfbMCjPtd2qkTD/jX2MgiFCqklhSUFyDW44gVQE=
github.com/golangplus/testing v1.0.0/go.mod h1:ZDreixUV3YzhoVraIDyOzHrr76p6NUh6k/pPg/Q3gYA=
github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8 h1:rWzwdmHqkXrISyacSZcK9oLZIu5nIxesPwp9f8LpTvc=
github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8/go.mod h1:70huEoC6heWUvVNiFAnIRaEmvzAECK551RuYBCkT13w=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
Expand Down Expand Up @@ -967,7 +967,6 @@ github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7U
github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME=
github.com/hetznercloud/hcloud-go v1.35.0/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
Expand Down Expand Up @@ -1070,8 +1069,10 @@ github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
github.com/kmodules/apiserver v0.25.2-0.20220917044909-4ac5fceca518 h1:uYw2fRagdWLdOOP7VGjHO2z/iTfM3mz+LEgDLgMJkeQ=
github.com/kmodules/apiserver v0.25.2-0.20220917044909-4ac5fceca518/go.mod h1:IB1EhM28U3cCrV+VNC06p1/YSZMCNYiH+P5sI5yLaZY=
github.com/kmodules/apiserver v0.25.2-0.20230712090038-ce87ebac4a3d h1:uTjbIzCRR94MPtzbhoRXG+1xUSI1DzoLKm+SRPMfOdA=
github.com/kmodules/apiserver v0.25.2-0.20230712090038-ce87ebac4a3d/go.mod h1:IB1EhM28U3cCrV+VNC06p1/YSZMCNYiH+P5sI5yLaZY=
github.com/kmodules/controller-runtime v0.13.1-0.20230725210630-f8273f9c4412 h1:sy5gE/M+SfQdIK9wh1VIT0RhXxiVlPRQxpGy2TVvnzE=
github.com/kmodules/controller-runtime v0.13.1-0.20230725210630-f8273f9c4412/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
github.com/kmodules/kubernetes v1.26.0-alpha.0.0.20220917022409-54ac9f3f1315/go.mod h1:0mG7e9c0E0rgZHPqtiezb+3/tZW+ixtNWpNo0n9XOaw=
github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Expand Down Expand Up @@ -1161,7 +1162,6 @@ github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
Expand All @@ -1180,7 +1180,6 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/moby/ipvs v1.0.1/go.mod h1:2pngiyseZbIKXNv7hsKj3O9UEz30c53MT9005gt2hxQ=
Expand Down Expand Up @@ -1700,7 +1699,6 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
Expand Down Expand Up @@ -2177,8 +2175,10 @@ gomodules.xyz/flags v0.1.3 h1:jQ06+EfmoMv5NvjXvJon03dOhLU+FF0TQMWN7I6qpzs=
gomodules.xyz/flags v0.1.3/go.mod h1:e+kvBLnqdEWGG670SKOYag1CXStM2Slrxq01OIK3tFs=
gomodules.xyz/go-sh v0.1.0 h1:1BJAuGREh2RhePt7HRrpmjnkbgfpXlCzc42SiyZ5dkc=
gomodules.xyz/go-sh v0.1.0/go.mod h1:N8IrjNiYppUI/rxENYrWD6FOrSxSyEZnIekPEWM7LP0=
gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gomodules.xyz/jsonpath v0.0.2 h1:taUvqxKQ9KqVl3vq/+hLg7rCZUIQjq+izhbvo6nTIkE=
gomodules.xyz/jsonpath v0.0.2/go.mod h1:du28vmLHrgEV48JqK/7rn92YHsVDoQuqrowb2w6YZmE=
gomodules.xyz/logs v0.0.6 h1:8+9Wkud5yBPtIvkVszubyTeFxNII30lWODom0+GZD8U=
gomodules.xyz/logs v0.0.6/go.mod h1:Q+fFtZFLEB5q86KmDehXCGuMP72Rv+Rwz0KuVxK+Gi4=
gomodules.xyz/mergo v0.3.13 h1:q6cL/MMXZH/MrR2+yjSihFFq6UifXqjwaqI48B6cMEM=
Expand Down Expand Up @@ -2588,8 +2588,8 @@ k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85 h1:cTdVh7LYu82xeClmfzGtgyspNh6Ux
k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
kmodules.xyz/client-go v0.25.23 h1:qz5XJYHLVZUowqfRXEJD7JQ4iaLLzQ1O1zPMmsdrkJw=
kmodules.xyz/client-go v0.25.23/go.mod h1:wbdzLEoDYiCPI6dTW0mIAGNwkwFV4lC5BN1FJxiDsbw=
kmodules.xyz/client-go v0.25.30-0.20230816023640-cf58432a4653 h1:EV+jQ/PhMJ5TF/B7KyKGx++F3bnULSuxk95MMYu149o=
kmodules.xyz/client-go v0.25.30-0.20230816023640-cf58432a4653/go.mod h1:r/Va2Y6t1G8X1sPRjrQC6FWB3oh/i6rjssmlfJnbCmg=
kmodules.xyz/custom-resources v0.25.1 h1:0qHPTxbT/q0afl2GCOnwPFaoxKziRIPXgVu77YwrCa4=
kmodules.xyz/custom-resources v0.25.1/go.mod h1:ULwzvLmOqZJcPSXKI7iLclYL5eYRlKx8Nbex28Ht19E=
kmodules.xyz/go-containerregistry v0.0.11 h1:eZ7dz5QvszqoedOQLyqf5lkDa+S3Bds4EHHhb6jrLMc=
Expand Down Expand Up @@ -2617,8 +2617,6 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0g
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0=
sigs.k8s.io/cli-utils v0.33.0 h1:/ioqfYu0hVeR2T2SDH3WVPgpqiJkrzqjJFrQ3u+baHk=
sigs.k8s.io/cli-utils v0.33.0/go.mod h1:g/zB9hJ5eUN7zIEBIxrO0CwhXU4YISJ+BkLJzvWwlEs=
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/scanreport/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (r *ImageScanReportReconciler) Reconcile(ctx context.Context, req ctrl.Requ
status.Phase = api.ImageScanReportPhaseCurrent
}

_, _, err = cu.PatchStatus(ctx, r.Client, &isrp, func(obj client.Object) client.Object {
_, err = cu.PatchStatus(ctx, r.Client, &isrp, func(obj client.Object) client.Object {
in := obj.(*api.ImageScanReport)
in.Status = *status
return in
Expand Down
14 changes: 8 additions & 6 deletions pkg/controllers/scanrequest/copy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (r *RequestReconciler) copySecrets(secrets []corev1.LocalObjectReference) (
return nil, err
}

newSec, _, err := cu.CreateOrPatch(r.ctx, r.Client, &corev1.Secret{
newSec := &corev1.Secret{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
Kind: "Secret",
Expand All @@ -79,7 +79,8 @@ func (r *RequestReconciler) copySecrets(secrets []corev1.LocalObjectReference) (
GenerateName: "pull-secret-",
Namespace: r.workspace,
},
}, func(obj client.Object, createOp bool) client.Object {
}
_, err = cu.CreateOrPatch(r.ctx, r.Client, newSec, func(obj client.Object, createOp bool) client.Object {
s := obj.(*corev1.Secret)
if createOp {
s.Immutable = sec.Immutable
Expand All @@ -98,7 +99,7 @@ func (r *RequestReconciler) copySecrets(secrets []corev1.LocalObjectReference) (
}

func (r *RequestReconciler) copyServiceAccount(saPullSecrets []corev1.LocalObjectReference, sa corev1.ServiceAccount) (string, error) {
newSA, _, err := cu.CreateOrPatch(r.ctx, r.Client, &corev1.ServiceAccount{
newSA := &corev1.ServiceAccount{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
Kind: "ServiceAccount",
Expand All @@ -107,7 +108,8 @@ func (r *RequestReconciler) copyServiceAccount(saPullSecrets []corev1.LocalObjec
GenerateName: "sa-",
Namespace: r.workspace,
},
}, func(obj client.Object, createOp bool) client.Object {
}
_, err := cu.CreateOrPatch(r.ctx, r.Client, newSA, func(obj client.Object, createOp bool) client.Object {
s := obj.(*corev1.ServiceAccount)
if createOp {
s.Secrets = sa.Secrets
Expand All @@ -124,7 +126,7 @@ func (r *RequestReconciler) copyServiceAccount(saPullSecrets []corev1.LocalObjec

func (r *RequestReconciler) setOwnerRefToCopiedObjects(job *batch.Job, sa string, pullSecrets []corev1.LocalObjectReference) error {
for i := range pullSecrets {
_, _, err := cu.CreateOrPatch(r.ctx, r.Client, &corev1.Secret{
_, err := cu.CreateOrPatch(r.ctx, r.Client, &corev1.Secret{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
Kind: "Secret",
Expand All @@ -145,7 +147,7 @@ func (r *RequestReconciler) setOwnerRefToCopiedObjects(job *batch.Job, sa string
if sa == "" {
return nil
}
_, _, err := cu.CreateOrPatch(r.ctx, r.Client, &corev1.ServiceAccount{
_, err := cu.CreateOrPatch(r.ctx, r.Client, &corev1.ServiceAccount{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
Kind: "ServiceAccount",
Expand Down
11 changes: 6 additions & 5 deletions pkg/controllers/scanrequest/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ func EnsureScanReport(kc client.Client, imageRef string, resp trivy.BackendRespo
return nil, err
}

obj, vt, err := cu.CreateOrPatch(context.TODO(), kc, &api.ImageScanReport{
obj := &api.ImageScanReport{
ObjectMeta: metav1.ObjectMeta{
Name: api.GetReportName(img.Name),
},
}, func(obj client.Object, createOp bool) client.Object {
}
vt, err := cu.CreateOrPatch(context.TODO(), kc, obj, func(obj client.Object, createOp bool) client.Object {
rep := obj.(*api.ImageScanReport)
rep.Spec.Image = api.ImageReference{
Name: resp.ImageDetails.Name,
Expand All @@ -56,7 +57,7 @@ func EnsureScanReport(kc client.Client, imageRef string, resp trivy.BackendRespo
klog.Infof("%v ImageScanReport has been created\n", obj.GetName())
}

_, _, err = cu.PatchStatus(context.TODO(), kc, &api.ImageScanReport{
_, err = cu.PatchStatus(context.TODO(), kc, &api.ImageScanReport{
ObjectMeta: metav1.ObjectMeta{
Name: api.GetReportName(img.Name),
},
Expand All @@ -75,7 +76,7 @@ func EnsureScanReport(kc client.Client, imageRef string, resp trivy.BackendRespo
return nil, err
}

return obj.(*api.ImageScanReport), nil
return obj, nil
}

func upsertCVEs(kc client.Client, r trivy.SingleReport) error {
Expand All @@ -88,7 +89,7 @@ func upsertCVEs(kc client.Client, r trivy.SingleReport) error {
}

for _, vul := range vuls {
_, vt, err := cu.CreateOrPatch(context.TODO(), kc, &api.Vulnerability{
vt, err := cu.CreateOrPatch(context.TODO(), kc, &api.Vulnerability{
ObjectMeta: metav1.ObjectMeta{
Name: vul.VulnerabilityID,
},
Expand Down
15 changes: 8 additions & 7 deletions pkg/controllers/scanrequest/private.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (r *RequestReconciler) ensureJob(sa string, pullSecrets []corev1.LocalObjec
}
}

obj, _, err := cu.CreateOrPatch(r.ctx, r.Client, &batch.Job{
obj := &batch.Job{
TypeMeta: metav1.TypeMeta{
Kind: "Job",
APIVersion: batch.SchemeGroupVersion.String(),
Expand All @@ -85,7 +85,8 @@ func (r *RequestReconciler) ensureJob(sa string, pullSecrets []corev1.LocalObjec
GenerateName: ScannerJobName,
Namespace: r.workspace,
},
}, func(obj client.Object, createOp bool) client.Object {
}
_, err := cu.CreateOrPatch(r.ctx, r.Client, obj, func(obj client.Object, createOp bool) client.Object {
job := obj.(*batch.Job)
if createOp {
job.Spec.Template.Spec.Volumes = core_util.UpsertVolume(job.Spec.Template.Spec.Volumes, core.Volume{
Expand Down Expand Up @@ -167,7 +168,7 @@ func (r *RequestReconciler) ensureJob(sa string, pullSecrets []corev1.LocalObjec
}

klog.Infof("Scanner job %v/%v created", obj.GetNamespace(), obj.GetName())
return obj.(*batch.Job), r.updateStatusWithJobName(obj.GetName())
return obj, r.updateStatusWithJobName(obj.GetName())
}

func (r *RequestReconciler) ScanForPrivateImage() error {
Expand Down Expand Up @@ -262,11 +263,12 @@ func (r *RequestReconciler) ensureDigestInRequestAndReport(digest string) error
return err
}

req, _, err := cu.PatchStatus(r.ctx, r.Client, &api.ImageScanRequest{
r.req = &api.ImageScanRequest{
ObjectMeta: metav1.ObjectMeta{
Name: r.req.Name,
},
}, func(obj client.Object) client.Object {
}
_, err = cu.PatchStatus(r.ctx, r.Client, r.req, func(obj client.Object) client.Object {
req := obj.(*api.ImageScanRequest)
if req.Status.Image == nil {
req.Status.Image = &trivy.ImageDetails{
Expand All @@ -282,9 +284,8 @@ func (r *RequestReconciler) ensureDigestInRequestAndReport(digest string) error
if err != nil {
return err
}
r.req = req.(*api.ImageScanRequest)

_, _, err = cu.CreateOrPatch(r.ctx, r.Client, &api.ImageScanReport{
_, err = cu.CreateOrPatch(r.ctx, r.Client, &api.ImageScanReport{
ObjectMeta: metav1.ObjectMeta{
Name: api.GetReportName(img.Name),
},
Expand Down
Loading

0 comments on commit 907f725

Please sign in to comment.