Skip to content

Commit 2b5bcd3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #726 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 4e858f8 + d2f3816 commit 2b5bcd3

47 files changed

Lines changed: 1465 additions & 1329 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ cover.out
2626
/install.sh
2727
/install-experimental.sh
2828

29+
# upgrade-e2e artifacts
30+
/experimental-install.sh
31+
/operator-controller-standard.yaml
32+
/standard-install.sh
33+
2934
# vendored files
3035
vendor/
3136

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,11 @@ e2e: E2E_TIMEOUT ?= 20m
259259
e2e: GODOG_ARGS ?=
260260
e2e: #EXHELP Run the e2e tests.
261261
ifeq ($(strip $(GODOG_ARGS)),)
262+
trap 'exit 130' INT; \
262263
set +e; \
263-
go test -count=1 -v ./test/e2e/features_test.go -timeout=${E2E_TIMEOUT} -args --godog.tags="~@Serial" --godog.concurrency=100; \
264+
go test -count=1 -v ./test/e2e/features_test.go -timeout $(E2E_TIMEOUT) -args --godog.tags="~@Serial" --godog.concurrency=100; \
264265
parallelExit=$$?; \
265-
go test -count=1 -v ./test/e2e/features_test.go -timeout=${E2E_TIMEOUT} -args --godog.tags="@Serial" --godog.concurrency=1; \
266+
go test -count=1 -v ./test/e2e/features_test.go -timeout $(E2E_TIMEOUT) -args --godog.tags="@Serial" --godog.concurrency=1; \
266267
serialExit=$$?; \
267268
if [[ $$parallelExit -ne 0 ]] || [[ $$serialExit -ne 0 ]]; then \
268269
echo "e2e tests failed: parallel=$$parallelExit serial=$$serialExit"; \

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ go 1.25.7
44

55
require (
66
github.com/BurntSushi/toml v1.6.0
7-
github.com/Masterminds/semver/v3 v3.4.0
7+
github.com/Masterminds/semver/v3 v3.5.0
88
github.com/blang/semver/v4 v4.0.0
99
github.com/cert-manager/cert-manager v1.20.2
1010
github.com/containerd/containerd v1.7.31
1111
github.com/cucumber/godog v0.15.1
1212
github.com/evanphx/json-patch v5.9.11+incompatible
13-
github.com/fsnotify/fsnotify v1.9.0
13+
github.com/fsnotify/fsnotify v1.10.1
1414
github.com/go-logr/logr v1.4.3
1515
github.com/golang-jwt/jwt/v5 v5.3.1
1616
github.com/google/go-cmp v0.7.0
1717
github.com/google/go-containerregistry v0.21.5
1818
github.com/google/renameio/v2 v2.0.2
1919
github.com/gorilla/handlers v1.5.2
20-
github.com/klauspost/compress v1.18.5
20+
github.com/klauspost/compress v1.18.6
2121
github.com/opencontainers/go-digest v1.0.0
2222
github.com/opencontainers/image-spec v1.1.1
2323
github.com/operator-framework/api v0.42.0

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
1818
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
1919
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
2020
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
21-
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
22-
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
21+
github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
22+
github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
2323
github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
2424
github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
2525
github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
@@ -151,8 +151,8 @@ github.com/foxcpp/go-mockdns v1.2.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld
151151
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
152152
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
153153
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
154-
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
155-
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
154+
github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
155+
github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
156156
github.com/fxamacker/cbor/v2 v2.9.1 h1:2rWm8B193Ll4VdjsJY28jxs70IdDsHRWgQYAI80+rMQ=
157157
github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
158158
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
@@ -328,8 +328,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
328328
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
329329
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
330330
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
331-
github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
332-
github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
331+
github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
332+
github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
333333
github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
334334
github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
335335
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=

‎internal/operator-controller/resolve/catalog_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestInvalidClusterExtensionVersionRange(t *testing.T) {
2727
pkgName := randPkg()
2828
ce := buildFooClusterExtension(pkgName, []string{}, "foobar", ocv1.UpgradeConstraintPolicyCatalogProvided)
2929
_, _, _, err := r.Resolve(context.Background(), ce, nil)
30-
assert.EqualError(t, err, `desired version range "foobar" is invalid: improper constraint: foobar`)
30+
assert.EqualError(t, err, `desired version range "foobar" is invalid: improper constraint: "foobar"`)
3131
}
3232

3333
func TestErrorWalkingCatalogs(t *testing.T) {

‎openshift/tests-extension/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
9898
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
9999
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
100100
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
101-
github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
102-
github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
101+
github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
102+
github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
103103
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
104104
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
105105
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

‎test/e2e/features/install.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ Feature: Install ClusterExtension
564564
Then ClusterExtension is rolled out
565565
And ClusterExtension is available
566566
And ClusterObjectSet "${NAME}-1" phase objects are managed in Kubernetes secrets
567-
And ClusterObjectSet "${NAME}-1" referred secrets exist in "olmv1-system" namespace
567+
And ClusterObjectSet "${NAME}-1" referred secrets exist in "${OLM_NAMESPACE}" namespace
568568
And ClusterObjectSet "${NAME}-1" referred secrets are immutable
569569
And ClusterObjectSet "${NAME}-1" referred secrets contain labels
570570
| key | value |

‎test/e2e/features/proxy.feature‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ Feature: HTTPS proxy support for outbound catalog requests
77

88
Background:
99
Given OLM is available
10-
And ClusterCatalog "test" serves bundles
10+
And a catalog "test" with packages:
11+
| package | version | channel | replaces | contents |
12+
| test | 1.2.0 | beta | | CRD, Deployment, ConfigMap |
1113
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
1214

1315
@HTTPProxy
@@ -26,10 +28,10 @@ Feature: HTTPS proxy support for outbound catalog requests
2628
source:
2729
sourceType: Catalog
2830
catalog:
29-
packageName: test
31+
packageName: ${PACKAGE:test}
3032
selector:
3133
matchLabels:
32-
"olm.operatorframework.io/metadata.name": test-catalog
34+
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
3335
"""
3436
Then ClusterExtension reports Progressing as True with Reason Retrying and Message includes:
3537
"""
@@ -57,9 +59,9 @@ Feature: HTTPS proxy support for outbound catalog requests
5759
source:
5860
sourceType: Catalog
5961
catalog:
60-
packageName: test
62+
packageName: ${PACKAGE:test}
6163
selector:
6264
matchLabels:
63-
"olm.operatorframework.io/metadata.name": test-catalog
65+
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
6466
"""
6567
Then the recording proxy received a CONNECT request for the catalogd service

‎test/e2e/features/recover.feature‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ Feature: Recover cluster extension from errors that might occur during its lifet
8585
name: busybox
8686
securityContext:
8787
runAsNonRoot: true
88-
runAsUser: 1000
8988
allowPrivilegeEscalation: false
9089
capabilities:
9190
drop:

‎test/e2e/features/revision.feature‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ Feature: Install ClusterObjectSet
309309
imagePullPolicy: IfNotPresent
310310
name: busybox
311311
securityContext:
312-
runAsNonRoot: true
313-
runAsUser: 1000
314312
allowPrivilegeEscalation: false
315313
capabilities:
316314
drop:
@@ -397,8 +395,6 @@ Feature: Install ClusterObjectSet
397395
"command": ["httpd"],
398396
"args": ["-f", "-p", "8080"],
399397
"securityContext": {
400-
"runAsNonRoot": true,
401-
"runAsUser": 1000,
402398
"allowPrivilegeEscalation": false,
403399
"capabilities": {
404400
"drop": ["ALL"]
@@ -729,8 +725,6 @@ Feature: Install ClusterObjectSet
729725
command: ["true"]
730726
initialDelaySeconds: 65
731727
securityContext:
732-
runAsNonRoot: true
733-
runAsUser: 1000
734728
allowPrivilegeEscalation: false
735729
capabilities:
736730
drop:

0 commit comments

Comments
 (0)