Skip to content

Commit bd2d874

Browse files
authored
fix: undo the e2e use default bundle change, it should be like before checking against latest (#555)
Signed-off-by: Mike Ng <ming@redhat.com>
1 parent a50f648 commit bd2d874

165 files changed

Lines changed: 5534 additions & 2907 deletions

File tree

Some content is hidden

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

.github/workflows/tests.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,6 @@ jobs:
6464
with:
6565
go-version: ${{ env.GO_VERSION }}
6666
- name: E2E Tests
67-
run: make test-e2e
67+
run: |
68+
BUNDLE_VERSION=$([[ "${{ github.base_ref }}" == "main" ]] && echo latest || echo default) \
69+
make test-e2e

go.mod

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ require (
1010
github.com/gofrs/flock v0.13.0
1111
github.com/google/uuid v1.6.0
1212
github.com/jonboulle/clockwork v0.5.0
13-
github.com/onsi/ginkgo/v2 v2.28.2
14-
github.com/onsi/gomega v1.39.1
13+
github.com/onsi/ginkgo/v2 v2.29.0
14+
github.com/onsi/gomega v1.41.0
1515
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884
1616
github.com/pkg/errors v0.9.1
1717
github.com/spf13/cobra v1.10.2
1818
github.com/spf13/pflag v1.0.10
19-
google.golang.org/grpc v1.81.0
19+
google.golang.org/grpc v1.81.1
2020
gopkg.in/yaml.v2 v2.4.0
21-
helm.sh/helm/v3 v3.20.2
21+
helm.sh/helm/v3 v3.21.0
2222
k8s.io/api v0.35.4
2323
k8s.io/apiextensions-apiserver v0.35.4
2424
k8s.io/apimachinery v0.35.4
@@ -31,7 +31,7 @@ require (
3131
open-cluster-management.io/api v1.3.0
3232
open-cluster-management.io/cluster-proxy v0.7.0
3333
open-cluster-management.io/managed-serviceaccount v0.8.0
34-
open-cluster-management.io/ocm v1.3.1
34+
open-cluster-management.io/ocm v1.3.1-0.20260519091624-6ec234a49ffd
3535
open-cluster-management.io/sdk-go v1.3.0
3636
sigs.k8s.io/apiserver-network-proxy v0.29.0
3737
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2
@@ -92,7 +92,7 @@ require (
9292
github.com/google/btree v1.1.3 // indirect
9393
github.com/google/gnostic-models v0.7.1 // indirect
9494
github.com/google/go-cmp v0.7.0 // indirect
95-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
95+
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
9696
github.com/gosuri/uitable v0.0.4 // indirect
9797
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
9898
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -104,7 +104,7 @@ require (
104104
github.com/klauspost/compress v1.18.0 // indirect
105105
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
106106
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
107-
github.com/lib/pq v1.10.9 // indirect
107+
github.com/lib/pq v1.11.2 // indirect
108108
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
109109
github.com/mattn/go-colorable v0.1.13 // indirect
110110
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -126,8 +126,8 @@ require (
126126
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
127127
github.com/prometheus/client_golang v1.23.2 // indirect
128128
github.com/prometheus/client_model v0.6.2 // indirect
129-
github.com/prometheus/common v0.66.1 // indirect
130-
github.com/prometheus/procfs v0.16.1 // indirect
129+
github.com/prometheus/common v0.67.5 // indirect
130+
github.com/prometheus/procfs v0.20.1 // indirect
131131
github.com/rubenv/sql-migrate v1.8.1 // indirect
132132
github.com/russross/blackfriday/v2 v2.1.0 // indirect
133133
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
@@ -142,17 +142,17 @@ require (
142142
go.uber.org/zap v1.27.0 // indirect
143143
go.yaml.in/yaml/v2 v2.4.4 // indirect
144144
go.yaml.in/yaml/v3 v3.0.4 // indirect
145-
golang.org/x/crypto v0.49.0 // indirect
146-
golang.org/x/mod v0.33.0 // indirect
147-
golang.org/x/net v0.52.0 // indirect
145+
golang.org/x/crypto v0.50.0 // indirect
146+
golang.org/x/mod v0.35.0 // indirect
147+
golang.org/x/net v0.53.0 // indirect
148148
golang.org/x/oauth2 v0.36.0 // indirect
149149
golang.org/x/sync v0.20.0 // indirect
150-
golang.org/x/sys v0.42.0 // indirect
151-
golang.org/x/term v0.41.0 // indirect
152-
golang.org/x/text v0.35.0 // indirect
150+
golang.org/x/sys v0.43.0 // indirect
151+
golang.org/x/term v0.42.0 // indirect
152+
golang.org/x/text v0.36.0 // indirect
153153
golang.org/x/time v0.15.0 // indirect
154-
golang.org/x/tools v0.42.0 // indirect
155-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
154+
golang.org/x/tools v0.44.0 // indirect
155+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
156156
google.golang.org/protobuf v1.36.11 // indirect
157157
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
158158
gopkg.in/inf.v0 v0.9.1 // indirect

go.sum

Lines changed: 72 additions & 69 deletions
Large diffs are not rendered by default.

test/e2e/e2e-test.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export MANAGED_CLUSTER1_NAME := ${PROJECT_NAME}-e2e-test-c1
77
export HUB_CTX := kind-${HUB_NAME}
88
export MANAGED_CLUSTER1_CTX := kind-${MANAGED_CLUSTER1_NAME}
99

10-
BUNDLE_VERSION := default
10+
BUNDLE_VERSION?=latest
1111

1212
clean-e2e:
1313
kind delete cluster --name ${HUB_NAME}

vendor/github.com/lib/pq/.gitattributes

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lib/pq/CHANGELOG.md

Lines changed: 157 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lib/pq/LICENSE

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/lib/pq/LICENSE.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

vendor/github.com/lib/pq/README.md

Lines changed: 70 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)