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

Package pkg renamed into internal vol.2 #8

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiserver.local.config/
bin/
key.json
openapi_generated.go
pkg/client/
internal/client/
tmp/
vendor/
zz_generated.deepcopy.go
4 changes: 2 additions & 2 deletions Makefile
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build: GOARCH?=amd64
build: gen
@GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build \
-v \
-ldflags="-d -s -w -X github.com/travelaudience/aerospike-operator/pkg/versioning.OperatorVersion=$(VERSION)" \
-ldflags="-d -s -w -X github.com/travelaudience/aerospike-operator/internal/versioning.OperatorVersion=$(VERSION)" \
-tags=netgo \
-installsuffix=netgo \
-o=$(OUT) ./cmd/$(BIN)/main.go
Expand Down Expand Up @@ -64,7 +64,7 @@ gen:

.PHONY: test.unit
test.unit:
go test -v ./cmd/... ./pkg/...
go test -v ./cmd/... ./internal/...

.PHONY: test.e2e.build
test.e2e.build:
Expand Down
2 changes: 1 addition & 1 deletion cmd/asinit/main.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"io/ioutil"
"strings"

"github.com/travelaudience/aerospike-operator/pkg/reconciler"
"github.com/travelaudience/aerospike-operator/internal/reconciler"

log "github.com/sirupsen/logrus"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/backup/main.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"

"github.com/travelaudience/aerospike-operator/pkg/backuprestore"
"github.com/travelaudience/aerospike-operator/pkg/backuprestore/gcs"
flagutils "github.com/travelaudience/aerospike-operator/pkg/utils/flags"
"github.com/travelaudience/aerospike-operator/internal/backuprestore"
"github.com/travelaudience/aerospike-operator/internal/backuprestore/gcs"
flagutils "github.com/travelaudience/aerospike-operator/internal/utils/flags"
)

const (
Expand Down
24 changes: 12 additions & 12 deletions cmd/operator/main.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"time"

log "github.com/sirupsen/logrus"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
extsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
Expand All @@ -37,17 +37,17 @@ import (
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record"

"github.com/travelaudience/aerospike-operator/pkg/admission"
aerospikeclientset "github.com/travelaudience/aerospike-operator/pkg/client/clientset/versioned"
aerospikescheme "github.com/travelaudience/aerospike-operator/pkg/client/clientset/versioned/scheme"
aerospikeinformers "github.com/travelaudience/aerospike-operator/pkg/client/informers/externalversions"
"github.com/travelaudience/aerospike-operator/pkg/controller"
"github.com/travelaudience/aerospike-operator/pkg/crd"
v1alpha2converters "github.com/travelaudience/aerospike-operator/pkg/crd/converters/v1alpha2"
"github.com/travelaudience/aerospike-operator/pkg/debug"
"github.com/travelaudience/aerospike-operator/pkg/signals"
flagutils "github.com/travelaudience/aerospike-operator/pkg/utils/flags"
"github.com/travelaudience/aerospike-operator/pkg/versioning"
"github.com/travelaudience/aerospike-operator/internal/admission"
aerospikeclientset "github.com/travelaudience/aerospike-operator/internal/client/clientset/versioned"
aerospikescheme "github.com/travelaudience/aerospike-operator/internal/client/clientset/versioned/scheme"
aerospikeinformers "github.com/travelaudience/aerospike-operator/internal/client/informers/externalversions"
"github.com/travelaudience/aerospike-operator/internal/controller"
"github.com/travelaudience/aerospike-operator/internal/crd"
v1alpha2converters "github.com/travelaudience/aerospike-operator/internal/crd/converters/v1alpha2"
"github.com/travelaudience/aerospike-operator/internal/debug"
"github.com/travelaudience/aerospike-operator/internal/signals"
flagutils "github.com/travelaudience/aerospike-operator/internal/utils/flags"
"github.com/travelaudience/aerospike-operator/internal/versioning"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ require (
k8s.io/apiserver v0.0.0-20180910083620-386115dd78fd // indirect
k8s.io/client-go v0.0.0-20180910083459-2cefa64ff137
k8s.io/component-base v0.0.0-20190515024022-2354f2393ad4 // indirect
k8s.io/kube-openapi v0.0.0-20190510232812-a01b7d5d6c22
k8s.io/kube-openapi v0.0.0-20190510232812-a01b7d5d6c22 // indirect
k8s.io/kubernetes v1.14.2
k8s.io/utils v0.0.0-20190520173318-324c5df7d3f0 // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ k8s.io/apiextensions-apiserver v0.0.0-20190516231611-bf6753f2aa24 h1:SwpU8lyfh7O
k8s.io/apiextensions-apiserver v0.0.0-20190516231611-bf6753f2aa24/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d h1:Jmdtdt1ZnoGfWWIIik61Z7nKYgO3J+swQJtPYsP9wHA=
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
k8s.io/apiserver v0.0.0-20190516230822-f89599b3f645 h1:oMjWLjIo6BCIsay+j5r8WbEoHA3Chn/s9duoqXEGzRw=
k8s.io/apiserver v0.0.0-20190516230822-f89599b3f645/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
k8s.io/client-go v11.0.1-0.20190516230509-ae8359b20417+incompatible h1:bK03DJulJi9j05gwnXUufcs2j7h4M85YFvJ0dIlQ9k4=
k8s.io/client-go v11.0.1-0.20190516230509-ae8359b20417+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
Expand Down
14 changes: 7 additions & 7 deletions hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,31 @@ export GOPATH="${FAKE_GOPATH}"
cd "${FAKE_REPOPATH}"

BASE_PACKAGE="github.com/travelaudience/aerospike-operator"
CODEGEN_PACKAGES="${BASE_PACKAGE}/pkg/apis/aerospike/v1alpha1,${BASE_PACKAGE}/pkg/apis/aerospike/v1alpha2"
CODEGEN_PACKAGES="${BASE_PACKAGE}/internal/apis/aerospike/v1alpha1,${BASE_PACKAGE}/internal/apis/aerospike/v1alpha2"

"${BINDIR}/deepcopy-gen" \
--input-dirs ${CODEGEN_PACKAGES} \
-O zz_generated.deepcopy \
--bounding-dirs ${BASE_PACKAGE}/pkg/apis \
--bounding-dirs ${BASE_PACKAGE}/internal/apis \
--go-header-file "${FAKE_REPOPATH}/hack/custom-boilerplate.go.txt"

"${BINDIR}/client-gen" \
--clientset-name versioned \
--input-base '' \
--input ${CODEGEN_PACKAGES} \
--output-package ${BASE_PACKAGE}/pkg/client/clientset \
--output-package ${BASE_PACKAGE}/internal/client/clientset \
--go-header-file "${FAKE_REPOPATH}/hack/custom-boilerplate.go.txt"

"${BINDIR}/lister-gen" \
--input-dirs ${CODEGEN_PACKAGES} \
--output-package ${BASE_PACKAGE}/pkg/client/listers \
--output-package ${BASE_PACKAGE}/internal/client/listers \
--go-header-file "${FAKE_REPOPATH}/hack/custom-boilerplate.go.txt"

"${BINDIR}/informer-gen" \
--input-dirs ${CODEGEN_PACKAGES} \
--versioned-clientset-package ${BASE_PACKAGE}/pkg/client/clientset/versioned \
--listers-package ${BASE_PACKAGE}/pkg/client/listers \
--output-package ${BASE_PACKAGE}/pkg/client/informers \
--versioned-clientset-package ${BASE_PACKAGE}/internal/client/clientset/versioned \
--listers-package ${BASE_PACKAGE}/internal/client/listers \
--output-package ${BASE_PACKAGE}/internal/client/informers \
--go-header-file "${FAKE_REPOPATH}/hack/custom-boilerplate.go.txt"

export GO111MODULE="on"
Expand Down
2 changes: 1 addition & 1 deletion hack/update-fmt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -o pipefail
FILES=$(find . -type f \
-name "*.go" \
-not -path "./vendor/*" \
-not -path "./pkg/client/*" \
-not -path "./internal/client/*" \
-not -name "zz_generated*")
# gofmt the target files
gofmt -w -s ${FILES}
Expand Down
12 changes: 6 additions & 6 deletions hack/update-openapi.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
"github.com/go-openapi/spec"

log "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/kube-openapi/pkg/common"
"k8s.io/apimachinery/internal/runtime"
piotrkowalczuk marked this conversation as resolved.
Show resolved Hide resolved
"k8s.io/apimachinery/internal/runtime/serializer"
utilruntime "k8s.io/apimachinery/internal/util/runtime"
"k8s.io/kube-openapi/internal/common"

aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/v1alpha2"
"github.com/travelaudience/aerospike-operator/pkg/crd"
aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/internal/apis/aerospike/v1alpha2"
"github.com/travelaudience/aerospike-operator/internal/crd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions hack/update-openapi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ SCRIPT_ROOT="$(dirname $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd))"
# run openapi-gen
${GOPATH}/bin/openapi-gen \
--go-header-file "${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt" \
--input-dirs github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/v1alpha2,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime \
--output-package github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/v1alpha2
--input-dirs github.com/travelaudience/aerospike-operator/internal/apis/aerospike/v1alpha2,k8s.io/apimachinery/internal/apis/meta/v1,k8s.io/apimachinery/internal/runtime \
--output-package github.com/travelaudience/aerospike-operator/internal/apis/aerospike/v1alpha2

# run hack/openapi.go
go run ${SCRIPT_ROOT}/hack/update-openapi.go > ${SCRIPT_ROOT}/docs/design/swagger.json
8 changes: 4 additions & 4 deletions pkg/admission/backups.go → internal/admission/backups.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

av1beta1 "k8s.io/api/admission/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/v1alpha2"
aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/internal/apis/aerospike/v1alpha2"
)

func (s *ValidatingAdmissionWebhook) admitAerospikeNamespaceBackup(ar av1beta1.AdmissionReview) *av1beta1.AdmissionResponse {
Expand Down Expand Up @@ -90,7 +90,7 @@ func (s *ValidatingAdmissionWebhook) admitAerospikeNamespaceRestore(ar av1beta1.

func (s *ValidatingAdmissionWebhook) validateBackupRestoreObj(obj aerospikev1alpha2.BackupRestoreObject) error {
// make sure that the target cluster exists
aerospikeCluster, err := s.aerospikeClient.AerospikeV1alpha2().AerospikeClusters(obj.GetNamespace()).Get(obj.GetTarget().Cluster, v1.GetOptions{})
aerospikeCluster, err := s.aerospikeClient.AerospikeV1alpha2().AerospikeClusters(obj.GetNamespace()).Get(obj.GetTarget().Cluster, metav1.GetOptions{})
if err != nil {
return err
}
Expand All @@ -116,7 +116,7 @@ func (s *ValidatingAdmissionWebhook) validateBackupRestoreObj(obj aerospikev1alp
// make sure that the secret containing cloud storage credentials exists and
// matches the expected format
secretNamespace := storageSpec.GetSecretNamespace(obj.GetNamespace())
secret, err := s.kubeClient.CoreV1().Secrets(secretNamespace).Get(storageSpec.GetSecret(), v1.GetOptions{})
secret, err := s.kubeClient.CoreV1().Secrets(secretNamespace).Get(storageSpec.GetSecret(), metav1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
return fmt.Errorf("secret %q not found in namespace %q", storageSpec.GetSecret(), secretNamespace)
Expand Down
8 changes: 4 additions & 4 deletions pkg/admission/cluster.go → internal/admission/cluster.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"reflect"

av1beta1 "k8s.io/api/admission/v1beta1"
"k8s.io/apimachinery/pkg/apis/meta/v1"

"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/v1alpha2"
"github.com/travelaudience/aerospike-operator/pkg/versioning"
aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/internal/apis/aerospike/v1alpha2"
"github.com/travelaudience/aerospike-operator/internal/versioning"
)

const (
Expand Down Expand Up @@ -130,7 +130,7 @@ func (s *ValidatingAdmissionWebhook) validateAerospikeCluster(aerospikeCluster *
if aerospikeCluster.Spec.BackupSpec != nil {
secretNamespace := aerospikeCluster.Spec.BackupSpec.Storage.GetSecretNamespace(aerospikeCluster.Namespace)
secretName := aerospikeCluster.Spec.BackupSpec.Storage.GetSecret()
secret, err := s.kubeClient.CoreV1().Secrets(secretNamespace).Get(secretName, v1.GetOptions{})
secret, err := s.kubeClient.CoreV1().Secrets(secretNamespace).Get(secretName, metav1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
return fmt.Errorf("secret %q not found in namespace %q", secretName, secretNamespace)
Expand Down
28 changes: 14 additions & 14 deletions pkg/admission/webhook.go → internal/admission/webhook.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
log "github.com/sirupsen/logrus"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
"k8s.io/api/core/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -44,12 +44,12 @@ import (
"k8s.io/client-go/util/cert"
"k8s.io/client-go/util/keyutil"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike"
aerospikev1alpha1 "github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/v1alpha1"
aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/v1alpha2"
aerospikeclientset "github.com/travelaudience/aerospike-operator/pkg/client/clientset/versioned"
"github.com/travelaudience/aerospike-operator/pkg/crd"
"github.com/travelaudience/aerospike-operator/pkg/utils/selectors"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike"
aerospikev1alpha1 "github.com/travelaudience/aerospike-operator/internal/apis/aerospike/v1alpha1"
aerospikev1alpha2 "github.com/travelaudience/aerospike-operator/internal/apis/aerospike/v1alpha2"
aerospikeclientset "github.com/travelaudience/aerospike-operator/internal/client/clientset/versioned"
"github.com/travelaudience/aerospike-operator/internal/crd"
"github.com/travelaudience/aerospike-operator/internal/utils/selectors"
)

var (
Expand Down Expand Up @@ -112,7 +112,7 @@ func (s *ValidatingAdmissionWebhook) Register() error {
return err
}
// parse the pem-encoded tls artifacts contained in the secret
cert, err := tls.X509KeyPair(sec.Data[v1.TLSCertKey], sec.Data[v1.TLSPrivateKeyKey])
cert, err := tls.X509KeyPair(sec.Data[corev1.TLSCertKey], sec.Data[corev1.TLSPrivateKeyKey])
if err != nil {
return err
}
Expand All @@ -121,7 +121,7 @@ func (s *ValidatingAdmissionWebhook) Register() error {

// if the admission webhook is enable, ensure it is correctly registered
if Enabled {
return s.ensureWebhookConfig(sec.Data[v1.TLSCertKey])
return s.ensureWebhookConfig(sec.Data[corev1.TLSCertKey])
}

// at this point we know the admission webhook is disabled, so we should
Expand Down Expand Up @@ -177,7 +177,7 @@ func (s *ValidatingAdmissionWebhook) handleAerospikeNamespaceRestore(res http.Re
// ensureTLSSecret generates a certificate and private key to be used for registering and serving the webhook, and
// creates a kubernetes secret containing them so they can be used by all running instances of aerospike-operator.
// in case such secret already exists, it is read and returned.
func (s *ValidatingAdmissionWebhook) ensureTLSSecret() (*v1.Secret, error) {
func (s *ValidatingAdmissionWebhook) ensureTLSSecret() (*corev1.Secret, error) {
// generate the certificate to use when registering and serving the webhook
svc := fmt.Sprintf("%s.%s.svc", serviceName, s.namespace)
now := time.Now()
Expand Down Expand Up @@ -213,18 +213,18 @@ func (s *ValidatingAdmissionWebhook) ensureTLSSecret() (*v1.Secret, error) {
Bytes: sig,
})
// create a kubernetes secret holding the certificate and private key
sec, err := s.kubeClient.CoreV1().Secrets(s.namespace).Create(&v1.Secret{
sec, err := s.kubeClient.CoreV1().Secrets(s.namespace).Create(&corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: tlsSecretName,
Labels: map[string]string{
selectors.LabelAppKey: "aerospike-operator",
},
Namespace: s.namespace,
},
Type: v1.SecretTypeTLS,
Type: corev1.SecretTypeTLS,
Data: map[string][]byte{
v1.TLSCertKey: sigBytes,
v1.TLSPrivateKeyKey: keyBytes,
corev1.TLSCertKey: sigBytes,
corev1.TLSPrivateKeyKey: keyBytes,
},
})
// if creation was successful, return the created secret
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/apis/aerospike/v1alpha1/backup.go → internal/apis/aerospike/v1alpha1/backup.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/common"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike/common"
)

// +genclient
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike"
)

// SchemeGroupVersion is group version used to register these objects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/common"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike/common"
)

// +genclient
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/aerospike/v1alpha1/types.go → internal/apis/aerospike/v1alpha1/types.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ package v1alpha1

import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/common"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike/common"
)

type BackupRestoreObject interface {
GetOperationType() common.OperationType
GetKind() string
GetName() string
GetNamespace() string
GetObjectMeta() *v1.ObjectMeta
GetObjectMeta() *metav1.ObjectMeta
GetStorage() *BackupStorageSpec
SetStorage(*BackupStorageSpec)
GetTarget() *TargetNamespace
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/aerospike/v1alpha2/backup.go → internal/apis/aerospike/v1alpha2/backup.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/common"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike/common"
)

// +genclient
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike"
)

// SchemeGroupVersion is group version used to register these objects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/travelaudience/aerospike-operator/pkg/apis/aerospike/common"
"github.com/travelaudience/aerospike-operator/internal/apis/aerospike/common"
)

// +genclient
Expand Down
Loading