*: unify all operators' versioning (#1848)

coreos · Jan 10, 2018 · 6bd111e · 6bd111e
1 parent 70e6abf
commit 6bd111e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 44 deletions.
diff --git a/cmd/backup-operator/main.go b/cmd/backup-operator/main.go
@@ -24,7 +24,7 @@ import (
 	controller "github.com/coreos/etcd-operator/pkg/controller/backup-operator"
 	"github.com/coreos/etcd-operator/pkg/util/constants"
 	"github.com/coreos/etcd-operator/pkg/util/k8sutil"
-	version "github.com/coreos/etcd-operator/version/backup-operator"
+	version "github.com/coreos/etcd-operator/version"
 
 	"github.com/sirupsen/logrus"
 	"k8s.io/api/core/v1"

diff --git a/cmd/restore-operator/main.go b/cmd/restore-operator/main.go
@@ -25,7 +25,7 @@ import (
 	controller "github.com/coreos/etcd-operator/pkg/controller/restore-operator"
 	"github.com/coreos/etcd-operator/pkg/util/constants"
 	"github.com/coreos/etcd-operator/pkg/util/k8sutil"
-	version "github.com/coreos/etcd-operator/version/restore-operator"
+	version "github.com/coreos/etcd-operator/version"
 
 	"github.com/sirupsen/logrus"
 	"k8s.io/api/core/v1"

diff --git a/hack/build/backup-operator/build b/hack/build/backup-operator/build
@@ -15,7 +15,7 @@ fi
 
 GIT_SHA=`git rev-parse --short HEAD || echo "GitNotFound"`
 
-gitHash="github.com/coreos/etcd-operator/version/backup-operator.GitSHA=${GIT_SHA}"
+gitHash="github.com/coreos/etcd-operator/version.GitSHA=${GIT_SHA}"
 
 go_ldflags="-X ${gitHash}"
 

diff --git a/hack/build/restore-operator/build b/hack/build/restore-operator/build
@@ -15,7 +15,7 @@ fi
 
 GIT_SHA=`git rev-parse --short HEAD || echo "GitNotFound"`
 
-gitHash="github.com/coreos/etcd-operator/version/restore-operator.GitSHA=${GIT_SHA}"
+gitHash="github.com/coreos/etcd-operator/version.GitSHA=${GIT_SHA}"
 
 go_ldflags="-X ${gitHash}"
 

diff --git a/version/backup-operator/version.go b/version/backup-operator/version.go
diff --git a/version/restore-operator/version.go b/version/restore-operator/version.go