diff --git a/Makefile b/Makefile index 51ab0aa87..d1119c772 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ ifneq ($(shell git status --porcelain),) endif -PROJECT_PACKAGE := github.com/spotahome/redis-operator +PROJECT_PACKAGE := github.com/saremox/redis-operator CODEGEN_IMAGE := ghcr.io/slok/kube-code-generator:v1.27.0 PORT := 9710 @@ -56,7 +56,7 @@ DEV_DIR := docker/development APP_DIR := docker/app # workdir -WORKDIR := /go/src/github.com/spotahome/redis-operator +WORKDIR := /go/src/github.com/saremox/redis-operator # The default action of this Makefile is to build the development docker image .PHONY: default diff --git a/README.md b/README.md index 4ae79cbca..6c32e4ffc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # redis-operator -[![Build Status](https://github.com/spotahome/redis-operator/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/spotahome/redis-operator) -[![Go Report Card](https://goreportcard.com/badge/github.com/spotahome/redis-operator)](https://goreportcard.com/report/github.com/spotahome/redis-operator) +[![Build Status](https://github.com/saremox/redis-operator/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/saremox/redis-operator) +[![Go Report Card](https://goreportcard.com/badge/github.com/saremox/redis-operator)](https://goreportcard.com/report/github.com/saremox/redis-operator) Redis Operator creates/configures/manages redis-failovers atop Kubernetes. @@ -60,7 +60,7 @@ but it also comes with a few presets (in the form of overlays) supporting the mo To install the operator with default settings and every necessary resource (including RBAC, service account, default resource limits, etc), install the `default` overlay: ```shell -kustomize build github.com/spotahome/redis-operator/manifests/kustomize/overlays/default +kustomize build github.com/saremox/redis-operator/manifests/kustomize/overlays/default ``` If you would like to customize RBAC or the service account used, you can install the `minimal` overlay. @@ -70,7 +70,7 @@ Finally, you can install the `full` overlay if you want everything this operator It's always a good practice to pin the version of the operator in your configuration to make sure you are not surprised by changes on the latest development branch: ```shell -kustomize build github.com/spotahome/redis-operator/manifests/kustomize/overlays/default?ref=v1.2.4 +kustomize build github.com/saremox/redis-operator/manifests/kustomize/overlays/default?ref=v1.2.4 ``` You can easily create your own config by creating a `kustomization.yaml` file @@ -86,7 +86,7 @@ commonLabels: foo: bar resources: - - github.com/spotahome/redis-operator/manifests/kustomize/overlays/full + - github.com/saremox/redis-operator/manifests/kustomize/overlays/full ``` Take a look at the manifests inside [manifests/kustomize](manifests/kustomize) for more details. @@ -351,6 +351,6 @@ kubectl delete redisfailover [![Redis Operator Image](https://quay.io/repository/spotahome/redis-operator/status "Redis Operator Image")](https://quay.io/repository/spotahome/redis-operator) ## Documentation -For the code documentation, you can lookup on the [GoDoc](https://godoc.org/github.com/spotahome/redis-operator). +For the code documentation, you can lookup on the [GoDoc](https://godoc.org/github.com/saremox/redis-operator). Also, you can check more deeply information on the [docs folder](docs). diff --git a/api/redisfailover/v1/register.go b/api/redisfailover/v1/register.go index 3cbb33bc8..1afeeecf4 100644 --- a/api/redisfailover/v1/register.go +++ b/api/redisfailover/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/spotahome/redis-operator/api/redisfailover" + "github.com/saremox/redis-operator/api/redisfailover" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/charts/redisoperator/Chart.yaml b/charts/redisoperator/Chart.yaml index ebf5c23de..46629499c 100644 --- a/charts/redisoperator/Chart.yaml +++ b/charts/redisoperator/Chart.yaml @@ -5,11 +5,11 @@ apiVersion: v1 description: A Helm chart for the Spotahome Redis Operator name: redis-operator version: 3.3.1 -home: https://github.com/spotahome/redis-operator +home: https://github.com/saremox/redis-operator keywords: - "golang" - "operator" - "cluster" sources: - - https://github.com/spotahome/redis-operator + - https://github.com/saremox/redis-operator kubeVersion: ">=1.21.0-0" diff --git a/client/k8s/clientset/versioned/clientset.go b/client/k8s/clientset/versioned/clientset.go index b748163c8..0d18b05c5 100644 --- a/client/k8s/clientset/versioned/clientset.go +++ b/client/k8s/clientset/versioned/clientset.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - databasesv1 "github.com/spotahome/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1" + databasesv1 "github.com/saremox/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/client/k8s/clientset/versioned/fake/clientset_generated.go b/client/k8s/clientset/versioned/fake/clientset_generated.go index 53e225124..02d6d04fa 100644 --- a/client/k8s/clientset/versioned/fake/clientset_generated.go +++ b/client/k8s/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/spotahome/redis-operator/client/k8s/clientset/versioned" - databasesv1 "github.com/spotahome/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1" - fakedatabasesv1 "github.com/spotahome/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1/fake" + clientset "github.com/saremox/redis-operator/client/k8s/clientset/versioned" + databasesv1 "github.com/saremox/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1" + fakedatabasesv1 "github.com/saremox/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/client/k8s/clientset/versioned/fake/register.go b/client/k8s/clientset/versioned/fake/register.go index 9ab940150..3e412c33f 100644 --- a/client/k8s/clientset/versioned/fake/register.go +++ b/client/k8s/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - databasesv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + databasesv1 "github.com/saremox/redis-operator/api/redisfailover/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/client/k8s/clientset/versioned/scheme/register.go b/client/k8s/clientset/versioned/scheme/register.go index 96b07bfed..858639bd0 100644 --- a/client/k8s/clientset/versioned/scheme/register.go +++ b/client/k8s/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - databasesv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + databasesv1 "github.com/saremox/redis-operator/api/redisfailover/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover.go b/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover.go index 75844ca98..a00029165 100644 --- a/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover.go +++ b/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + v1 "github.com/saremox/redis-operator/api/redisfailover/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover_client.go b/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover_client.go index 1e587d575..63c11e359 100644 --- a/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover_client.go +++ b/client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover_client.go @@ -3,7 +3,7 @@ package fake import ( - v1 "github.com/spotahome/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1" + v1 "github.com/saremox/redis-operator/client/k8s/clientset/versioned/typed/redisfailover/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover.go b/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover.go index 48f76b96f..06b93e8fc 100644 --- a/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover.go +++ b/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - scheme "github.com/spotahome/redis-operator/client/k8s/clientset/versioned/scheme" + v1 "github.com/saremox/redis-operator/api/redisfailover/v1" + scheme "github.com/saremox/redis-operator/client/k8s/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover_client.go b/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover_client.go index 316404368..f94e74c97 100644 --- a/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover_client.go +++ b/client/k8s/clientset/versioned/typed/redisfailover/v1/redisfailover_client.go @@ -5,8 +5,8 @@ package v1 import ( "net/http" - v1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/client/k8s/clientset/versioned/scheme" + v1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/client/k8s/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/cmd/redisoperator/main.go b/cmd/redisoperator/main.go index 4137161cc..0a3f7a2a4 100644 --- a/cmd/redisoperator/main.go +++ b/cmd/redisoperator/main.go @@ -15,12 +15,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" - "github.com/spotahome/redis-operator/cmd/utils" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/operator/redisfailover" - "github.com/spotahome/redis-operator/service/k8s" - "github.com/spotahome/redis-operator/service/redis" + "github.com/saremox/redis-operator/cmd/utils" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/operator/redisfailover" + "github.com/saremox/redis-operator/service/k8s" + "github.com/saremox/redis-operator/service/redis" ) const ( diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 86927ed09..4662fcce5 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -6,7 +6,7 @@ import ( "path/filepath" "regexp" - "github.com/spotahome/redis-operator/operator/redisfailover" + "github.com/saremox/redis-operator/operator/redisfailover" "k8s.io/client-go/util/homedir" ) diff --git a/cmd/utils/k8s.go b/cmd/utils/k8s.go index a470931f8..665c26bd0 100644 --- a/cmd/utils/k8s.go +++ b/cmd/utils/k8s.go @@ -8,7 +8,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - redisfailoverclientset "github.com/spotahome/redis-operator/client/k8s/clientset/versioned" + redisfailoverclientset "github.com/saremox/redis-operator/client/k8s/clientset/versioned" ) // LoadKubernetesConfig loads kubernetes configuration based on flags. diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 0be3d16ec..f2de3ab0b 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -29,4 +29,4 @@ RUN addgroup -g $gid rf && \ USER rf -WORKDIR /go/src/github.com/spotahome/redis-operator +WORKDIR /go/src/github.com/saremox/redis-operator diff --git a/go.mod b/go.mod index cfb971deb..84072ed0e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/spotahome/redis-operator +module github.com/saremox/redis-operator go 1.22 diff --git a/metrics/metrics.go b/metrics/metrics.go index 626f12aad..840fbc58a 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -7,9 +7,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" + "github.com/saremox/redis-operator/log" koopercontroller "github.com/spotahome/kooper/v2/controller" kooperprometheus "github.com/spotahome/kooper/v2/metrics/prometheus" - "github.com/spotahome/redis-operator/log" ) const ( diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go index 4060b511b..d34a5c493 100644 --- a/metrics/metrics_test.go +++ b/metrics/metrics_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/metrics" ) func TestPrometheusMetrics(t *testing.T) { diff --git a/mocks/doc.go b/mocks/doc.go index 2df061569..be2cfe79e 100644 --- a/mocks/doc.go +++ b/mocks/doc.go @@ -1,7 +1,7 @@ /* Package mocks will have all the mocks of the application. */ -package mocks // import "github.com/spotahome/redis-operator/mocks" +package mocks // import "github.com/saremox/redis-operator/mocks" // Logger mocks //go:generate mockery --output log --dir ../log --name Logger diff --git a/mocks/log/Logger.go b/mocks/log/Logger.go index 2ae79dfa6..6ba916ff8 100644 --- a/mocks/log/Logger.go +++ b/mocks/log/Logger.go @@ -3,7 +3,7 @@ package mocks import ( - log "github.com/spotahome/redis-operator/log" + log "github.com/saremox/redis-operator/log" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/operator/redisfailover/RedisFailover.go b/mocks/operator/redisfailover/RedisFailover.go index 69d397a31..37f56d220 100644 --- a/mocks/operator/redisfailover/RedisFailover.go +++ b/mocks/operator/redisfailover/RedisFailover.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/mocks/operator/redisfailover/service/RedisFailoverCheck.go b/mocks/operator/redisfailover/service/RedisFailoverCheck.go index 02c2ee339..b3ef18c60 100644 --- a/mocks/operator/redisfailover/service/RedisFailoverCheck.go +++ b/mocks/operator/redisfailover/service/RedisFailoverCheck.go @@ -7,7 +7,7 @@ import ( time "time" - v1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + v1 "github.com/saremox/redis-operator/api/redisfailover/v1" ) // RedisFailoverCheck is an autogenerated mock type for the RedisFailoverCheck type diff --git a/mocks/operator/redisfailover/service/RedisFailoverClient.go b/mocks/operator/redisfailover/service/RedisFailoverClient.go index 61b7c96e2..43d85ec81 100644 --- a/mocks/operator/redisfailover/service/RedisFailoverClient.go +++ b/mocks/operator/redisfailover/service/RedisFailoverClient.go @@ -6,7 +6,7 @@ import ( mock "github.com/stretchr/testify/mock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + v1 "github.com/saremox/redis-operator/api/redisfailover/v1" ) // RedisFailoverClient is an autogenerated mock type for the RedisFailoverClient type diff --git a/mocks/operator/redisfailover/service/RedisFailoverHeal.go b/mocks/operator/redisfailover/service/RedisFailoverHeal.go index f7d1202c3..8afeb5f4b 100644 --- a/mocks/operator/redisfailover/service/RedisFailoverHeal.go +++ b/mocks/operator/redisfailover/service/RedisFailoverHeal.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - v1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + v1 "github.com/saremox/redis-operator/api/redisfailover/v1" ) // RedisFailoverHeal is an autogenerated mock type for the RedisFailoverHeal type diff --git a/mocks/service/k8s/Services.go b/mocks/service/k8s/Services.go index ba74e8f84..81b07d9ee 100644 --- a/mocks/service/k8s/Services.go +++ b/mocks/service/k8s/Services.go @@ -15,7 +15,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" v1 "k8s.io/api/core/v1" diff --git a/operator/redisfailover/checker.go b/operator/redisfailover/checker.go index 825446cc8..28e3941fb 100644 --- a/operator/redisfailover/checker.go +++ b/operator/redisfailover/checker.go @@ -3,13 +3,13 @@ package redisfailover import ( "context" "errors" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/service/k8s" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "strconv" "time" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/metrics" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/metrics" ) // UpdateRedisesPods if the running version of pods are equal to the statefulset one diff --git a/operator/redisfailover/checker_test.go b/operator/redisfailover/checker_test.go index a6816b043..7c7e16097 100644 --- a/operator/redisfailover/checker_test.go +++ b/operator/redisfailover/checker_test.go @@ -3,7 +3,7 @@ package redisfailover_test import ( "errors" "fmt" - v1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + v1 "github.com/saremox/redis-operator/api/redisfailover/v1" "testing" "time" @@ -13,11 +13,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - mRFService "github.com/spotahome/redis-operator/mocks/operator/redisfailover/service" - mK8SService "github.com/spotahome/redis-operator/mocks/service/k8s" - rfOperator "github.com/spotahome/redis-operator/operator/redisfailover" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + mRFService "github.com/saremox/redis-operator/mocks/operator/redisfailover/service" + mK8SService "github.com/saremox/redis-operator/mocks/service/k8s" + rfOperator "github.com/saremox/redis-operator/operator/redisfailover" ) func TestCheckAndHeal(t *testing.T) { diff --git a/operator/redisfailover/ensurer.go b/operator/redisfailover/ensurer.go index 388e25f58..6ef99c76d 100644 --- a/operator/redisfailover/ensurer.go +++ b/operator/redisfailover/ensurer.go @@ -3,8 +3,8 @@ package redisfailover import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/metrics" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/metrics" ) // Ensure is called to ensure all of the resources associated with a RedisFailover are created diff --git a/operator/redisfailover/ensurer_test.go b/operator/redisfailover/ensurer_test.go index 2b5bddc19..f1e6b9521 100644 --- a/operator/redisfailover/ensurer_test.go +++ b/operator/redisfailover/ensurer_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/mock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - mRFService "github.com/spotahome/redis-operator/mocks/operator/redisfailover/service" - mK8SService "github.com/spotahome/redis-operator/mocks/service/k8s" - rfOperator "github.com/spotahome/redis-operator/operator/redisfailover" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + mRFService "github.com/saremox/redis-operator/mocks/operator/redisfailover/service" + mK8SService "github.com/saremox/redis-operator/mocks/service/k8s" + rfOperator "github.com/saremox/redis-operator/operator/redisfailover" ) const ( diff --git a/operator/redisfailover/factory.go b/operator/redisfailover/factory.go index 9d19fbecb..3acdea532 100644 --- a/operator/redisfailover/factory.go +++ b/operator/redisfailover/factory.go @@ -14,12 +14,12 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - rfservice "github.com/spotahome/redis-operator/operator/redisfailover/service" - "github.com/spotahome/redis-operator/service/k8s" - "github.com/spotahome/redis-operator/service/redis" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + rfservice "github.com/saremox/redis-operator/operator/redisfailover/service" + "github.com/saremox/redis-operator/service/k8s" + "github.com/saremox/redis-operator/service/redis" ) const ( diff --git a/operator/redisfailover/handler.go b/operator/redisfailover/handler.go index 0880360df..6a25b823c 100644 --- a/operator/redisfailover/handler.go +++ b/operator/redisfailover/handler.go @@ -8,12 +8,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - rfservice "github.com/spotahome/redis-operator/operator/redisfailover/service" - "github.com/spotahome/redis-operator/operator/redisfailover/util" - "github.com/spotahome/redis-operator/service/k8s" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + rfservice "github.com/saremox/redis-operator/operator/redisfailover/service" + "github.com/saremox/redis-operator/operator/redisfailover/util" + "github.com/saremox/redis-operator/service/k8s" ) const ( diff --git a/operator/redisfailover/service/check.go b/operator/redisfailover/service/check.go index 86401f0f9..4540d3a08 100644 --- a/operator/redisfailover/service/check.go +++ b/operator/redisfailover/service/check.go @@ -9,12 +9,12 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/operator/redisfailover/util" - "github.com/spotahome/redis-operator/service/k8s" - "github.com/spotahome/redis-operator/service/redis" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/operator/redisfailover/util" + "github.com/saremox/redis-operator/service/k8s" + "github.com/saremox/redis-operator/service/redis" ) // RedisFailoverCheck defines the interface able to check the correct status of a redis failover diff --git a/operator/redisfailover/service/check_test.go b/operator/redisfailover/service/check_test.go index af64d7e13..42427242f 100644 --- a/operator/redisfailover/service/check_test.go +++ b/operator/redisfailover/service/check_test.go @@ -12,12 +12,12 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - mK8SService "github.com/spotahome/redis-operator/mocks/service/k8s" - mRedisService "github.com/spotahome/redis-operator/mocks/service/redis" - rfservice "github.com/spotahome/redis-operator/operator/redisfailover/service" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + mK8SService "github.com/saremox/redis-operator/mocks/service/k8s" + mRedisService "github.com/saremox/redis-operator/mocks/service/redis" + rfservice "github.com/saremox/redis-operator/operator/redisfailover/service" ) func generateRF() *redisfailoverv1.RedisFailover { diff --git a/operator/redisfailover/service/client.go b/operator/redisfailover/service/client.go index 4cf48e6f9..137918227 100644 --- a/operator/redisfailover/service/client.go +++ b/operator/redisfailover/service/client.go @@ -4,11 +4,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/operator/redisfailover/util" - "github.com/spotahome/redis-operator/service/k8s" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/operator/redisfailover/util" + "github.com/saremox/redis-operator/service/k8s" ) // RedisFailoverClient has the minimumm methods that a Redis failover controller needs to satisfy diff --git a/operator/redisfailover/service/generator.go b/operator/redisfailover/service/generator.go index 502cc5aef..02658b9c6 100644 --- a/operator/redisfailover/service/generator.go +++ b/operator/redisfailover/service/generator.go @@ -13,8 +13,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/operator/redisfailover/util" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/operator/redisfailover/util" ) const ( diff --git a/operator/redisfailover/service/generator_test.go b/operator/redisfailover/service/generator_test.go index b14317072..57c64c9d1 100644 --- a/operator/redisfailover/service/generator_test.go +++ b/operator/redisfailover/service/generator_test.go @@ -12,11 +12,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - mK8SService "github.com/spotahome/redis-operator/mocks/service/k8s" - rfservice "github.com/spotahome/redis-operator/operator/redisfailover/service" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + mK8SService "github.com/saremox/redis-operator/mocks/service/k8s" + rfservice "github.com/saremox/redis-operator/operator/redisfailover/service" ) func TestRedisStatefulSetStorageGeneration(t *testing.T) { diff --git a/operator/redisfailover/service/heal.go b/operator/redisfailover/service/heal.go index 390a6ac48..d20c01989 100644 --- a/operator/redisfailover/service/heal.go +++ b/operator/redisfailover/service/heal.go @@ -5,10 +5,10 @@ import ( "sort" "strconv" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/service/k8s" - "github.com/spotahome/redis-operator/service/redis" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/service/k8s" + "github.com/saremox/redis-operator/service/redis" v1 "k8s.io/api/core/v1" ) diff --git a/operator/redisfailover/service/heal_test.go b/operator/redisfailover/service/heal_test.go index 27bd8cc11..6e1203c80 100644 --- a/operator/redisfailover/service/heal_test.go +++ b/operator/redisfailover/service/heal_test.go @@ -11,10 +11,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/spotahome/redis-operator/log" - mK8SService "github.com/spotahome/redis-operator/mocks/service/k8s" - mRedisService "github.com/spotahome/redis-operator/mocks/service/redis" - rfservice "github.com/spotahome/redis-operator/operator/redisfailover/service" + "github.com/saremox/redis-operator/log" + mK8SService "github.com/saremox/redis-operator/mocks/service/k8s" + mRedisService "github.com/saremox/redis-operator/mocks/service/redis" + rfservice "github.com/saremox/redis-operator/operator/redisfailover/service" ) func TestSetOldestAsMasterNewMasterError(t *testing.T) { diff --git a/operator/redisfailover/service/names.go b/operator/redisfailover/service/names.go index 3c3e633f5..8b31f023f 100644 --- a/operator/redisfailover/service/names.go +++ b/operator/redisfailover/service/names.go @@ -3,7 +3,7 @@ package service import ( "fmt" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" ) // GetRedisShutdownConfigMapName returns the name for redis configmap diff --git a/service/k8s/configmap.go b/service/k8s/configmap.go index 1b6fc1424..1e1baecb1 100644 --- a/service/k8s/configmap.go +++ b/service/k8s/configmap.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // ConfigMap the ServiceAccount service that knows how to interact with k8s to manage them diff --git a/service/k8s/configmap_test.go b/service/k8s/configmap_test.go index da0701cf5..03503076f 100644 --- a/service/k8s/configmap_test.go +++ b/service/k8s/configmap_test.go @@ -13,9 +13,9 @@ import ( kubernetes "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/service/k8s" ) var ( diff --git a/service/k8s/deployment.go b/service/k8s/deployment.go index 46d63bb93..b5d78e87d 100644 --- a/service/k8s/deployment.go +++ b/service/k8s/deployment.go @@ -11,8 +11,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // Deployment the Deployment service that knows how to interact with k8s to manage them diff --git a/service/k8s/deployment_test.go b/service/k8s/deployment_test.go index 14be68360..d2af91031 100644 --- a/service/k8s/deployment_test.go +++ b/service/k8s/deployment_test.go @@ -13,9 +13,9 @@ import ( kubernetes "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/service/k8s" ) var ( diff --git a/service/k8s/k8s.go b/service/k8s/k8s.go index b6e68ae44..53d060d9c 100644 --- a/service/k8s/k8s.go +++ b/service/k8s/k8s.go @@ -4,9 +4,9 @@ import ( apiextensionscli "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/kubernetes" - redisfailoverclientset "github.com/spotahome/redis-operator/client/k8s/clientset/versioned" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + redisfailoverclientset "github.com/saremox/redis-operator/client/k8s/clientset/versioned" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // Service is the K8s service entrypoint. diff --git a/service/k8s/pod.go b/service/k8s/pod.go index 0583302ce..3a94e8d35 100644 --- a/service/k8s/pod.go +++ b/service/k8s/pod.go @@ -11,8 +11,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // Pod the ServiceAccount service that knows how to interact with k8s to manage them diff --git a/service/k8s/pod_test.go b/service/k8s/pod_test.go index eaf4e7feb..a61886d5a 100644 --- a/service/k8s/pod_test.go +++ b/service/k8s/pod_test.go @@ -13,9 +13,9 @@ import ( kubernetes "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/service/k8s" ) var ( diff --git a/service/k8s/poddisruptionbudget.go b/service/k8s/poddisruptionbudget.go index 48350bc43..90960d280 100644 --- a/service/k8s/poddisruptionbudget.go +++ b/service/k8s/poddisruptionbudget.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // PodDisruptionBudget the ServiceAccount service that knows how to interact with k8s to manage them diff --git a/service/k8s/poddisruptionbudget_test.go b/service/k8s/poddisruptionbudget_test.go index c2427859d..777c55bf5 100644 --- a/service/k8s/poddisruptionbudget_test.go +++ b/service/k8s/poddisruptionbudget_test.go @@ -13,9 +13,9 @@ import ( kubernetes "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/service/k8s" ) var podDisruptionBudgetsGroup = schema.GroupVersionResource{Group: "policy", Version: "v1", Resource: "poddisruptionbudgets"} diff --git a/service/k8s/rbac.go b/service/k8s/rbac.go index a5534b445..a1603e0a2 100644 --- a/service/k8s/rbac.go +++ b/service/k8s/rbac.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // RBAC is the service that knows how to interact with k8s to manage RBAC related resources. diff --git a/service/k8s/rbac_test.go b/service/k8s/rbac_test.go index d4f942adb..8ab0bef6c 100644 --- a/service/k8s/rbac_test.go +++ b/service/k8s/rbac_test.go @@ -13,9 +13,9 @@ import ( kubernetes "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/service/k8s" ) var ( diff --git a/service/k8s/redisfailover.go b/service/k8s/redisfailover.go index b533a1d5a..05ff88bd4 100644 --- a/service/k8s/redisfailover.go +++ b/service/k8s/redisfailover.go @@ -8,10 +8,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - redisfailoverclientset "github.com/spotahome/redis-operator/client/k8s/clientset/versioned" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + redisfailoverclientset "github.com/saremox/redis-operator/client/k8s/clientset/versioned" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // RedisFailover the RF service that knows how to interact with k8s to get them diff --git a/service/k8s/secret.go b/service/k8s/secret.go index 0edd23dea..153a65aaa 100644 --- a/service/k8s/secret.go +++ b/service/k8s/secret.go @@ -3,8 +3,8 @@ package k8s import ( "context" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/service/k8s/secret_test.go b/service/k8s/secret_test.go index f39dd0e71..76a77820c 100644 --- a/service/k8s/secret_test.go +++ b/service/k8s/secret_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/service/k8s/service.go b/service/k8s/service.go index 712cc4c0d..7e710d561 100644 --- a/service/k8s/service.go +++ b/service/k8s/service.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // Service the ServiceAccount service that knows how to interact with k8s to manage them diff --git a/service/k8s/service_test.go b/service/k8s/service_test.go index 7b3678e7e..b235daad8 100644 --- a/service/k8s/service_test.go +++ b/service/k8s/service_test.go @@ -13,9 +13,9 @@ import ( kubernetes "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/service/k8s" ) var ( diff --git a/service/k8s/statefulset.go b/service/k8s/statefulset.go index 38cc95ff2..b9ac3d43e 100644 --- a/service/k8s/statefulset.go +++ b/service/k8s/statefulset.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/labels" - "github.com/spotahome/redis-operator/operator/redisfailover/util" + "github.com/saremox/redis-operator/operator/redisfailover/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -16,8 +16,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // StatefulSet the StatefulSet service that knows how to interact with k8s to manage them diff --git a/service/k8s/statefulset_test.go b/service/k8s/statefulset_test.go index 1d6781767..3f7f94852 100644 --- a/service/k8s/statefulset_test.go +++ b/service/k8s/statefulset_test.go @@ -17,9 +17,9 @@ import ( kubernetes "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/service/k8s" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/service/k8s" ) var ( diff --git a/service/k8s/util.go b/service/k8s/util.go index 2cd9bbd73..b1db5faac 100644 --- a/service/k8s/util.go +++ b/service/k8s/util.go @@ -3,8 +3,8 @@ package k8s import ( "fmt" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - "github.com/spotahome/redis-operator/metrics" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + "github.com/saremox/redis-operator/metrics" "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/service/redis/client.go b/service/redis/client.go index 3364de495..59e96f0b1 100644 --- a/service/redis/client.go +++ b/service/redis/client.go @@ -10,8 +10,8 @@ import ( "strings" rediscli "github.com/go-redis/redis/v8" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" ) // Client defines the functions neccesary to connect to redis and sentinel to get or set what we nned diff --git a/test/integration/redisfailover/creation_test.go b/test/integration/redisfailover/creation_test.go index 5458634ba..715a937d0 100644 --- a/test/integration/redisfailover/creation_test.go +++ b/test/integration/redisfailover/creation_test.go @@ -25,14 +25,14 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" "k8s.io/client-go/util/homedir" - redisfailoverv1 "github.com/spotahome/redis-operator/api/redisfailover/v1" - redisfailoverclientset "github.com/spotahome/redis-operator/client/k8s/clientset/versioned" - "github.com/spotahome/redis-operator/cmd/utils" - "github.com/spotahome/redis-operator/log" - "github.com/spotahome/redis-operator/metrics" - "github.com/spotahome/redis-operator/operator/redisfailover" - "github.com/spotahome/redis-operator/service/k8s" - "github.com/spotahome/redis-operator/service/redis" + redisfailoverv1 "github.com/saremox/redis-operator/api/redisfailover/v1" + redisfailoverclientset "github.com/saremox/redis-operator/client/k8s/clientset/versioned" + "github.com/saremox/redis-operator/cmd/utils" + "github.com/saremox/redis-operator/log" + "github.com/saremox/redis-operator/metrics" + "github.com/saremox/redis-operator/operator/redisfailover" + "github.com/saremox/redis-operator/service/k8s" + "github.com/saremox/redis-operator/service/redis" ) const (