Skip to content

Commit 2983af1

Browse files
author
Per Goncalves da Silva
committed
Updates
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent 242752a commit 2983af1

55 files changed

Lines changed: 407 additions & 1228 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.

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ TEST_OPERATOR_CONTROLLERS=v1.0.0 v2.0.0
251251

252252
.PHONY: $(TEST_OPERATOR_CONTROLLERS)
253253
$(TEST_OPERATOR_CONTROLLERS):
254-
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/images/controllers/test-operator/$@/manager ./test/test-operator/$@/cmd/main.go
254+
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/images/controllers/test-operator/$@/manager ./testdata/images/bundles/test-operator/$@/cmd/main.go
255255

256256
.PHONY: test-operator-controllers
257257
test-operator-controllers: $(TEST_OPERATOR_CONTROLLERS)
@@ -261,7 +261,6 @@ E2E_REGISTRY_IMAGE=localhost/e2e-test-registry:devel
261261
image-registry: export GOOS=linux
262262
image-registry: export GOARCH=amd64
263263
image-registry: $(TEST_OPERATOR_CONTROLLERS) ## Build the testdata catalog used for e2e tests and push it to the image registry
264-
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/registry/bin/registry ./testdata/registry/registry.go
265264
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push ./testdata/push/push.go
266265
$(CONTAINER_RUNTIME) build -f ./testdata/Dockerfile -t $(E2E_REGISTRY_IMAGE) ./testdata
267266
$(CONTAINER_RUNTIME) save $(E2E_REGISTRY_IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)

go.mod

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ require (
1717
github.com/google/renameio/v2 v2.0.0
1818
github.com/gorilla/handlers v1.5.2
1919
github.com/klauspost/compress v1.18.0
20-
github.com/onsi/ginkgo/v2 v2.23.4
21-
github.com/onsi/gomega v1.37.0
2220
github.com/opencontainers/go-digest v1.0.0
2321
github.com/opencontainers/image-spec v1.1.1
2422
github.com/operator-framework/api v0.32.0
@@ -111,7 +109,6 @@ require (
111109
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
112110
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
113111
github.com/go-logr/stdr v1.2.2 // indirect
114-
github.com/go-logr/zapr v1.3.0 // indirect
115112
github.com/go-openapi/analysis v0.23.0 // indirect
116113
github.com/go-openapi/errors v0.22.1 // indirect
117114
github.com/go-openapi/jsonpointer v0.21.1 // indirect
@@ -122,7 +119,6 @@ require (
122119
github.com/go-openapi/strfmt v0.23.0 // indirect
123120
github.com/go-openapi/swag v0.23.1 // indirect
124121
github.com/go-openapi/validate v0.24.0 // indirect
125-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
126122
github.com/gobuffalo/flect v1.0.3 // indirect
127123
github.com/gobwas/glob v0.2.3 // indirect
128124
github.com/gogo/protobuf v1.3.2 // indirect
@@ -131,7 +127,6 @@ require (
131127
github.com/google/btree v1.1.3 // indirect
132128
github.com/google/cel-go v0.25.0 // indirect
133129
github.com/google/gnostic-models v0.6.9 // indirect
134-
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
135130
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
136131
github.com/google/uuid v1.6.0 // indirect
137132
github.com/gorilla/mux v1.8.1 // indirect
@@ -181,6 +176,7 @@ require (
181176
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
182177
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
183178
github.com/oklog/ulid v1.3.1 // indirect
179+
github.com/onsi/gomega v1.37.0 // indirect
184180
github.com/opencontainers/runtime-spec v1.2.1 // indirect
185181
github.com/operator-framework/operator-lib v0.17.0 // indirect
186182
github.com/otiai10/copy v1.14.1 // indirect
@@ -229,9 +225,6 @@ require (
229225
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
230226
go.opentelemetry.io/otel/trace v1.36.0 // indirect
231227
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
232-
go.uber.org/automaxprocs v1.6.0 // indirect
233-
go.uber.org/multierr v1.11.0 // indirect
234-
go.uber.org/zap v1.27.0 // indirect
235228
go.yaml.in/yaml/v2 v2.4.2 // indirect
236229
go.yaml.in/yaml/v3 v3.0.3 // indirect
237230
golang.org/x/crypto v0.39.0 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
409409
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
410410
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
411411
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
412-
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
413-
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
414412
github.com/proglottis/gpgme v0.1.4 h1:3nE7YNA70o2aLjcg63tXMOhPD7bplfE5CBdV+hLAm2M=
415413
github.com/proglottis/gpgme v0.1.4/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
416414
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=

test/e2e/cluster_extension_install_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
732732
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
733733
assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
734734
assert.Contains(ct, cond.Message, "Installed bundle")
735-
assert.Contains(ct, clusterExtension.Status.Install.Bundle.Version, "2.0.0")
735+
assert.Contains(ct, clusterExtension.Status.Install.Bundle.Version, "1.3.0")
736736
}
737737
}, pollDuration, pollInterval)
738738

test/test-operator/bundle.Dockerfile

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

test/test-operator/controller.Dockerfile

Lines changed: 0 additions & 33 deletions
This file was deleted.
-50.9 MB
Binary file not shown.

test/test-operator/v1.0.0/internal/controller/suite_test.go

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

test/test-operator/v1.0.0/internal/controller/testoperator_controller_test.go

Lines changed: 0 additions & 90 deletions
This file was deleted.
-51.2 MB
Binary file not shown.

0 commit comments

Comments
 (0)