Skip to content

Commit 99b2b78

Browse files
sivcharisivchari
committed
fix: golangci-lint
Signed-off-by: sivchari <[email protected]>
1 parent 7c1b967 commit 99b2b78

File tree

11 files changed

+85
-94
lines changed

11 files changed

+85
-94
lines changed

‎agent/main.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"crypto/sha256"
66
"encoding/base64"
77
"fmt"
8-
"github.com/argoproj/gitops-engine/pkg/utils/text"
98
"net/http"
109
"os"
1110
"os/exec"
@@ -15,11 +14,13 @@ import (
1514
"text/tabwriter"
1615
"time"
1716

17+
"github.com/argoproj/gitops-engine/pkg/utils/text"
18+
1819
"github.com/go-logr/logr"
1920
"github.com/spf13/cobra"
2021
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2122
"k8s.io/client-go/tools/clientcmd"
22-
"k8s.io/klog/v2/klogr"
23+
"k8s.io/klog/v2/textlogger"
2324

2425
"github.com/argoproj/gitops-engine/pkg/cache"
2526
"github.com/argoproj/gitops-engine/pkg/engine"
@@ -37,7 +38,7 @@ const (
3738
)
3839

3940
func main() {
40-
log := klogr.New() // Delegates to klog
41+
log := textlogger.NewLogger(textlogger.NewConfig())
4142
err := newCmd(log).Execute()
4243
checkError(err, log)
4344
}

‎go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/evanphx/json-patch v4.12.0+incompatible
88
github.com/go-logr/logr v1.3.0
99
github.com/golang/mock v1.6.0
10-
github.com/google/gnostic v0.5.7-v3refs
10+
github.com/google/gnostic-models v0.6.8
1111
github.com/spf13/cobra v1.7.0
1212
github.com/stretchr/testify v1.8.4
1313
golang.org/x/sync v0.5.0
@@ -21,7 +21,7 @@ require (
2121
k8s.io/kube-aggregator v0.29.2
2222
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
2323
k8s.io/kubectl v0.29.2
24-
k8s.io/kubernetes v1.29.1
24+
k8s.io/kubernetes v1.29.2
2525
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
2626
sigs.k8s.io/yaml v1.3.0
2727
)
@@ -45,7 +45,6 @@ require (
4545
github.com/gogo/protobuf v1.3.2 // indirect
4646
github.com/golang/protobuf v1.5.3 // indirect
4747
github.com/google/btree v1.0.1 // indirect
48-
github.com/google/gnostic-models v0.6.8 // indirect
4948
github.com/google/go-cmp v0.6.0 // indirect
5049
github.com/google/gofuzz v1.2.0 // indirect
5150
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect

‎go.sum

+2-14
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
2828
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2929
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
3030
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
31-
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
3231
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
3332
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
3433
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -69,13 +68,10 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
6968
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
7069
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
7170
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
72-
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
7371
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
7472
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
7573
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
7674
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
77-
github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
78-
github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
7975
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
8076
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
8177
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -114,7 +110,6 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
114110
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
115111
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
116112
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
117-
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
118113
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
119114
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
120115
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -176,13 +171,11 @@ github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
176171
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
177172
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
178173
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
179-
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
180174
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
181175
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
182176
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
183177
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
184178
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
185-
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
186179
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
187180
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
188181
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -275,7 +268,6 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
275268
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
276269
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
277270
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
278-
google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
279271
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
280272
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
281273
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
@@ -286,24 +278,20 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
286278
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
287279
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
288280
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
289-
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
290281
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
291282
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
292283
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
293284
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
294285
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
295286
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
296-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
297287
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
298288
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
299289
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
300290
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
301-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
302291
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
303292
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
304293
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
305294
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
306-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
307295
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
308296
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
309297
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -332,8 +320,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
332320
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
333321
k8s.io/kubectl v0.29.2 h1:uaDYaBhumvkwz0S2XHt36fK0v5IdNgL7HyUniwb2IUo=
334322
k8s.io/kubectl v0.29.2/go.mod h1:BhizuYBGcKaHWyq+G7txGw2fXg576QbPrrnQdQDZgqI=
335-
k8s.io/kubernetes v1.29.1 h1:fxJFVb8uqbYZDYHpwIsAndBQs360cQGb0xa1gYFh3fo=
336-
k8s.io/kubernetes v1.29.1/go.mod h1:xZPKU0yO0CBbLTnbd+XGyRmmtmaVuJykDb8gNCkeeUE=
323+
k8s.io/kubernetes v1.29.2 h1:8hh1cntqdulanjQt7wSSSsJfBgOyx6fUdFWslvGL5m0=
324+
k8s.io/kubernetes v1.29.2/go.mod h1:xZPKU0yO0CBbLTnbd+XGyRmmtmaVuJykDb8gNCkeeUE=
337325
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
338326
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
339327
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎pkg/cache/cluster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"k8s.io/client-go/tools/pager"
3232
watchutil "k8s.io/client-go/tools/watch"
3333
"k8s.io/client-go/util/retry"
34-
"k8s.io/klog/v2/klogr"
34+
"k8s.io/klog/v2/textlogger"
3535
"k8s.io/kubectl/pkg/util/openapi"
3636

3737
"github.com/argoproj/gitops-engine/pkg/utils/kube"
@@ -144,7 +144,7 @@ type ListRetryFunc func(err error) bool
144144

145145
// NewClusterCache creates new instance of cluster cache
146146
func NewClusterCache(config *rest.Config, opts ...UpdateSettingsFunc) *clusterCache {
147-
log := klogr.New()
147+
log := textlogger.NewLogger(textlogger.NewConfig())
148148
cache := &clusterCache{
149149
settings: Settings{ResourceHealthOverride: &noopSettings{}, ResourcesFilter: &noopSettings{}},
150150
apisMeta: make(map[schema.GroupKind]*apiMeta),

‎pkg/diff/diff_options.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/go-logr/logr"
77
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
88
"k8s.io/apimachinery/pkg/util/managedfields"
9-
"k8s.io/klog/v2/klogr"
9+
"k8s.io/klog/v2/textlogger"
1010
cmdutil "k8s.io/kubectl/pkg/cmd/util"
1111
)
1212

@@ -31,7 +31,7 @@ func applyOptions(opts []Option) options {
3131
ignoreAggregatedRoles: false,
3232
ignoreMutationWebhook: true,
3333
normalizer: GetNoopNormalizer(),
34-
log: klogr.New(),
34+
log: textlogger.NewLogger(textlogger.NewConfig()),
3535
}
3636
for _, opt := range opts {
3737
opt(&o)

‎pkg/diff/diff_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"k8s.io/apimachinery/pkg/runtime"
2727
"k8s.io/apimachinery/pkg/util/intstr"
2828
"k8s.io/apimachinery/pkg/util/managedfields"
29-
"k8s.io/klog/v2/klogr"
29+
"k8s.io/klog/v2/textlogger"
3030
openapiproto "k8s.io/kube-openapi/pkg/util/proto"
3131
"sigs.k8s.io/yaml"
3232
)
@@ -1203,7 +1203,7 @@ spec:
12031203

12041204
func diffOptionsForTest() []Option {
12051205
return []Option{
1206-
WithLogr(klogr.New()),
1206+
WithLogr(textlogger.NewLogger(textlogger.NewConfig())),
12071207
IgnoreAggregatedRoles(false),
12081208
}
12091209
}

‎pkg/engine/engine_options.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package engine
22

33
import (
44
"github.com/go-logr/logr"
5-
"k8s.io/klog/v2/klogr"
5+
"k8s.io/klog/v2/textlogger"
66

77
"github.com/argoproj/gitops-engine/pkg/utils/kube"
88
"github.com/argoproj/gitops-engine/pkg/utils/tracing"
@@ -16,7 +16,7 @@ type options struct {
1616
}
1717

1818
func applyOptions(opts []Option) options {
19-
log := klogr.New()
19+
log := textlogger.NewLogger(textlogger.NewConfig())
2020
o := options{
2121
log: log,
2222
kubectl: &kube.KubectlCmd{

‎pkg/sync/sync_context.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"k8s.io/client-go/dynamic"
2323
"k8s.io/client-go/rest"
2424
"k8s.io/client-go/util/retry"
25-
"k8s.io/klog/v2/klogr"
25+
"k8s.io/klog/v2/textlogger"
2626
cmdutil "k8s.io/kubectl/pkg/cmd/util"
2727
"k8s.io/kubectl/pkg/util/openapi"
2828

@@ -233,7 +233,7 @@ func NewSyncContext(
233233
kubectl: kubectl,
234234
resourceOps: resourceOps,
235235
namespace: namespace,
236-
log: klogr.New(),
236+
log: textlogger.NewLogger(textlogger.NewConfig()),
237237
validate: true,
238238
startedAt: time.Now(),
239239
syncRes: map[string]common.ResourceSyncResult{},
@@ -459,8 +459,8 @@ func (sc *syncContext) Sync() {
459459
// if pruned tasks pending deletion, then wait...
460460
prunedTasksPendingDelete := tasks.Filter(func(t *syncTask) bool {
461461
if t.pruned() && t.liveObj != nil {
462-
return t.liveObj.GetDeletionTimestamp() != nil
463-
}
462+
return t.liveObj.GetDeletionTimestamp() != nil
463+
}
464464
return false
465465
})
466466
if prunedTasksPendingDelete.Len() > 0 {
@@ -761,31 +761,31 @@ func (sc *syncContext) getSyncTasks() (_ syncTasks, successful bool) {
761761
// for prune tasks, modify the waves for proper cleanup i.e reverse of sync wave (creation order)
762762
pruneTasks := make(map[int][]*syncTask)
763763
for _, task := range tasks {
764-
if task.isPrune() {
765-
pruneTasks[task.wave()] = append(pruneTasks[task.wave()], task)
766-
}
764+
if task.isPrune() {
765+
pruneTasks[task.wave()] = append(pruneTasks[task.wave()], task)
766+
}
767767
}
768-
768+
769769
var uniquePruneWaves []int
770770
for k := range pruneTasks {
771-
uniquePruneWaves = append(uniquePruneWaves, k)
771+
uniquePruneWaves = append(uniquePruneWaves, k)
772772
}
773773
sort.Ints(uniquePruneWaves)
774-
774+
775775
// reorder waves for pruning tasks using symmetric swap on prune waves
776776
n := len(uniquePruneWaves)
777777
for i := 0; i < n/2; i++ {
778-
// waves to swap
779-
startWave := uniquePruneWaves[i]
780-
endWave := uniquePruneWaves[n-1-i]
781-
782-
for _, task := range pruneTasks[startWave] {
778+
// waves to swap
779+
startWave := uniquePruneWaves[i]
780+
endWave := uniquePruneWaves[n-1-i]
781+
782+
for _, task := range pruneTasks[startWave] {
783783
task.waveOverride = &endWave
784-
}
785-
786-
for _, task := range pruneTasks[endWave] {
784+
}
785+
786+
for _, task := range pruneTasks[endWave] {
787787
task.waveOverride = &startWave
788-
}
788+
}
789789
}
790790

791791
// for pruneLast tasks, modify the wave to sync phase last wave of tasks + 1
@@ -926,7 +926,7 @@ func (sc *syncContext) setOperationPhase(phase common.OperationPhase, message st
926926

927927
// ensureCRDReady waits until specified CRD is ready (established condition is true).
928928
func (sc *syncContext) ensureCRDReady(name string) error {
929-
return wait.PollImmediate(time.Duration(100)*time.Millisecond, crdReadinessTimeout, func() (bool, error) {
929+
return wait.PollUntilContextTimeout(context.Background(), time.Duration(100)*time.Millisecond, crdReadinessTimeout, true, func(ctx context.Context) (bool, error) {
930930
crd, err := sc.extensionsclientset.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), name, metav1.GetOptions{})
931931
if err != nil {
932932
return false, err

0 commit comments

Comments
 (0)