Skip to content

*: allow add crd to run for ansible/helm projects outside $GOPATH #2044

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.

Sign up for GitHub

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 2 commits into from
Oct 11, 2019
Merged

*: allow add crd to run for ansible/helm projects outside $GOPATH #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cf11ef
*: allow add crd to run for helm/ansible projects
hasbro17 Oct 11, 2019
9e80955
*: rename GOTMP to TMPDIR for helm/ansible scripts
hasbro17 Oct 11, 2019
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
6 changes: 3 additions & 3 deletions ci/tests/e2e-ansible.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ eval IMAGE=$IMAGE_FORMAT
component="osdk-ansible-e2e-hybrid"
eval IMAGE2=$IMAGE_FORMAT
ROOTDIR="$(pwd)"
GOTMP="$(mktemp -d -p $GOPATH/src)"
trap_add 'rm -rf $GOTMP' EXIT
TMPDIR="$(mktemp -d)"
trap_add 'rm -rf $TMPDIR' EXIT

mkdir -p $ROOTDIR/bin
export PATH=$ROOTDIR/bin:$PATH
Expand Down Expand Up @@ -163,7 +163,7 @@ test_operator() {
oc project default

# create and build the operator
pushd "$GOTMP"
pushd "$TMPDIR"
operator-sdk new memcached-operator --api-version=ansible.example.com/v1alpha1 --kind=Memcached --type=ansible

pushd memcached-operator
Expand Down
6 changes: 3 additions & 3 deletions ci/tests/e2e-helm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ eval IMAGE=$IMAGE_FORMAT
component="osdk-helm-e2e-hybrid"
eval IMAGE2=$IMAGE_FORMAT
ROOTDIR="$(pwd)"
GOTMP="$(mktemp -d -p $GOPATH/src)"
trap_add 'rm -rf $GOTMP' EXIT
TMPDIR="$(mktemp -d)"
trap_add 'rm -rf $TMPDIR' EXIT

mkdir -p $ROOTDIR/bin
export PATH=$ROOTDIR/bin:$PATH
Expand Down Expand Up @@ -136,7 +136,7 @@ if oc api-versions | grep openshift; then
fi

# create and build the operator
pushd "$GOTMP"
pushd "$TMPDIR"
operator-sdk new nginx-operator --api-version=helm.example.com/v1alpha1 --kind=Nginx --type=helm

pushd nginx-operator
Expand Down
5 changes: 4 additions & 1 deletion cmd/operator-sdk/add/crd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ func crdFunc(cmd *cobra.Command, args []string) error {

cfg := &input.Config{
AbsProjectPath: projutil.MustGetwd(),
Repo: projutil.GetGoPkg(),
}
if projutil.IsOperatorGo() {
cfg.Repo = projutil.GetGoPkg()
}

if len(args) != 0 {
return fmt.Errorf("command %s doesn't accept any arguments", cmd.CommandPath())
}
Expand Down
6 changes: 3 additions & 3 deletions hack/image/build-ansible-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ source hack/lib/test_lib.sh
source hack/lib/image_lib.sh

ROOTDIR="$(pwd)"
GOTMP="$(mktemp -d)"
trap_add 'rm -rf $GOTMP' EXIT
BASEIMAGEDIR="$GOTMP/ansible-operator"
TMPDIR="$(mktemp -d)"
trap_add 'rm -rf $TMPDIR' EXIT
BASEIMAGEDIR="$TMPDIR/ansible-operator"
mkdir -p "$BASEIMAGEDIR"
go build -o $BASEIMAGEDIR/scaffold-ansible-image ./hack/image/ansible/scaffold-ansible-image.go

Expand Down
6 changes: 3 additions & 3 deletions hack/image/build-helm-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ source hack/lib/test_lib.sh
source hack/lib/image_lib.sh

ROOTDIR="$(pwd)"
GOTMP="$(mktemp -d)"
trap_add 'rm -rf $GOTMP' EXIT
BASEIMAGEDIR="$GOTMP/helm-operator"
TMPDIR="$(mktemp -d)"
trap_add 'rm -rf $TMPDIR' EXIT
BASEIMAGEDIR="$TMPDIR/helm-operator"
mkdir -p "$BASEIMAGEDIR"
go build -o $BASEIMAGEDIR/scaffold-helm-image ./hack/image/helm/scaffold-helm-image.go

Expand Down
6 changes: 3 additions & 3 deletions hack/tests/e2e-ansible-molecule.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ source hack/lib/test_lib.sh
set -eux

ROOTDIR="$(pwd)"
GOTMP="$(mktemp -d)"
trap_add 'rm -rf $GOTMP' EXIT
TMPDIR="$(mktemp -d)"
trap_add 'rm -rf $TMPDIR' EXIT
pip3 install --user pyasn1==0.4.7 pyasn1-modules==0.2.6 idna==2.8 ipaddress==1.0.22
pip3 install --user molecule==2.22
pip3 install --user docker openshift jmespath
Expand All @@ -25,7 +25,7 @@ remove_prereqs() {
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible.example.com_memcacheds_crd.yaml"
}

pushd "$GOTMP"
pushd "$TMPDIR"
operator-sdk new memcached-operator \
--api-version=ansible.example.com/v1alpha1 \
--kind=Memcached \
Expand Down
6 changes: 3 additions & 3 deletions hack/tests/e2e-ansible.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ go test -count=1 ./pkg/ansible/proxy/...

DEST_IMAGE="quay.io/example/memcached-operator:v0.0.2"
ROOTDIR="$(pwd)"
GOTMP="$(mktemp -d)"
trap_add 'rm -rf $GOTMP' EXIT
TMPDIR="$(mktemp -d)"
trap_add 'rm -rf $TMPDIR' EXIT

deploy_operator() {
kubectl create -f "$OPERATORDIR/deploy/service_account.yaml"
Expand Down Expand Up @@ -129,7 +129,7 @@ test_operator() {
}

# create and build the operator
pushd "$GOTMP"
pushd "$TMPDIR"
operator-sdk new memcached-operator \
--api-version=ansible.example.com/v1alpha1 \
--kind=Memcached \
Expand Down
6 changes: 3 additions & 3 deletions hack/tests/e2e-helm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ source hack/lib/image_lib.sh

DEST_IMAGE="quay.io/example/nginx-operator:v0.0.2"
ROOTDIR="$(pwd)"
GOTMP="$(mktemp -d)"
trap_add 'rm -rf $GOTMP' EXIT
TMPDIR="$(mktemp -d)"
trap_add 'rm -rf $TMPDIR' EXIT

deploy_operator() {
kubectl create -f "$OPERATORDIR/deploy/service_account.yaml"
Expand Down Expand Up @@ -112,7 +112,7 @@ test_operator() {
}

# create and build the operator
pushd "$GOTMP"
pushd "$TMPDIR"
log=$(operator-sdk new nginx-operator \
--api-version=helm.example.com/v1alpha1 \
--kind=Nginx \
Expand Down