Skip to content

*: Use go modules for SDK dependency management #1566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Jul 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
826475e
go.mod,go.sum: initialize
joelanford Jun 12, 2019
3f2cfe8
Makefile,.travis.yml,hack: use go modules for build and CI
joelanford Jun 12, 2019
3a5c9e4
doc/dev: removing references to dep for building and testing the SDK …
joelanford Jun 12, 2019
8cd838d
CHANGELOG.md: updates for SDK's switch to go modules
joelanford Jun 18, 2019
90153cc
go.mod: comment for kubernetes-1.13.1 pin
joelanford Jun 20, 2019
93b571a
Merge branch 'master' into go-mod
joelanford Jun 21, 2019
db36184
hack/ci/setup-build-dependencies.sh: removing scm tool installation (…
joelanford Jun 25, 2019
9b07af9
Merge branch 'master' into go-mod
joelanford Jun 25, 2019
1716bc0
doc/dev/testing/travis-build.md: fixing typo
joelanford Jun 25, 2019
7db66db
Merge branch 'master' into go-mod
joelanford Jun 25, 2019
1f72e88
.travis.yml,hack/ci: use GOPROXY
joelanford Jun 25, 2019
d354e44
Merge branch 'master' into go-mod
joelanford Jun 25, 2019
7168768
.travis.yml: add GOPROXY env in the correct place
joelanford Jun 25, 2019
907232c
Merge branch 'master' into go-mod
joelanford Jun 25, 2019
ce3daf8
Makefile,.travis.yml,hack/ci: centralize GOPROXY
joelanford Jun 25, 2019
333c3ce
Makefile: force go modules on
joelanford Jun 25, 2019
3b5e91c
hack/tests,test/e2e: don't overwrite SDK go.mod
joelanford Jun 25, 2019
2e6cdf0
go.mod: combine require groups
joelanford Jun 25, 2019
d5fdf28
[wip] hack/ci/setup-build-dependencies.sh: don't run 'make tidy'
joelanford Jun 26, 2019
9263967
hack/ci/setup-build-dependencies.sh: add comment and TODO about no-op
joelanford Jun 26, 2019
6dcbcd7
Merge branch 'master' into go-mod
joelanford Jun 27, 2019
03963d6
Makefile: add tidy as a make dependency of test/sanity
joelanford Jun 27, 2019
6a046e3
hack/: cleanup merge commit
joelanford Jun 27, 2019
9b77d97
test/e2e/memcached_test.go: remove unused isLocal field
joelanford Jun 27, 2019
9a20b66
Makefile,ci/: add targets to scaffold ansible and helm base image fil…
joelanford Jun 27, 2019
a974745
ci/tests/e2e-ansible-scaffold-hybrid.sh: use add_go_mod_replace
joelanford Jun 27, 2019
cd1097f
Merge branch 'master' into go-mod
joelanford Jul 1, 2019
cc6ee77
internal/pkg/scaffold: fix versions for go mod proxy
joelanford Jul 2, 2019
4c09b5c
Merge branch 'master' into go-mod-fix
joelanford Jul 2, 2019
3ebb6c5
Merge branch 'master' into go-mod
Jul 9, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.glide/

# Folders
vendor
_obj
_test
_output
Expand Down
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ language: go
go_import_path: github.com/operator-framework/operator-sdk
sudo: required

# go modules require xenial for mercurial TLS 1.2 support
dist: xenial

cache:
directories:
- $HOME/.cache/go-build
- $GOPATH/pkg/mod

go:
- 1.12.x
Expand All @@ -22,21 +24,21 @@ x_base_steps:
# before_install for jobs that require dep
- &dep_before_install
before_install:
- curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 && chmod +x dep && sudo mv dep /usr/local/bin/
- travis_retry dep ensure -v
- travis_retry make tidy

# before_install for jobs that require go builds and do not run for doc-only changes
- &go_before_install
before_install:
# hack/ci/check-doc-only-update.sh needs to be sourced so
# that it can properly exit the test early with success
- source hack/ci/check-doc-only-update.sh
- curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 && chmod +x dep && sudo mv dep /usr/local/bin/
- travis_retry dep ensure -v
- travis_retry make tidy

# Base go, ansbile, and helm job
- &test
stage: test
env: CLUSTER=openshift
env:
- CLUSTER=openshift
<<: *go_before_install
install:
- make install
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- New flag `--repo` for subcommands [`new`](https://github.com/operator-framework/operator-sdk/blob/master/doc/sdk-cli-reference.md#new) and [`migrate`](https://github.com/operator-framework/operator-sdk/blob/master/doc/sdk-cli-reference.md#migrate) specifies the repository path to be used in Go source files generated by the SDK. This flag can only be used with [Go modules](https://github.com/golang/go/wiki/Modules). ([#1475](https://github.com/operator-framework/operator-sdk/pull/1475))
- Adds `--go-build-args` flag to `operator-sdk build` for providing additional Go build arguments. ([#1582](https://github.com/operator-framework/operator-sdk/pull/1582))
- New flags `--csv-channel` and `--default-channel` for subcommand [`gen-csv`](https://github.com/operator-framework/operator-sdk/blob/master/doc/sdk-cli-reference.md#gen-csv) that add channels to and update the [package manifest](https://github.com/operator-framework/operator-registry/#manifest-format) in `deploy/olm-catalog/<operator-name>` when generating a new CSV or updating an existing one. ([#1364](https://github.com/operator-framework/operator-sdk/pull/1364))
- Adds `go.mod` and `go.sum` to switch from `dep` to [Go modules](https://github.com/golang/go/wiki/Modules) to manage dependencies for the SDK project itself. ([#1566](https://github.com/operator-framework/operator-sdk/pull/1566))

### Changed

Expand All @@ -30,6 +31,7 @@

- The SDK no longer depends on a `vendor/` directory to manage dependencies *only if* using [Go modules](https://github.com/golang/go/wiki/Modules). The SDK and operator projects will only use vendoring if using `dep`, or modules and a `vendor/` dir is present. ([#1519](https://github.com/operator-framework/operator-sdk/pull/1519))
- **Breaking change:** `ExposeMetricsPort` is removed and replaced with `CreateMetricsService()` function. `PrometheusPortName` constant is replaced with `OperatorPortName`. ([#1560](https://github.com/operator-framework/operator-sdk/pull/1560))
- Removes `Gopkg.toml` and `Gopkg.lock` to drop the use of `dep` in favor of [Go modules](https://github.com/golang/go/wiki/Modules) to manage dependencies for the SDK project itself. ([#1566](https://github.com/operator-framework/operator-sdk/pull/1566))

### Bug Fixes

Expand Down
Loading