Skip to content

Commit e5030f3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#650 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 2a986f1 + 64287d3 commit e5030f3

File tree

127 files changed

+759
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+759
-423
lines changed

‎go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ require (
8787
github.com/fvbommel/sortorder v1.0.1 // indirect
8888
github.com/go-air/gini v1.0.4 // indirect
8989
github.com/go-errors/errors v1.4.2 // indirect
90-
github.com/go-git/gcfg v1.5.0 // indirect
91-
github.com/go-git/go-billy/v5 v5.1.0 // indirect
92-
github.com/go-git/go-git/v5 v5.3.0 // indirect
90+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
91+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
92+
github.com/go-git/go-git/v5 v5.11.0 // indirect
9393
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
9494
github.com/go-logr/stdr v1.2.2 // indirect
9595
github.com/go-logr/zapr v1.2.4 // indirect
@@ -211,18 +211,18 @@ require (
211211
go.uber.org/atomic v1.7.0 // indirect
212212
go.uber.org/multierr v1.6.0 // indirect
213213
go.uber.org/zap v1.24.0 // indirect
214-
golang.org/x/crypto v0.14.0 // indirect
214+
golang.org/x/crypto v0.16.0 // indirect
215215
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
216216
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
217217
golang.org/x/mod v0.12.0 // indirect
218-
golang.org/x/net v0.17.0 // indirect
218+
golang.org/x/net v0.19.0 // indirect
219219
golang.org/x/oauth2 v0.12.0 // indirect
220220
golang.org/x/sync v0.3.0 // indirect
221-
golang.org/x/sys v0.14.0 // indirect
222-
golang.org/x/term v0.13.0 // indirect
223-
golang.org/x/text v0.13.0 // indirect
221+
golang.org/x/sys v0.15.0 // indirect
222+
golang.org/x/term v0.15.0 // indirect
223+
golang.org/x/text v0.14.0 // indirect
224224
golang.org/x/time v0.3.0 // indirect
225-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
225+
golang.org/x/tools v0.13.0 // indirect
226226
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
227227
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
228228
google.golang.org/appengine v1.6.7 // indirect

‎go.sum

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,17 @@ github.com/go-bindata/go-bindata/v3 v3.1.3 h1:F0nVttLC3ws0ojc7p60veTurcOm//D4QBO
257257
github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I=
258258
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
259259
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
260-
github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
261260
github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
261+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
262+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
262263
github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
263-
github.com/go-git/go-billy/v5 v5.1.0 h1:4pl5BV4o7ZG/lterP4S6WzJ6xr49Ba5ET9ygheTYahk=
264264
github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
265+
github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
266+
github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
265267
github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
266-
github.com/go-git/go-git/v5 v5.3.0 h1:8WKMtJR2j8RntEXR/uvTKagfEt4GYlwQ7mntE4+0GWc=
267268
github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw=
269+
github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4=
270+
github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY=
268271
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
269272
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
270273
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -969,8 +972,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
969972
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
970973
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
971974
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
972-
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
973-
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
975+
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
976+
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
974977
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
975978
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
976979
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1064,8 +1067,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
10641067
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
10651068
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
10661069
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
1067-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
1068-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
1070+
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
1071+
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
10691072
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
10701073
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
10711074
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1171,14 +1174,14 @@ golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBc
11711174
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11721175
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11731176
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1174-
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
1175-
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1177+
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
1178+
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
11761179
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
11771180
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
11781181
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
11791182
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
1180-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
1181-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
1183+
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
1184+
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
11821185
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
11831186
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
11841187
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1191,8 +1194,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
11911194
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
11921195
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
11931196
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1194-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
1195-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
1197+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1198+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
11961199
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
11971200
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
11981201
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1259,8 +1262,8 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
12591262
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
12601263
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
12611264
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
1262-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E=
1263-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
1265+
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
1266+
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
12641267
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
12651268
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
12661269
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4441,6 +4441,7 @@ func fetchCSV(c versioned.Interface, namespace, name string, checker csvConditio
44414441
var lastPhase operatorsv1alpha1.ClusterServiceVersionPhase
44424442
var lastReason operatorsv1alpha1.ConditionReason
44434443
var lastMessage string
4444+
var lastError string
44444445
lastTime := time.Now()
44454446
var csv *operatorsv1alpha1.ClusterServiceVersion
44464447

@@ -4449,7 +4450,10 @@ func fetchCSV(c versioned.Interface, namespace, name string, checker csvConditio
44494450
var err error
44504451
csv, err = c.OperatorsV1alpha1().ClusterServiceVersions(namespace).Get(context.TODO(), name, metav1.GetOptions{})
44514452
if err != nil || csv == nil {
4452-
ctx.Ctx().Logf("error getting csv %s/%s: %v", namespace, name, err)
4453+
if lastError != err.Error() {
4454+
ctx.Ctx().Logf("error getting csv %s/%s: %v", namespace, name, err)
4455+
lastError = err.Error()
4456+
}
44534457
return false, nil
44544458
}
44554459
phase, reason, message := csv.Status.Phase, csv.Status.Reason, csv.Status.Message

‎staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2792,10 +2792,13 @@ var _ = Describe("Install Plan", func() {
27922792
_, err := fetchCatalogSourceOnStatus(crc, mainCatalogSourceName, generatedNamespace.GetName(), catalogSourceRegistryPodSynced())
27932793
require.NoError(GinkgoT(), err)
27942794

2795+
By("Creating a Subscription")
27952796
subscriptionName := genName("sub-nginx-")
2796-
subscriptionCleanup := createSubscriptionForCatalog(crc, generatedNamespace.GetName(), subscriptionName, mainCatalogSourceName, packageName, stableChannel, "", operatorsv1alpha1.ApprovalAutomatic)
2797-
defer subscriptionCleanup()
2797+
// Subscription is explitly deleted as part of the test to avoid CSV being recreated,
2798+
// so ignore cleanup function
2799+
_ = createSubscriptionForCatalog(crc, generatedNamespace.GetName(), subscriptionName, mainCatalogSourceName, packageName, stableChannel, "", operatorsv1alpha1.ApprovalAutomatic)
27982800

2801+
By("Attempt to get Subscription")
27992802
subscription, err := fetchSubscription(crc, generatedNamespace.GetName(), subscriptionName, subscriptionHasInstallPlanChecker())
28002803
require.NoError(GinkgoT(), err)
28012804
require.NotNil(GinkgoT(), subscription)
@@ -2867,22 +2870,38 @@ var _ = Describe("Install Plan", func() {
28672870
By("Should have removed every matching step")
28682871
require.Equal(GinkgoT(), 0, len(expectedSteps), "Actual resource steps do not match expected: %#v", expectedSteps)
28692872

2870-
GinkgoT().Logf("deleting csv %s/%s", generatedNamespace.GetName(), stableCSVName)
2871-
By("Explicitly delete the CSV")
2872-
err = crc.OperatorsV1alpha1().ClusterServiceVersions(generatedNamespace.GetName()).Delete(context.Background(), stableCSVName, metav1.DeleteOptions{})
2873+
By(fmt.Sprintf("Explicitly deleting subscription %s/%s", generatedNamespace.GetName(), subscriptionName))
2874+
err = crc.OperatorsV1alpha1().Subscriptions(generatedNamespace.GetName()).Delete(context.Background(), subscriptionName, metav1.DeleteOptions{})
28732875
By("Looking for no error OR IsNotFound error")
2874-
if err != nil && apierrors.IsNotFound(err) {
2875-
err = nil
2876-
}
2877-
require.NoError(GinkgoT(), err)
2876+
require.NoError(GinkgoT(), client.IgnoreNotFound(err))
2877+
2878+
By("Waiting for the Subscription to delete")
2879+
err = waitForSubscriptionToDelete(generatedNamespace.GetName(), subscriptionName, crc)
2880+
require.NoError(GinkgoT(), client.IgnoreNotFound(err))
28782881

2882+
By(fmt.Sprintf("Explicitly deleting csv %s/%s", generatedNamespace.GetName(), stableCSVName))
2883+
err = crc.OperatorsV1alpha1().ClusterServiceVersions(generatedNamespace.GetName()).Delete(context.Background(), stableCSVName, metav1.DeleteOptions{})
2884+
By("Looking for no error OR IsNotFound error")
2885+
require.NoError(GinkgoT(), client.IgnoreNotFound(err))
2886+
By("Waiting for the CSV to delete")
2887+
err = waitForCsvToDelete(generatedNamespace.GetName(), stableCSVName, crc)
2888+
require.NoError(GinkgoT(), client.IgnoreNotFound(err))
2889+
2890+
nCrs := 0
2891+
nCrbs := 0
2892+
By("Waiting for CRBs and CRs and SAs to delete")
28792893
Eventually(func() bool {
2894+
28802895
crbs, err := c.KubernetesInterface().RbacV1().ClusterRoleBindings().List(context.Background(), metav1.ListOptions{LabelSelector: fmt.Sprintf("%v=%v", ownerutil.OwnerKey, stableCSVName)})
28812896
if err != nil {
28822897
GinkgoT().Logf("error getting crbs: %v", err)
28832898
return false
28842899
}
2885-
if len(crbs.Items) != 0 {
2900+
if n := len(crbs.Items); n != 0 {
2901+
if n != nCrbs {
2902+
GinkgoT().Logf("CRBs remaining: %v", n)
2903+
nCrbs = n
2904+
}
28862905
return false
28872906
}
28882907

@@ -2891,18 +2910,23 @@ var _ = Describe("Install Plan", func() {
28912910
GinkgoT().Logf("error getting crs: %v", err)
28922911
return false
28932912
}
2894-
if len(crs.Items) != 0 {
2913+
if n := len(crs.Items); n != 0 {
2914+
if n != nCrs {
2915+
GinkgoT().Logf("CRs remaining: %v", n)
2916+
nCrs = n
2917+
}
28952918
return false
28962919
}
28972920

28982921
_, err = c.KubernetesInterface().CoreV1().ServiceAccounts(generatedNamespace.GetName()).Get(context.Background(), serviceAccountName, metav1.GetOptions{})
2899-
if err != nil && !apierrors.IsNotFound(err) {
2922+
if client.IgnoreNotFound(err) != nil {
29002923
GinkgoT().Logf("error getting sa %s/%s: %v", generatedNamespace.GetName(), serviceAccountName, err)
29012924
return false
29022925
}
29032926

29042927
return true
29052928
}, pollDuration*2, pollInterval).Should(BeTrue())
2929+
By("Cleaning up the test")
29062930
})
29072931

29082932
It("CRD validation", func() {

‎staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ var _ = Describe("Subscription", func() {
328328
subscriptionCleanup, _ := createSubscription(GinkgoT(), crc, generatedNamespace.GetName(), "manual-subscription", testPackageName, stableChannel, operatorsv1alpha1.ApprovalManual)
329329
defer subscriptionCleanup()
330330

331-
subscription, err := fetchSubscription(crc, generatedNamespace.GetName(), "manual-subscription", subscriptionStateUpgradePendingChecker())
331+
subscription, err := fetchSubscription(crc, generatedNamespace.GetName(), "manual-subscription", subscriptionHasCondition(operatorsv1alpha1.SubscriptionInstallPlanPending, corev1.ConditionTrue, string(operatorsv1alpha1.InstallPlanPhaseRequiresApproval), ""))
332332
require.NoError(GinkgoT(), err)
333333
require.NotNil(GinkgoT(), subscription)
334334

@@ -3365,6 +3365,35 @@ func createSubscriptionForCatalogWithSpec(t GinkgoTInterface, crc versioned.Inte
33653365
return buildSubscriptionCleanupFunc(crc, subscription)
33663366
}
33673367

3368+
func waitForSubscriptionToDelete(namespace, name string, c versioned.Interface) error {
3369+
var lastState operatorsv1alpha1.SubscriptionState
3370+
var lastReason operatorsv1alpha1.ConditionReason
3371+
lastTime := time.Now()
3372+
3373+
ctx.Ctx().Logf("waiting for subscription %s/%s to delete", namespace, name)
3374+
err := wait.Poll(pollInterval, pollDuration, func() (bool, error) {
3375+
sub, err := c.OperatorsV1alpha1().Subscriptions(namespace).Get(context.TODO(), name, metav1.GetOptions{})
3376+
if apierrors.IsNotFound(err) {
3377+
ctx.Ctx().Logf("subscription %s/%s deleted", namespace, name)
3378+
return true, nil
3379+
}
3380+
if err != nil {
3381+
ctx.Ctx().Logf("error getting subscription %s/%s: %v", namespace, name, err)
3382+
}
3383+
if sub != nil {
3384+
state, reason := sub.Status.State, sub.Status.Reason
3385+
if state != lastState || reason != lastReason {
3386+
ctx.Ctx().Logf("waited %s for subscription %s/%s status: %s (%s)", time.Since(lastTime), namespace, name, state, reason)
3387+
lastState, lastReason = state, reason
3388+
lastTime = time.Now()
3389+
}
3390+
}
3391+
return false, nil
3392+
})
3393+
3394+
return err
3395+
}
3396+
33683397
func checkDeploymentHasPodConfigNodeSelector(t GinkgoTInterface, client operatorclient.ClientInterface, csv *operatorsv1alpha1.ClusterServiceVersion, nodeSelector map[string]string) error {
33693398
resolver := install.StrategyResolver{}
33703399

‎staging/operator-lifecycle-manager/test/e2e/util.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,10 @@ func createInternalCatalogSource(
677677
ctx.Ctx().Logf("Catalog source %s created", name)
678678

679679
cleanupInternalCatalogSource := func() {
680+
ctx.Ctx().Logf("Cleaning catalog source %s", name)
680681
configMapCleanup()
681682
buildCatalogSourceCleanupFunc(c, crc, namespace, catalogSource)()
683+
ctx.Ctx().Logf("Done cleaning catalog source %s", name)
682684
}
683685
return catalogSource, cleanupInternalCatalogSource
684686
}

‎staging/operator-registry/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ require (
3131
github.com/stretchr/testify v1.8.4
3232
go.etcd.io/bbolt v1.3.7
3333
golang.org/x/mod v0.12.0
34-
golang.org/x/net v0.17.0
34+
golang.org/x/net v0.19.0
3535
golang.org/x/sync v0.3.0
36-
golang.org/x/sys v0.14.0
37-
golang.org/x/text v0.13.0
36+
golang.org/x/sys v0.15.0
37+
golang.org/x/text v0.14.0
3838
google.golang.org/grpc v1.59.0
3939
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
4040
google.golang.org/protobuf v1.31.0
@@ -86,9 +86,9 @@ require (
8686
github.com/felixge/httpsnoop v1.0.3 // indirect
8787
github.com/fsnotify/fsnotify v1.6.0 // indirect
8888
github.com/garyburd/redigo v1.6.0 // indirect
89-
github.com/go-git/gcfg v1.5.0 // indirect
90-
github.com/go-git/go-billy/v5 v5.1.0 // indirect
91-
github.com/go-git/go-git/v5 v5.3.0 // indirect
89+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
90+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
91+
github.com/go-git/go-git/v5 v5.11.0 // indirect
9292
github.com/go-logr/logr v1.3.0 // indirect
9393
github.com/go-logr/stdr v1.2.2 // indirect
9494
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -158,12 +158,12 @@ require (
158158
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
159159
go.opentelemetry.io/otel/trace v1.20.0 // indirect
160160
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
161-
golang.org/x/crypto v0.14.0 // indirect
161+
golang.org/x/crypto v0.16.0 // indirect
162162
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
163163
golang.org/x/oauth2 v0.12.0 // indirect
164-
golang.org/x/term v0.13.0 // indirect
164+
golang.org/x/term v0.15.0 // indirect
165165
golang.org/x/time v0.3.0 // indirect
166-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
166+
golang.org/x/tools v0.13.0 // indirect
167167
google.golang.org/appengine v1.6.7 // indirect
168168
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
169169
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect

0 commit comments

Comments
 (0)