Merge pull request #2430 from fluxcd/update-project-in-errors-etc

Update project in errors etc
fluxcd · Sep 19, 2019 · 6be650b · 6be650b
2 parents 72424ed + 6968748
commit 6be650b
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 31 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ We gratefully welcome improvements to issues and documentation as well as to cod
 ## Working on issues
 
 If you like Flux and want to get involved in the project, a great way to get started
-is reviewing our [blocked-needs-validation](https://github.com/weaveworks/flux/issues?q=is%3Aissue+is%3Aopen+label%3Ablocked-needs-validation) issues.
+is reviewing our [blocked-needs-validation](https://github.com/fluxcd/flux/issues?q=is%3Aissue+is%3Aopen+label%3Ablocked-needs-validation) issues.
 
 The idea here is that new issues are confirmed, which might require asking
 for more information, testing with a fresh Flux environment. Once confirmed,
@@ -52,8 +52,8 @@ meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARD
 - If you want to contribute as a developer, continue reading this document for further instructions
 - If you are a new contributor, the following two issue labels might be
   interesting to you:
-  - [size/small](https://github.com/weaveworks/flux/issues?q=is%3Aissue+is%3Aopen+label%3Asize%2Fsmall)
-  - [help wanted](https://github.com/weaveworks/flux/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
+  - [size/small](https://github.com/fluxcd/flux/issues?q=is%3Aissue+is%3Aopen+label%3Asize%2Fsmall)
+  - [help wanted](https://github.com/fluxcd/flux/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
 - If you have questions, concerns, get stuck or need a hand, let us know
   on the Slack channel. We are happy to help and look forward to having
   you part of the team. No matter in which capacity.

diff --git a/api/v9/change_test.go b/api/v9/change_test.go
@@ -13,7 +13,7 @@ func TestChangeEncoding(t *testing.T) {
 	name := ref.Name
 
 	for _, update := range []Change{
-		{Kind: GitChange, Source: GitUpdate{URL: "git@github.com:weaveworks/flux"}},
+		{Kind: GitChange, Source: GitUpdate{URL: "git@github.com:fluxcd/flux"}},
 		{Kind: ImageChange, Source: ImageUpdate{Name: name}},
 	} {
 		bytes, err := json.Marshal(update)

diff --git a/chart/flux/README.md b/chart/flux/README.md
@@ -44,7 +44,7 @@ You will have a fully working Flux installation deploying workloads to your clus
 
 ### Installing the Chart
 
-Add the weaveworks repo:
+Add the Flux repo:
 
 ```sh
 helm repo add fluxcd https://charts.fluxcd.io
@@ -238,7 +238,7 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `registry.insecureHosts`                          | `None`                                               | Use HTTP rather than HTTPS for the image registry domains
 | `registry.cacheExpiry`                            | `None`                                               | Duration to keep cached image info (deprecated)
 | `registry.excludeImage`                           | `None`                                               | Do not scan images that match these glob expressions; if empty, 'k8s.gcr.io/*' images are excluded
-| `registry.useTimestampLabels`                     | `None`                                               | Allow usage of (RFC3339) timestamp labels from (canonical) image refs that match these glob expressions; if empty, 'index.docker.io/weaveworks/*' images are allowed
+| `registry.useTimestampLabels`                     | `None`                                               | Allow usage of (RFC3339) timestamp labels from (canonical) image refs that match these glob expressions; if empty, 'index.docker.io/{weaveworks,fluxcd}/*' images are allowed
 | `registry.ecr.region`                             | `None`                                               | Restrict ECR scanning to these AWS regions; if empty, only the cluster's region will be scanned
 | `registry.ecr.includeId`                          | `None`                                               | Restrict ECR scanning to these AWS account IDs; if empty, all account IDs that aren't excluded may be scanned
 | `registry.ecr.excludeId`                          | `602401143452`                                       | Do not scan ECR for images in these AWS account IDs; the default is to exclude the EKS system account
@@ -308,7 +308,7 @@ $ helm upgrade --install --wait flux \
 --set git.url=git@github.com:stefanprodan/k8s-podinfo \
 --set git.path="deploy/auto-scaling\,deploy/local-storage" \
 --namespace flux \
-weaveworks/flux
+fluxcd/flux
 ```
 
 ### Upgrade
@@ -318,5 +318,5 @@ Update Flux version with:
 ```sh
 helm upgrade --reuse-values flux \
 --set image.tag=1.8.1 \
-weaveworks/flux
+fluxcd/flux
 ```
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
@@ -149,7 +149,7 @@ sync:
   state: git
 
 git:
-  # URL of git repo with Kubernetes manifests; e.g. git.url=ssh://git@github.com/weaveworks/flux-get-started
+  # URL of git repo with Kubernetes manifests; e.g. git.url=ssh://git@github.com/fluxcd/flux-get-started
   url: ""
   # Branch of git repo to use for Kubernetes manifests
   branch: "master"

diff --git a/cluster/kubernetes/resource/spec.go b/cluster/kubernetes/resource/spec.go
@@ -22,7 +22,7 @@ type PodTemplate struct {
 
 func (t PodTemplate) Containers() []resource.Container {
 	var result []resource.Container
-	// FIXME(https://github.com/weaveworks/flux/issues/1269): account for possible errors (x2)
+	// FIXME(https://github.com/fluxcd/flux/issues/1269): account for possible errors (x2)
 	for _, c := range t.Spec.Containers {
 		im, _ := image.ParseRef(c.Image)
 		result = append(result, resource.Container{Name: c.Name, Image: im})

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
@@ -110,7 +110,7 @@ func main() {
 		kubernetesKubectl = fs.String("kubernetes-kubectl", "", "optional, explicit path to kubectl tool")
 		versionFlag       = fs.Bool("version", false, "get version number")
 		// Git repo & key etc.
-		gitURL       = fs.String("git-url", "", "URL of git repo with Kubernetes manifests; e.g., git@github.com:weaveworks/flux-get-started")
+		gitURL       = fs.String("git-url", "", "URL of git repo with Kubernetes manifests; e.g., git@github.com:fluxcd/flux-get-started")
 		gitBranch    = fs.String("git-branch", "master", "branch of git repo to use for Kubernetes manifests")
 		gitPath      = fs.StringSlice("git-path", []string{}, "relative paths within the git repo to locate Kubernetes manifests")
 		gitReadonly  = fs.Bool("git-readonly", false, fmt.Sprintf("use to prevent Flux from pushing changes to git; implies --sync-state=%s", fluxsync.NativeStateMode))

diff --git a/daemon/errors.go b/daemon/errors.go
@@ -62,7 +62,7 @@ If you get this error repeatedly, it's probably a bug. Please log an
 issue describing what you were attempting, and posting logs from the
 daemon if possible:
 
-    https://github.com/weaveworks/flux/issues
+    https://github.com/fluxcd/flux/issues
 
 `,
 	}

diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
@@ -61,7 +61,7 @@ spec:
       containers:
       - name: flux
         # There are no ":latest" images for flux. Find the most recent
-        # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
+        # release or image version at https://hub.docker.com/r/fluxcd/flux/tags
         # and replace the tag here.
         image: docker.io/fluxcd/flux:1.14.2
         imagePullPolicy: IfNotPresent
@@ -130,7 +130,7 @@ spec:
         - --ssh-keygen-dir=/var/fluxd/keygen
 
         # Replace the following URL to change the Git repository used by Flux.
-        - --git-url=git@github.com:weaveworks/flux-get-started
+        - --git-url=git@github.com:fluxcd/flux-get-started
         - --git-branch=master
         # include this if you want to restrict the manifests considered by flux
         # to those under the following relative paths in the git repository

diff --git a/docs/tutorials/driving-flux.md b/docs/tutorials/driving-flux.md
@@ -52,7 +52,7 @@ If you have never used Helm, you first need to
   > production.
 
 Now you can take care of the actual installation. First add the Flux
-repository of Weaveworks:
+chart repository:
 
 ```sh
 helm repo add fluxcd https://charts.fluxcd.io

diff --git a/errors/errors.go b/errors/errors.go
@@ -86,7 +86,7 @@ We don't have a specific help message for the error above.
 
 It would help us remedy this if you log an issue at
 
-    https://github.com/weaveworks/flux/issues
+    https://github.com/fluxcd/flux/issues
 
 saying what you were doing when you saw this, and quoting the message
 at the top.

diff --git a/git/url_test.go b/git/url_test.go
@@ -8,7 +8,7 @@ import (
 func TestSafeURL(t *testing.T) {
 	const password = "abc123"
 	for _, url := range []string{
-		"git@github.com:weaveworks/flux",
+		"git@github.com:fluxcd/flux",
 		"https://user@example.com:5050/repo.git",
 		"https://user:" + password + "@example.com:5050/repo.git",
 	} {

diff --git a/http/daemon/upstream.go b/http/daemon/upstream.go
@@ -41,7 +41,7 @@ type Upstream struct {
 }
 
 var (
-	ErrEndpointDeprecated = errors.New("Your fluxd version is deprecated - please upgrade, see https://github.com/weaveworks/flux/releases")
+	ErrEndpointDeprecated = errors.New("Your fluxd version is deprecated - please upgrade, see https://github.com/weaveworks/flux-adapter")
 	connectionDuration    = prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
 		Namespace: "flux",
 		Subsystem: "fluxd",

diff --git a/http/errors.go b/http/errors.go
@@ -12,11 +12,11 @@ var ErrorDeprecated = &fluxerr.Error{
 
 This indicates your client (fluxctl) needs to be updated: please see
 
-    https://github.com/weaveworks/flux/releases
+    https://github.com/fluxcd/flux/releases
 
 If you still have this problem after upgrading, please file an issue at
 
-    https://github.com/weaveworks/flux/issues
+    https://github.com/fluxcd/flux/issues
 
 mentioning what you were attempting to do.
 `,
@@ -44,13 +44,13 @@ func MakeAPINotFound(path string) *fluxerr.Error {
 This indicates that your client (probably fluxctl) is either out of
 date, or faulty. Please see
 
-    https://github.com/weaveworks/flux/releases
+    https://github.com/fluxcd/flux/releases
 
 for releases of fluxctl.
 
 If you still have problems, please file an issue at
 
-    https://github.com/weaveworks/flux/issues
+    https://github.com/fluxcd/flux/issues
 
 mentioning what you were attempting to do, and include this path:
 

diff --git a/install/generate.go b/install/generate.go
@@ -35,7 +35,7 @@ func main() {
 		}
 	case "deploy":
 		params := install.TemplateParameters{
-			GitURL:    "git@github.com:weaveworks/flux-get-started",
+			GitURL:    "git@github.com:fluxcd/flux-get-started",
 			GitBranch: "master",
 		}
 		manifests, err := install.FillInTemplates(params)

diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl
@@ -62,7 +62,7 @@ spec:
       containers:
       - name: flux
         # There are no ":latest" images for flux. Find the most recent
-        # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
+        # release or image version at https://hub.docker.com/r/fluxcd/flux/tags
         # and replace the tag here.
         image: docker.io/fluxcd/flux:1.14.2
         imagePullPolicy: IfNotPresent

diff --git a/registry/aws.go b/registry/aws.go
@@ -8,7 +8,7 @@ import (
 // References:
 //  - https://github.com/bzon/ecr-k8s-secret-creator
 //  - https://github.com/kubernetes/kubernetes/blob/master/pkg/credentialprovider/aws/aws_credentials.go
-//  - https://github.com/weaveworks/flux/pull/1455
+//  - https://github.com/fluxcd/flux/pull/1455
 
 import (
 	"strings"

diff --git a/remote/errors.go b/remote/errors.go
@@ -61,7 +61,7 @@ the following kinds of pod controller: Deployments, DaemonSets, StatefulSets
 and CronJobs. When new kinds are added to Kubernetes, we try to support them as
 quickly as possible - check here to see if a new version of Flux is available:
 
-	https://github.com/weaveworks/flux/releases
+	https://github.com/fluxcd/flux/releases
 
 Releasing by Service is not supported - if you're using an old version of
 fluxctl that accepts the '--service' argument you will need to get a new one

diff --git a/test/e2e/gitsrv.yaml b/test/e2e/gitsrv.yaml
@@ -22,7 +22,7 @@ spec:
         - name: REPO
           value: "cluster.git"
         - name: TAR_URL
-          value: "https://github.com/weaveworks/flux-get-started/archive/master.tar.gz"
+          value: "https://github.com/fluxcd/flux-get-started/archive/master.tar.gz"
         ports:
         - containerPort: 22
           name: ssh