Move type to pkg for sharing with external components

ca-gip · May 29, 2020 · e0705f5 · e0705f5
1 parent 9070c3e
commit e0705f5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -14,13 +14,13 @@ codegen: dependency
 	bash hack/update-codegen.sh
 
 test: codegen
-	 GOOS=linux GOARCH=amd64 go test ./internal/services ./internal/types ./internal/utils
+	 GOARCH=amd64 go test ./internal/services ./pkg/types ./internal/utils
 
 test-only:
 	@echo "-> Test only kubi operator binary"
-	 GOOS=linux GOARCH=amd64 go test ./internal/services ./internal/types ./internal/utils
+	GOARCH=amd64 go test ./internal/services ./pkg/types ./internal/utils
 
 build: test
 	@echo "-> Building kubi operator binary"
-	GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -v -o ./build/kubi -i $(GOPATH)/src/$(REPO)/cmd/main.go
+	CGO_ENABLED=0 GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -v -o ./build/kubi -i $(GOPATH)/src/$(REPO)/cmd/main.go
 
diff --git a/Version b/Version
@@ -1 +1 @@
-1.6.0
+1.6.1
diff --git a/internal/services/ldap.go b/internal/services/ldap.go
@@ -3,8 +3,8 @@ package services
 import (
 	"errors"
 	"fmt"
-	"github.com/ca-gip/kubi/internal/types"
 	"github.com/ca-gip/kubi/internal/utils"
+	"github.com/ca-gip/kubi/pkg/types"
 	"regexp"
 	"strings"
 )

diff --git a/internal/services/provisionner.go b/internal/services/provisionner.go
@@ -4,10 +4,10 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ca-gip/kubi/internal/authprovider"
-	"github.com/ca-gip/kubi/internal/types"
 	"github.com/ca-gip/kubi/internal/utils"
 	v12 "github.com/ca-gip/kubi/pkg/apis/ca-gip/v1"
 	"github.com/ca-gip/kubi/pkg/generated/clientset/versioned"
+	"github.com/ca-gip/kubi/pkg/types"
 	corev1 "k8s.io/api/core/v1"
 	v1n "k8s.io/api/networking/v1"
 	"k8s.io/api/rbac/v1"

diff --git a/internal/services/tokenissuer.go b/internal/services/tokenissuer.go
@@ -6,8 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ca-gip/kubi/internal/authprovider"
-	"github.com/ca-gip/kubi/internal/types"
 	"github.com/ca-gip/kubi/internal/utils"
+	"github.com/ca-gip/kubi/pkg/types"
 	"github.com/dgrijalva/jwt-go"
 	"gopkg.in/yaml.v2"
 	"io"

diff --git a/internal/utils/config.go b/internal/utils/config.go
@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/base64"
-	"github.com/ca-gip/kubi/internal/types"
+	"github.com/ca-gip/kubi/pkg/types"
 	"github.com/go-ozzo/ozzo-validation"
 	"github.com/go-ozzo/ozzo-validation/is"
 	"io/ioutil"

diff --git a/internal/types/types.go → pkg/types/types.go b/internal/types/types.go → pkg/types/types.go