Browse Source

Update org name in error help, other docs

This changes weaveworks->fluxcd in all the remaining places (after
changing imports) that it makes a material difference.

Not included:
 - test fixtures
 - references to container images or repositories that are still in
   weaveworks/ (or are hypothetical)
Michael Bridgen 1 month ago
parent
commit
69687487c0

+ 3
- 3
CONTRIBUTING.md View File

@@ -10,7 +10,7 @@ We gratefully welcome improvements to issues and documentation as well as to cod
10 10
 ## Working on issues
11 11
 
12 12
 If you like Flux and want to get involved in the project, a great way to get started
13
-is reviewing our [blocked-needs-validation](https://github.com/weaveworks/flux/issues?q=is%3Aissue+is%3Aopen+label%3Ablocked-needs-validation) issues.
13
+is reviewing our [blocked-needs-validation](https://github.com/fluxcd/flux/issues?q=is%3Aissue+is%3Aopen+label%3Ablocked-needs-validation) issues.
14 14
 
15 15
 The idea here is that new issues are confirmed, which might require asking
16 16
 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
52 52
 - If you want to contribute as a developer, continue reading this document for further instructions
53 53
 - If you are a new contributor, the following two issue labels might be
54 54
   interesting to you:
55
-  - [size/small](https://github.com/weaveworks/flux/issues?q=is%3Aissue+is%3Aopen+label%3Asize%2Fsmall)
56
-  - [help wanted](https://github.com/weaveworks/flux/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
55
+  - [size/small](https://github.com/fluxcd/flux/issues?q=is%3Aissue+is%3Aopen+label%3Asize%2Fsmall)
56
+  - [help wanted](https://github.com/fluxcd/flux/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
57 57
 - If you have questions, concerns, get stuck or need a hand, let us know
58 58
   on the Slack channel. We are happy to help and look forward to having
59 59
   you part of the team. No matter in which capacity.

+ 1
- 1
api/v9/change_test.go View File

@@ -13,7 +13,7 @@ func TestChangeEncoding(t *testing.T) {
13 13
 	name := ref.Name
14 14
 
15 15
 	for _, update := range []Change{
16
-		{Kind: GitChange, Source: GitUpdate{URL: "git@github.com:weaveworks/flux"}},
16
+		{Kind: GitChange, Source: GitUpdate{URL: "git@github.com:fluxcd/flux"}},
17 17
 		{Kind: ImageChange, Source: ImageUpdate{Name: name}},
18 18
 	} {
19 19
 		bytes, err := json.Marshal(update)

+ 4
- 4
chart/flux/README.md View File

@@ -44,7 +44,7 @@ You will have a fully working Flux installation deploying workloads to your clus
44 44
 
45 45
 ### Installing the Chart
46 46
 
47
-Add the weaveworks repo:
47
+Add the Flux repo:
48 48
 
49 49
 ```sh
50 50
 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
238 238
 | `registry.insecureHosts`                          | `None`                                               | Use HTTP rather than HTTPS for the image registry domains
239 239
 | `registry.cacheExpiry`                            | `None`                                               | Duration to keep cached image info (deprecated)
240 240
 | `registry.excludeImage`                           | `None`                                               | Do not scan images that match these glob expressions; if empty, 'k8s.gcr.io/*' images are excluded
241
-| `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
241
+| `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
242 242
 | `registry.ecr.region`                             | `None`                                               | Restrict ECR scanning to these AWS regions; if empty, only the cluster's region will be scanned
243 243
 | `registry.ecr.includeId`                          | `None`                                               | Restrict ECR scanning to these AWS account IDs; if empty, all account IDs that aren't excluded may be scanned
244 244
 | `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 \
308 308
 --set git.url=git@github.com:stefanprodan/k8s-podinfo \
309 309
 --set git.path="deploy/auto-scaling\,deploy/local-storage" \
310 310
 --namespace flux \
311
-weaveworks/flux
311
+fluxcd/flux
312 312
 ```
313 313
 
314 314
 ### Upgrade
@@ -318,5 +318,5 @@ Update Flux version with:
318 318
 ```sh
319 319
 helm upgrade --reuse-values flux \
320 320
 --set image.tag=1.8.1 \
321
-weaveworks/flux
321
+fluxcd/flux
322 322
 ```

+ 1
- 1
chart/flux/values.yaml View File

@@ -149,7 +149,7 @@ sync:
149 149
   state: git
150 150
 
151 151
 git:
152
-  # URL of git repo with Kubernetes manifests; e.g. git.url=ssh://git@github.com/weaveworks/flux-get-started
152
+  # URL of git repo with Kubernetes manifests; e.g. git.url=ssh://git@github.com/fluxcd/flux-get-started
153 153
   url: ""
154 154
   # Branch of git repo to use for Kubernetes manifests
155 155
   branch: "master"

+ 1
- 1
cluster/kubernetes/resource/spec.go View File

@@ -22,7 +22,7 @@ type PodTemplate struct {
22 22
 
23 23
 func (t PodTemplate) Containers() []resource.Container {
24 24
 	var result []resource.Container
25
-	// FIXME(https://github.com/weaveworks/flux/issues/1269): account for possible errors (x2)
25
+	// FIXME(https://github.com/fluxcd/flux/issues/1269): account for possible errors (x2)
26 26
 	for _, c := range t.Spec.Containers {
27 27
 		im, _ := image.ParseRef(c.Image)
28 28
 		result = append(result, resource.Container{Name: c.Name, Image: im})

+ 1
- 1
cmd/fluxd/main.go View File

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

+ 1
- 1
daemon/errors.go View File

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

+ 2
- 2
deploy/flux-deployment.yaml View File

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

+ 1
- 1
docs/tutorials/driving-flux.md View File

@@ -52,7 +52,7 @@ If you have never used Helm, you first need to
52 52
   > production.
53 53
 
54 54
 Now you can take care of the actual installation. First add the Flux
55
-repository of Weaveworks:
55
+chart repository:
56 56
 
57 57
 ```sh
58 58
 helm repo add fluxcd https://charts.fluxcd.io

+ 1
- 1
errors/errors.go View File

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

+ 1
- 1
git/url_test.go View File

@@ -8,7 +8,7 @@ import (
8 8
 func TestSafeURL(t *testing.T) {
9 9
 	const password = "abc123"
10 10
 	for _, url := range []string{
11
-		"git@github.com:weaveworks/flux",
11
+		"git@github.com:fluxcd/flux",
12 12
 		"https://user@example.com:5050/repo.git",
13 13
 		"https://user:" + password + "@example.com:5050/repo.git",
14 14
 	} {

+ 1
- 1
http/daemon/upstream.go View File

@@ -41,7 +41,7 @@ type Upstream struct {
41 41
 }
42 42
 
43 43
 var (
44
-	ErrEndpointDeprecated = errors.New("Your fluxd version is deprecated - please upgrade, see https://github.com/weaveworks/flux/releases")
44
+	ErrEndpointDeprecated = errors.New("Your fluxd version is deprecated - please upgrade, see https://github.com/weaveworks/flux-adapter")
45 45
 	connectionDuration    = prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
46 46
 		Namespace: "flux",
47 47
 		Subsystem: "fluxd",

+ 4
- 4
http/errors.go View File

@@ -12,11 +12,11 @@ var ErrorDeprecated = &fluxerr.Error{
12 12
 
13 13
 This indicates your client (fluxctl) needs to be updated: please see
14 14
 
15
-    https://github.com/weaveworks/flux/releases
15
+    https://github.com/fluxcd/flux/releases
16 16
 
17 17
 If you still have this problem after upgrading, please file an issue at
18 18
 
19
-    https://github.com/weaveworks/flux/issues
19
+    https://github.com/fluxcd/flux/issues
20 20
 
21 21
 mentioning what you were attempting to do.
22 22
 `,
@@ -44,13 +44,13 @@ func MakeAPINotFound(path string) *fluxerr.Error {
44 44
 This indicates that your client (probably fluxctl) is either out of
45 45
 date, or faulty. Please see
46 46
 
47
-    https://github.com/weaveworks/flux/releases
47
+    https://github.com/fluxcd/flux/releases
48 48
 
49 49
 for releases of fluxctl.
50 50
 
51 51
 If you still have problems, please file an issue at
52 52
 
53
-    https://github.com/weaveworks/flux/issues
53
+    https://github.com/fluxcd/flux/issues
54 54
 
55 55
 mentioning what you were attempting to do, and include this path:
56 56
 

+ 1
- 1
install/generate.go View File

@@ -35,7 +35,7 @@ func main() {
35 35
 		}
36 36
 	case "deploy":
37 37
 		params := install.TemplateParameters{
38
-			GitURL:    "git@github.com:weaveworks/flux-get-started",
38
+			GitURL:    "git@github.com:fluxcd/flux-get-started",
39 39
 			GitBranch: "master",
40 40
 		}
41 41
 		manifests, err := install.FillInTemplates(params)

+ 4
- 4
install/generated_templates.gogen.go
File diff suppressed because it is too large
View File


+ 1
- 1
install/templates/flux-deployment.yaml.tmpl View File

@@ -62,7 +62,7 @@ spec:
62 62
       containers:
63 63
       - name: flux
64 64
         # There are no ":latest" images for flux. Find the most recent
65
-        # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
65
+        # release or image version at https://hub.docker.com/r/fluxcd/flux/tags
66 66
         # and replace the tag here.
67 67
         image: docker.io/fluxcd/flux:1.14.2
68 68
         imagePullPolicy: IfNotPresent

+ 1
- 1
registry/aws.go View File

@@ -8,7 +8,7 @@ import (
8 8
 // References:
9 9
 //  - https://github.com/bzon/ecr-k8s-secret-creator
10 10
 //  - https://github.com/kubernetes/kubernetes/blob/master/pkg/credentialprovider/aws/aws_credentials.go
11
-//  - https://github.com/weaveworks/flux/pull/1455
11
+//  - https://github.com/fluxcd/flux/pull/1455
12 12
 
13 13
 import (
14 14
 	"strings"

+ 1
- 1
remote/errors.go View File

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

+ 1
- 1
test/e2e/gitsrv.yaml View File

@@ -22,7 +22,7 @@ spec:
22 22
         - name: REPO
23 23
           value: "cluster.git"
24 24
         - name: TAR_URL
25
-          value: "https://github.com/weaveworks/flux-get-started/archive/master.tar.gz"
25
+          value: "https://github.com/fluxcd/flux-get-started/archive/master.tar.gz"
26 26
         ports:
27 27
         - containerPort: 22
28 28
           name: ssh

Loading…
Cancel
Save