Skip to content

Commit ec9814c

Browse files
Unified go.mod to ensure that catalogd and operator-framework use the same go.mod and fix imports
1 parent 40baf83 commit ec9814c

Some content is hidden

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

58 files changed

+94
-756
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

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ As you may or may not know, the Operator-Controller project aims to deliver the
1818
The user experience captured in the OLM V1 PRD introduces many requirements that are best satisfied by a microservices architecture. The OLM V1 experience currently relies on two projects:
1919

2020
- [The Operator-Controller project](https://github.com/operator-framework/operator-controller/), which is the top level component allowing users to specify operators they'd like to install.
21-
- [The Catalogd project](https://github.com/operator-framework/catalogd/), which hosts operator content and helps users discover installable content.
21+
- [The Catalogd project](https://github.com/operator-framework/operator-controller/catalogd/), which hosts operator content and helps users discover installable content.
2222

2323
Each of the projects listed above have their own governance, release milestones, and release cadence. However, from a technical perspective, the "OLM V1 experience" matches the experienced offered by the operator-controller project, the top level component which depends on Catalogd.
2424

@@ -120,7 +120,7 @@ As discussed earlier, the operator-controller adheres to a microservice architec
120120
Unsure where to submit an issue?
121121
122122
- [The Operator-Controller project](https://github.com/operator-framework/operator-controller/), which is the top level component allowing users to specify operators they'd like to install.
123-
- [The Catalogd project](https://github.com/operator-framework/catalogd/), which hosts operator content and helps users discover installable content.
123+
- [The Catalogd project](https://github.com/operator-framework/operator-controller/catalogd/), which hosts operator content and helps users discover installable content.
124124

125125
Don't worry if you accidentally submit an issue against the wrong project, if we notice that an issue would fit better with a separate project we'll move it to the correct repository and mention it in the #olm-dev slack channel.
126126

0 commit comments

Comments
 (0)