Change imports path from weaveworks to fluxcd

fluxcd · Jul 29, 2019 · 338ccdc · 338ccdc
1 parent e50dda2
commit 338ccdc
Show file tree

Hide file tree

Showing 184 changed files with 541 additions and 543 deletions.
diff --git a/Makefile b/Makefile
@@ -53,7 +53,7 @@ realclean: clean
 	rm -rf ./cache
 
 test: test/bin/helm test/bin/kubectl test/bin/kustomize
-	PATH="${PWD}/bin:${PWD}/test/bin:${PATH}" go test ${TEST_FLAGS} $(shell go list ./... | grep -v "^github.com/weaveworks/flux/vendor" | sort -u)
+	PATH="${PWD}/bin:${PWD}/test/bin:${PATH}" go test ${TEST_FLAGS} $(shell go list ./... | grep -v "^github.com/fluxcd/flux/vendor" | sort -u)
 
 e2e: test/bin/helm test/bin/kubectl build/.flux.done build/.helm-operator.done
 	PATH="${PWD}/test/bin:${PATH}" CURRENT_OS_ARCH=$(CURRENT_OS_ARCH) test/e2e/run.sh
@@ -122,8 +122,6 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-
-
 generate-deploy: install/generated_templates.gogen.go
 	cd deploy && go run ../install/generate.go deploy
 

diff --git a/api/api.go b/api/api.go
@@ -1,6 +1,6 @@
 package api
 
-import "github.com/weaveworks/flux/api/v11"
+import "github.com/fluxcd/flux/api/v11"
 
 // Server defines the minimal interface a Flux must satisfy to adequately serve a
 // connecting fluxctl. This interface specifically does not facilitate connecting

diff --git a/api/v10/api.go b/api/v10/api.go
@@ -4,9 +4,9 @@ package v10
 import (
 	"context"
 
-	"github.com/weaveworks/flux/api/v6"
-	"github.com/weaveworks/flux/api/v9"
-	"github.com/weaveworks/flux/update"
+	"github.com/fluxcd/flux/api/v6"
+	"github.com/fluxcd/flux/api/v9"
+	"github.com/fluxcd/flux/update"
 )
 
 type ListImagesOptions struct {

diff --git a/api/v11/api.go b/api/v11/api.go
@@ -4,9 +4,9 @@ package v11
 import (
 	"context"
 
-	"github.com/weaveworks/flux/api/v10"
-	"github.com/weaveworks/flux/api/v6"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/api/v10"
+	"github.com/fluxcd/flux/api/v6"
+	"github.com/fluxcd/flux/resource"
 )
 
 type ListServicesOptions struct {

diff --git a/api/v6/api.go b/api/v6/api.go
@@ -3,12 +3,12 @@ package v6
 import (
 	"context"
 
-	"github.com/weaveworks/flux/cluster"
-	"github.com/weaveworks/flux/git"
-	"github.com/weaveworks/flux/job"
-	"github.com/weaveworks/flux/resource"
-	"github.com/weaveworks/flux/ssh"
-	"github.com/weaveworks/flux/update"
+	"github.com/fluxcd/flux/cluster"
+	"github.com/fluxcd/flux/git"
+	"github.com/fluxcd/flux/job"
+	"github.com/fluxcd/flux/resource"
+	"github.com/fluxcd/flux/ssh"
+	"github.com/fluxcd/flux/update"
 )
 
 type ImageStatus struct {

diff --git a/api/v6/container.go b/api/v6/container.go
@@ -2,10 +2,10 @@ package v6
 
 import (
 	"github.com/pkg/errors"
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/policy"
-	"github.com/weaveworks/flux/registry"
-	"github.com/weaveworks/flux/update"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/policy"
+	"github.com/fluxcd/flux/registry"
+	"github.com/fluxcd/flux/update"
 )
 
 // Container describes an individual container including current image info and

diff --git a/api/v6/container_test.go b/api/v6/container_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/policy"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/policy"
 )
 
 func TestNewContainer(t *testing.T) {

diff --git a/api/v9/api.go b/api/v9/api.go
@@ -4,7 +4,7 @@ package v9
 import (
 	"context"
 
-	"github.com/weaveworks/flux/api/v6"
+	"github.com/fluxcd/flux/api/v6"
 )
 
 type Server interface {

diff --git a/api/v9/change.go b/api/v9/change.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/weaveworks/flux/image"
+	"github.com/fluxcd/flux/image"
 )
 
 type ChangeKind string

diff --git a/api/v9/change_test.go b/api/v9/change_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/weaveworks/flux/image"
+	"github.com/fluxcd/flux/image"
 )
 
 func TestChangeEncoding(t *testing.T) {

diff --git a/bin/helm/update_codegen.sh b/bin/helm/update_codegen.sh
@@ -8,8 +8,8 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
 CODEGEN_PKG=${CODEGEN_PKG:-$(echo `go env GOPATH`'/pkg/mod/k8s.io/[email protected]')}
 
 go mod download # make sure the code-generator is downloaded
-env GOPATH=`go env GOPATH` bash ${CODEGEN_PKG}/generate-groups.sh all github.com/weaveworks/flux/integrations/client \
-              github.com/weaveworks/flux/integrations/apis \
+env GOPATH=`go env GOPATH` bash ${CODEGEN_PKG}/generate-groups.sh all github.com/fluxcd/flux/integrations/client \
+              github.com/fluxcd/flux/integrations/apis \
               "flux.weave.works:v1beta1 helm.integrations.flux.weave.works:v1alpha2" \
   --go-header-file "${SCRIPT_ROOT}/bin/helm/custom-boilerplate.go.txt"
 
diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 
-	"github.com/weaveworks/flux/policy"
-	"github.com/weaveworks/flux/resource"
-	"github.com/weaveworks/flux/ssh"
+	"github.com/fluxcd/flux/policy"
+	"github.com/fluxcd/flux/resource"
+	"github.com/fluxcd/flux/ssh"
 )
 
 // Constants for workload ready status. These are defined here so that

diff --git a/cluster/kubernetes/errors.go b/cluster/kubernetes/errors.go
@@ -3,7 +3,7 @@ package kubernetes
 import (
 	"fmt"
 
-	fluxerr "github.com/weaveworks/flux/errors"
+	fluxerr "github.com/fluxcd/flux/errors"
 )
 
 func ObjectMissingError(obj string, err error) *fluxerr.Error {

diff --git a/cluster/kubernetes/images.go b/cluster/kubernetes/images.go
@@ -11,9 +11,9 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/registry"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/registry"
+	"github.com/fluxcd/flux/resource"
 )
 
 func mergeCredentials(log func(...interface{}) error,

diff --git a/cluster/kubernetes/images_test.go b/cluster/kubernetes/images_test.go
@@ -9,8 +9,8 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/fake"
 
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/registry"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/registry"
 )
 
 func noopLog(...interface{}) error {

diff --git a/cluster/kubernetes/kubernetes.go b/cluster/kubernetes/kubernetes.go
@@ -17,11 +17,11 @@ import (
 	k8sclientdynamic "k8s.io/client-go/dynamic"
 	k8sclient "k8s.io/client-go/kubernetes"
 
-	"github.com/weaveworks/flux/cluster"
-	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
-	fhrclient "github.com/weaveworks/flux/integrations/client/clientset/versioned"
-	"github.com/weaveworks/flux/ssh"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/cluster"
+	kresource "github.com/fluxcd/flux/cluster/kubernetes/resource"
+	fhrclient "github.com/fluxcd/flux/integrations/client/clientset/versioned"
+	"github.com/fluxcd/flux/ssh"
+	"github.com/fluxcd/flux/resource"
 )
 
 type coreClient k8sclient.Interface

diff --git a/cluster/kubernetes/manifests.go b/cluster/kubernetes/manifests.go
@@ -10,9 +10,9 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/resource"
+	kresource "github.com/fluxcd/flux/cluster/kubernetes/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/resource"
 )
 
 // ResourceScopes maps resource definitions (GroupVersionKind) to whether they are namespaced or not

diff --git a/cluster/kubernetes/manifests_test.go b/cluster/kubernetes/manifests_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/weaveworks/flux/cluster/kubernetes/testfiles"
+	"github.com/fluxcd/flux/cluster/kubernetes/testfiles"
 )
 
 func TestLocalCRDScope(t *testing.T) {

diff --git a/cluster/kubernetes/mock.go b/cluster/kubernetes/mock.go
@@ -1,6 +1,6 @@
 package kubernetes
 
-import kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
+import kresource "github.com/fluxcd/flux/cluster/kubernetes/resource"
 
 type ConstNamespacer string
 

diff --git a/cluster/kubernetes/namespacer.go b/cluster/kubernetes/namespacer.go
@@ -8,7 +8,7 @@ import (
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/tools/clientcmd"
 
-	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
+	kresource "github.com/fluxcd/flux/cluster/kubernetes/resource"
 )
 
 // The namespace to presume if something doesn't have one, and we

diff --git a/cluster/kubernetes/namespacer_test.go b/cluster/kubernetes/namespacer_test.go
@@ -8,7 +8,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corefake "k8s.io/client-go/kubernetes/fake"
 
-	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
+	kresource "github.com/fluxcd/flux/cluster/kubernetes/resource"
 )
 
 var getAndList = metav1.Verbs([]string{"get", "list"})

diff --git a/cluster/kubernetes/patch.go b/cluster/kubernetes/patch.go
@@ -15,8 +15,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	k8sscheme "k8s.io/client-go/kubernetes/scheme"
 
-	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
-	"github.com/weaveworks/flux/resource"
+	kresource "github.com/fluxcd/flux/cluster/kubernetes/resource"
+	"github.com/fluxcd/flux/resource"
 )
 
 func createManifestPatch(originalManifests, modifiedManifests []byte, originalSource, modifiedSource string) ([]byte, error) {

diff --git a/cluster/kubernetes/patch_test.go b/cluster/kubernetes/patch_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
 
-	"github.com/weaveworks/flux/cluster/kubernetes/resource"
+	"github.com/fluxcd/flux/cluster/kubernetes/resource"
 )
 
 func TestPatchAndApply(t *testing.T) {

diff --git a/cluster/kubernetes/policies.go b/cluster/kubernetes/policies.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
-	"github.com/weaveworks/flux/resource"
+	kresource "github.com/fluxcd/flux/cluster/kubernetes/resource"
+	"github.com/fluxcd/flux/resource"
 )
 
 func (m *manifests) UpdateWorkloadPolicies(def []byte, id resource.ID, update resource.PolicyUpdate) ([]byte, error) {

diff --git a/cluster/kubernetes/policies_test.go b/cluster/kubernetes/policies_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux/policy"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/policy"
+	"github.com/fluxcd/flux/resource"
 )
 
 func TestUpdatePolicies(t *testing.T) {

diff --git a/cluster/kubernetes/resource/cronjob.go b/cluster/kubernetes/resource/cronjob.go
@@ -1,8 +1,8 @@
 package resource
 
 import (
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/resource"
 )
 
 type CronJob struct {

diff --git a/cluster/kubernetes/resource/daemonset.go b/cluster/kubernetes/resource/daemonset.go
@@ -1,8 +1,8 @@
 package resource
 
 import (
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/resource"
 )
 
 type DaemonSet struct {

diff --git a/cluster/kubernetes/resource/deployment.go b/cluster/kubernetes/resource/deployment.go
@@ -1,8 +1,8 @@
 package resource
 
 import (
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/resource"
 )
 
 type Deployment struct {

diff --git a/cluster/kubernetes/resource/fluxhelmrelease.go b/cluster/kubernetes/resource/fluxhelmrelease.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/resource"
 )
 
 // ReleaseContainerName is the name used when Flux interprets a

diff --git a/cluster/kubernetes/resource/fluxhelmrelease_test.go b/cluster/kubernetes/resource/fluxhelmrelease_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/resource"
 )
 
 func TestParseImageOnlyFormat(t *testing.T) {

diff --git a/cluster/kubernetes/resource/load_test.go b/cluster/kubernetes/resource/load_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux/cluster/kubernetes/testfiles"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/cluster/kubernetes/testfiles"
+	"github.com/fluxcd/flux/resource"
 )
 
 // for convenience

diff --git a/cluster/kubernetes/resource/resource.go b/cluster/kubernetes/resource/resource.go
@@ -5,9 +5,9 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	fluxerr "github.com/weaveworks/flux/errors"
-	"github.com/weaveworks/flux/policy"
-	"github.com/weaveworks/flux/resource"
+	fluxerr "github.com/fluxcd/flux/errors"
+	"github.com/fluxcd/flux/policy"
+	"github.com/fluxcd/flux/resource"
 )
 
 const (

diff --git a/cluster/kubernetes/resource/spec.go b/cluster/kubernetes/resource/spec.go
@@ -3,8 +3,8 @@ package resource
 import (
 	"fmt"
 
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/resource"
 )
 
 // Types that daemonsets, deployments, and other things have in

diff --git a/cluster/kubernetes/resource/statefulset.go b/cluster/kubernetes/resource/statefulset.go
@@ -1,8 +1,8 @@
 package resource
 
 import (
-	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/resource"
+	"github.com/fluxcd/flux/image"
+	"github.com/fluxcd/flux/resource"
 )
 
 type StatefulSet struct {