Skip to content
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

Problems encountered when migrating to modules #2

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,046 changes: 0 additions & 1,046 deletions Gopkg.lock

This file was deleted.

74 changes: 0 additions & 74 deletions Gopkg.toml

This file was deleted.

8 changes: 4 additions & 4 deletions apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"strings"
"time"

"github.com/crunchydata/postgres-operator/internal/apiserver"
"github.com/crunchydata/postgres-operator/internal/apiserver/routing"
crunchylog "github.com/crunchydata/postgres-operator/internal/logging"
"github.com/crunchydata/postgres-operator/internal/tlsutil"
"github.com/crunchydata/postgres-operator/v4/internal/apiserver"
"github.com/crunchydata/postgres-operator/v4/internal/apiserver/routing"
crunchylog "github.com/crunchydata/postgres-operator/v4/internal/logging"
"github.com/crunchydata/postgres-operator/v4/internal/tlsutil"

"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
Expand Down
7 changes: 0 additions & 7 deletions bin/get-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,6 @@ else
fi
fi

if which dep; then
echo -n " Found: " && (dep version | egrep '^ version')
else
echo "=== Installing dep ==="
curl -S https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
fi

if which expenv; then
echo " Found expenv"
else
Expand Down
5 changes: 1 addition & 4 deletions deploy/upgrade-pgo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ $DIR/install-rbac.sh
# Deploy the new Operator
$DIR/deploy.sh

# Run 'dep ensure' to update needed libraries
dep ensure

# Store the current location of the PGO client
MYPGO=`which pgo`
# Store the expected location of the PGO client
Expand All @@ -53,7 +50,7 @@ if [ "$MYPGO" != "$BASHPGO" ]; then
echo "Current location\(${MYPG}O\) does not match the expected location \(${BASHPGO}\). You will need to manually install the updated Posgres Operator client in your preferred location."

else
# install the new PGO client
# install the new PGO client
go install $PGOROOT/pgo/pgo.go
cp $GOBIN/pgo $PGOROOT/bin/pgo
fi
Expand Down
4 changes: 0 additions & 4 deletions docs/content/contributing/developer-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ The setup target ensures the presence of:
* `GOPATH` and `PATH` as described in the prerequisites
* EPEL yum repository
* golang compiler
* `dep` dependency manager
* NSQ messaging binaries
* `docker` container tool
* `buildah` OCI image building tool
Expand Down Expand Up @@ -108,9 +107,6 @@ This assumes you have Docker installed and running on your development host.

By default, the Makefile will use buildah to build the container images, to override this default to use docker to build the images, set the IMGBUILDER variable to `docker`


The project uses the golang dep package manager to vendor all the golang source dependencies into the `vendor` directory. You typically do not need to run any `dep` commands unless you are adding new golang package dependencies into the project outside of what is within the project for a given release.

After a full compile, you will have a `pgo` binary in `$HOME/odev/bin` and the Operator images in your local Docker registry.

# Deployment
Expand Down
39 changes: 39 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
module github.com/crunchydata/postgres-operator/v4

go 1.13

require (
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/evanphx/json-patch v0.0.0-20191220184958-bf22ed931162
github.com/fatih/color v1.9.0
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.3.5 // indirect
github.com/google/go-cmp v0.4.0 // indirect
github.com/googleapis/gnostic v0.4.0 // indirect
github.com/gorilla/mux v1.7.4
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.9 // indirect
github.com/json-iterator/go v1.1.9 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/nsqio/go-nsq v1.0.8
github.com/robfig/cron v1.2.0
github.com/robfig/cron/v3 v3.0.1
github.com/sirupsen/logrus v1.5.0
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
github.com/xdg/stringprep v1.0.0
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/appengine v1.6.5 // indirect
k8s.io/api v0.17.7
k8s.io/apimachinery v0.17.7
k8s.io/client-go v0.17.7
k8s.io/sample-controller v0.17.7
k8s.io/utils v0.0.0-20200327001022-6496210b90e8 // indirect
sigs.k8s.io/yaml v1.2.0
)
Loading