Skip to content

Commit e4ee7a7

Browse files
Chnage imports for catalogd and unified go.mod
1 parent 40baf83 commit e4ee7a7

Some content is hidden

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

42 files changed

+64
-726
lines changed

.github/workflows/catalogd-crd-diff.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
- uses: actions/setup-go@v5
1313
with:
14-
go-version-file: catalogd/go.mod
14+
go-version-file: go.mod
1515

1616
- name: Run make verify-crd-compatibility
1717
working-directory: catalogd

.github/workflows/catalogd-demo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919
- uses: actions/setup-go@v5
2020
with:
21-
go-version-file: "catalogd/go.mod"
21+
go-version-file: "go.mod"
2222
- name: Run Demo Update
2323
working-directory: catalogd
2424
run: make demo-update

.github/workflows/catalogd-e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626
- uses: actions/setup-go@v5
2727
with:
28-
go-version-file: "catalogd/go.mod"
28+
go-version-file: "go.mod"
2929
- name: Run the upgrade e2e test
3030
working-directory: catalogd
3131
run: make test-upgrade-e2e

.github/workflows/catalogd-go-apidiff.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version-file: "catalogd/go.mod"
18+
go-version-file: "go.mod"
1919
id: go
2020
- name: Run go-apidiff
2121
working-directory: catalogd

.github/workflows/catalogd-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Go
2626
uses: actions/setup-go@v5
2727
with:
28-
go-version-file: "catalogd/go.mod"
28+
go-version-file: "go.mod"
2929

3030
- name: Docker Login
3131
if: ${{ github.event_name != 'pull_request' }}

.github/workflows/catalogd-sanity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525
- uses: actions/setup-go@v5
2626
with:
27-
go-version-file: "catalogd/go.mod"
27+
go-version-file: "go.mod"
2828
- name: Run lint checks
2929
working-directory: catalogd
3030
run: make lint GOLANGCI_LINT_ARGS="--out-format github-actions"

.github/workflows/catalogd-tilt.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install Go
2727
uses: actions/setup-go@v5
2828
with:
29-
go-version-file: catalogd/go.mod
29+
go-version-file: go.mod
3030
- name: Install Tilt
3131
run: |
3232
TILT_VERSION="0.33.3"

.github/workflows/catalogd-unit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: actions/setup-go@v5
1717
with:
18-
go-version-file: "catalogd/go.mod"
18+
go-version-file: "go.mod"
1919

2020
- name: Unit Test
2121
working-directory: catalogd

.github/workflows/tilt.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
id: get-catalogd-version
2727
run: |
2828
cd operator-controller
29-
echo "CATALOGD_VERSION=$(go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/catalogd)" >> "$GITHUB_OUTPUT"
29+
echo "CATALOGD_VERSION=$(go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/operator-controller/catalogd)" >> "$GITHUB_OUTPUT"
3030
- uses: actions/checkout@v4
3131
with:
3232
repository: operator-framework/catalogd

catalogd/cmd/manager/main.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ import (
5252
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
5353
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
5454

55-
catalogdv1 "github.com/operator-framework/catalogd/api/v1"
56-
corecontrollers "github.com/operator-framework/catalogd/internal/controllers/core"
57-
"github.com/operator-framework/catalogd/internal/features"
58-
"github.com/operator-framework/catalogd/internal/garbagecollection"
59-
catalogdmetrics "github.com/operator-framework/catalogd/internal/metrics"
60-
"github.com/operator-framework/catalogd/internal/serverutil"
61-
"github.com/operator-framework/catalogd/internal/source"
62-
"github.com/operator-framework/catalogd/internal/storage"
63-
"github.com/operator-framework/catalogd/internal/version"
64-
"github.com/operator-framework/catalogd/internal/webhook"
55+
catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
56+
corecontrollers "github.com/operator-framework/operator-controller/catalogd/internal/controllers/core"
57+
"github.com/operator-framework/operator-controller/catalogd/internal/features"
58+
"github.com/operator-framework/operator-controller/catalogd/internal/garbagecollection"
59+
catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics"
60+
"github.com/operator-framework/operator-controller/catalogd/internal/serverutil"
61+
"github.com/operator-framework/operator-controller/catalogd/internal/source"
62+
"github.com/operator-framework/operator-controller/catalogd/internal/storage"
63+
"github.com/operator-framework/operator-controller/catalogd/internal/version"
64+
"github.com/operator-framework/operator-controller/catalogd/internal/webhook"
6565
)
6666

6767
var (

0 commit comments

Comments
 (0)