Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Update project in errors etc #2430

Merged
merged 1 commit into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion api/v9/change_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions chart/flux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -318,5 +318,5 @@ Update Flux version with:
```sh
helm upgrade --reuse-values flux \
--set image.tag=1.8.1 \
weaveworks/flux
fluxcd/flux
```
2 changes: 1 addition & 1 deletion chart/flux/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cluster/kubernetes/resource/spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluxd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion daemon/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

`,
}
Expand Down
4 changes: 2 additions & 2 deletions deploy/flux-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/driving-flux.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion git/url_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
} {
Expand Down
2 changes: 1 addition & 1 deletion http/daemon/upstream.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions http/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
`,
Expand Down Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion install/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions install/generated_templates.gogen.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion install/templates/flux-deployment.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion registry/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion remote/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/gitsrv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down