From 69687487c0cbdd0076187aac94329bf38859f342 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Thu, 5 Sep 2019 11:52:09 +0100 Subject: [PATCH] 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) --- CONTRIBUTING.md | 6 +++--- api/v9/change_test.go | 2 +- chart/flux/README.md | 8 ++++---- chart/flux/values.yaml | 2 +- cluster/kubernetes/resource/spec.go | 2 +- cmd/fluxd/main.go | 2 +- daemon/errors.go | 2 +- deploy/flux-deployment.yaml | 4 ++-- docs/tutorials/driving-flux.md | 2 +- errors/errors.go | 2 +- git/url_test.go | 2 +- http/daemon/upstream.go | 2 +- http/errors.go | 8 ++++---- install/generate.go | 2 +- install/generated_templates.gogen.go | 8 ++++---- install/templates/flux-deployment.yaml.tmpl | 2 +- registry/aws.go | 2 +- remote/errors.go | 2 +- test/e2e/gitsrv.yaml | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a8c8bbb8f..afaf15813 100644 --- 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 index 81ff25d42..5c9acc6a5 100644 --- 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 index 14b1f89e8..9e3a97070 100755 --- 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 index 6d95315e9..58d5b48d3 100644 --- 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 index 81e53c219..8a0f14779 100644 --- 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 index f12ddddf3..a992bf0a1 100644 --- 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 index 22672264b..23461f760 100644 --- 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 index ed0797dfc..519a4879e 100644 --- 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 index 28011725f..a3bad3e2e 100644 --- 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 index 0f22851b9..dc2aa59e2 100644 --- 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 index b119010f3..24510d65c 100644 --- 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 index 984bc9f91..2f5e9e035 100644 --- 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 index d5f8cd305..c5e90ecb8 100644 --- 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 index 4ff62e6f2..680162ff3 100644 --- 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 index a59630181..992de854d 100644 --- a/install/generated_templates.gogen.go +++ b/install/generated_templates.gogen.go @@ -19,7 +19,7 @@ var templates = func() http.FileSystem { fs := vfsgen۰FS{ "/": &vfsgen۰DirInfo{ name: "/", - modTime: time.Date(2019, 9, 2, 10, 53, 11, 743589615, time.UTC), + modTime: time.Date(2019, 9, 5, 10, 37, 50, 538727977, time.UTC), }, "/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "flux-account.yaml.tmpl", @@ -30,10 +30,10 @@ var templates = func() http.FileSystem { }, "/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "flux-deployment.yaml.tmpl", - modTime: time.Date(2019, 9, 2, 10, 53, 11, 735589583, time.UTC), - uncompressedSize: 6456, + modTime: time.Date(2019, 9, 5, 10, 37, 50, 530727937, time.UTC), + uncompressedSize: 6452, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x5f\x6f\x1b\xb9\x11\x7f\xf7\xa7\x18\x28\x0f\x49\x00\x69\x65\xc7\xb9\x43\xb1\x57\x1f\x90\x4b\x2e\x6e\x9a\x8b\x63\xc4\x4d\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\x52\x3a\xc1\xb8\xef\x5e\x0c\xb9\x7f\xb8\x96\x9c\x1c\xf2\xd6\x3c\xc4\x36\x77\xfe\xcf\xf0\x37\x33\x5c\x2c\x16\x67\xa2\x55\xff\x44\x47\xca\x9a\x12\x44\xdb\xd2\x72\x77\x71\xb6\x55\xa6\x2a\xe1\x0d\xb6\xda\x1e\x1a\x34\xfe\xac\x41\x2f\x2a\xe1\x45\x79\x06\x60\x44\x83\x25\xac\x75\xf8\xfd\xfe\x1e\xd4\x1a\x8a\x1b\xd1\x20\xb5\x42\x22\xfc\xf1\x47\xf7\x3d\xfe\x59\xc2\xfd\xfd\xf4\xeb\xfd\x3d\xa0\xa9\x98\x8c\x5a\x94\x2c\xcc\x61\xab\x95\x14\x54\xc2\xc5\x19\x00\xa1\x46\xe9\xad\xe3\x2f\x00\x8d\xf0\xb2\xfe\x4d\xac\x50\x53\x3a\xc8\x75\x33\xb5\x77\xc2\xe3\xe6\x90\x3e\xfa\x43\x8b\x25\x7c\x42\xe9\x50\x78\x3c\x03\xf0\xd8\xb4\x5a\x78\xec\x84\x65\x1e\xf0\x3f\x61\x8c\xf5\xc2\x2b\x6b\x06\xe1\x00\xad\xb3\x0d\xfa\x1a\x03\x15\xca\x2e\x5b\xeb\x7c\x09\xb3\xcb\xf3\xcb\x8b\x19\x3c\x01\x8f\x5a\x67\x14\xe0\x2d\x90\x74\xa2\x45\x58\x36\xe8\x9d\x92\xc4\xce\xb5\x56\x19\xff\x94\x80\x99\x8b\x4e\xb0\x9e\xf8\xf0\xc0\x0b\x80\x3e\x16\xf1\x77\x74\x3b\x25\xf1\x95\x94\x36\x18\x7f\x33\x25\x04\xd8\x59\x1d\x1a\x1c\x44\x2d\x3a\x51\x1b\xe5\x17\x5b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x55\x4c\x70\x46\x55\xe1\x5a\x04\xed\x3f\xd8\x0a\x4b\x38\x7f\x79\x7e\x0e\x4f\x60\x5f\xa3\x81\x86\xad\xc1\x0a\x1c\x8a\x6a\x61\x8d\x3e\xcc\x61\x8f\xb0\xb7\xe6\xa9\x87\x15\x82\x58\x69\xe4\x78\xc8\xba\xb1\xd5\x59\x27\xf0\x09\xfc\xa3\x56\x04\x8a\x40\x80\x6f\xda\x35\x41\x20\xac\x60\x6d\x1d\x6c\xd0\xa0\x13\x5e\x99\x0d\xdc\xdd\xfd\x0d\xb6\x78\xa0\x02\xde\x19\x78\xff\x17\x82\x9f\xaf\xe0\xa2\xb8\x38\x9f\x0f\x52\x7a\xdd\xc9\x05\x02\xe1\x30\xb7\x83\x2c\x9b\x62\x10\x2b\x10\x40\xd8\x0a\x2e\x8a\x2e\x50\xb0\xc7\x41\x8c\x14\x06\xf6\x4e\x79\x36\xb4\x38\x1d\xbf\x0d\x9a\x21\x18\xd8\xb4\xfe\xf0\x46\xb9\x3c\x88\x0d\x56\x2a\x34\x25\x7c\xc0\xc6\xba\x43\xee\x27\xc2\xda\x6a\x6d\xf7\xec\x51\xa7\x5a\x51\x74\x35\x10\x9f\x09\x90\x81\xbc\x6d\x14\x47\x60\x6b\xec\xde\xfc\xa7\xb6\xe4\x69\x10\xb1\x56\x1a\xe7\xb0\xaf\x95\xac\xe1\x60\x03\xec\x95\xd6\xc9\x29\x6f\xa1\xb2\x7c\xcf\xf8\x98\x99\xf8\x17\x07\x76\x6f\xd8\xec\x41\x80\xc3\xd6\x82\x13\xbe\x46\x07\xbe\x16\xa6\x53\xbc\x51\xbe\x0e\x2b\xb0\x7c\x88\xa0\xd5\x16\x0b\xf8\xb7\x0d\x4f\xb5\x06\xa1\xc9\xf6\x2a\xa6\xc1\x06\xe5\x41\x19\x6f\x23\x8f\xb4\xc6\x0b\x65\xd0\xcd\x61\x85\xda\xee\x0b\xb8\xc3\x31\xaa\xb5\xf7\x2d\x95\xcb\x65\x65\x25\x15\x5c\x58\xb2\xe2\xab\x83\x66\xc9\x57\x8f\xfc\x72\x13\x54\x85\xb4\x0c\x84\x8b\xd6\xa9\x9d\xf0\x18\x4b\x8f\x1d\x29\x6a\xdf\xe8\x41\x52\x9f\x0b\xa2\x7a\x21\xad\x59\xab\xcd\xf0\x09\x20\x1d\x7c\x10\x6d\x99\x1d\xe6\x17\x69\x91\xb1\x7d\x6f\x5e\x8a\x6d\x58\xe1\x32\x09\x19\xcb\xef\x9b\x39\xd9\x2b\xaa\xf9\xa4\x16\x3b\x04\x01\x95\x5a\xaf\xd1\x31\x68\xf6\x12\xba\x5b\x35\x02\x63\x4c\x41\x12\x97\x27\x81\xc1\x65\xa7\x2a\xec\xc3\xbe\x56\x9b\x46\xb4\xa3\x21\xca\xd7\x20\x0c\xa0\xf1\xee\x10\x7d\xf8\x92\x88\xbe\xcc\x41\x98\x0a\x82\x91\xb6\x61\xb4\x8e\xfc\xc9\xdb\x0f\x31\x9d\xc2\x54\x83\x14\x34\xbb\x28\x41\x21\x75\xf9\x3c\xca\x00\x87\xe1\x3b\x32\x90\xb1\x7d\x33\x03\x11\x09\xbc\x05\xd5\x30\x4e\xc2\xf5\xed\x75\x04\x01\x78\xc6\x6e\x91\xda\x18\x65\x46\xe5\xec\xdc\x0e\x9d\x5a\x2b\x19\x01\x1b\xda\xe0\x5a\x4b\x48\xcf\xff\x44\x20\x07\x29\x09\x3e\x52\x14\x39\x40\xac\xef\x4f\x04\x0e\x84\xdb\x8c\xd7\xf4\x91\x88\x6d\xda\x0d\xe3\x07\x65\xa1\x99\x42\xf0\x93\x47\x40\xf8\x98\xef\x04\x08\xf7\xe1\x1c\x6e\xe2\x11\xfe\x67\x1d\xa2\x8b\xba\xc3\x88\x93\xc6\xc2\xac\x4c\x37\x71\x06\xaa\x11\x1b\x4c\xd5\xcf\x0c\x05\xbc\x55\xa6\x8a\x3e\x37\x0c\x2b\x0e\xe5\x58\xb5\x09\x52\x34\x0a\x42\x06\x8f\xc8\xca\x49\xe0\x39\x01\x84\x1f\xee\x7d\x1d\x56\x45\x65\xe5\x16\x5d\x21\x6d\xb3\x74\xcb\x3d\x8a\x1d\xee\xad\xdb\xd2\x92\x95\x2c\xbd\x18\xc2\xd7\xe7\x92\x7b\x3e\xcf\x03\xac\xd9\x8b\x0d\xb0\xb5\xc5\x40\x13\x55\x95\xd0\x09\x55\x76\x99\x50\x25\xfe\x28\x2f\x8a\x8b\x97\xc5\x8b\x29\xed\x6d\xd0\xfa\xd6\x6a\x25\x0f\x25\xbc\x5b\xdf\x58\x7f\xeb\x90\x72\x4f\x1c\x92\x0d\x4e\x22\xe5\x58\xee\xf0\xbf\x01\xc9\x4f\xce\x00\x64\x1b\x4a\xf8\xe1\xbc\x99\x1c\x36\x11\xee\x4b\xf8\xf1\xe5\x07\x35\x8e\x0a\xd6\xe5\xcc\x8b\x31\x3b\xb7\x71\x6c\xb8\x3c\xbf\xe4\xee\xa9\xcc\xda\xba\x26\x96\xad\xd0\x03\xb5\x56\x3b\x34\x48\x74\xeb\xec\x0a\x73\x0b\x38\xac\xd7\xd3\xce\x9d\x54\x25\x81\xd3\x63\xe1\xeb\x12\x96\xa2\x55\x29\xd2\xbb\x1f\x97\xaa\x42\xe3\x95\x3f\x14\x6d\x58\x65\xb4\xca\x28\xaf\x84\x7e\x83\x5a\x1c\xee\xf8\x8e\x56\x54\xc2\x0f\x19\x81\x57\x0d\xda\xe0\x4f\x7c\xe3\x46\xab\xfe\x3f\x4c\xcd\x2e\xee\x24\x31\xa7\x47\x24\x48\xad\xee\x36\x59\x86\x5e\x46\xcb\xaa\x25\x51\xcd\xb3\x9e\x4d\xd3\x27\x68\xdb\x61\xce\x86\x53\x06\xca\xa4\x9a\x7b\x4a\x89\x87\xa8\x5e\x4e\xa0\xb2\x8f\xd9\x47\xa3\x0f\x25\x78\x17\x90\xa5\xf1\x1c\x14\x51\x6a\xd5\x81\x3b\x5f\xab\x16\xdd\xda\x3a\x89\x2c\x34\x0d\x3e\x3c\xf7\x3c\x66\x78\x3e\x9b\x4c\x6d\xdf\x09\xd7\xd9\x9e\xc8\xbe\xcf\xfc\xec\x8e\xbe\x33\x52\x87\x88\x9e\x3c\xbe\xa5\x26\xd7\x23\x6b\x9a\x0f\xbe\x31\xce\xf4\x03\xcd\x4f\xcc\xfa\x60\xd4\x18\x10\x16\x2a\x94\x5a\x38\x1e\xdb\x56\x76\x97\x01\xc0\x57\x46\x81\x04\x91\xb9\xf3\xce\x5a\xbf\x2c\x88\xea\x47\x1d\x10\x66\xa2\x75\x36\xb6\xa9\x59\xd2\x3c\xef\x49\x32\x09\x68\x76\xca\x59\x13\x9b\x42\xea\xb7\xb3\xf7\x9f\x7f\xf9\xf5\xf5\xc7\x9b\xb7\xef\xae\x67\xa9\x0d\xcc\x39\x1e\x76\x87\xce\x4d\x7b\x76\x26\x26\xb6\xb9\xd5\x21\x75\x54\xaf\x4f\xf9\x78\xd4\x6c\x8f\x7d\x1c\x8b\x93\x89\x1f\x75\x94\xfb\x1e\x2f\x1f\xbd\x36\x86\xe9\x6c\x1c\xe9\xac\x8b\x39\xc9\x44\x3c\x1c\x6a\xf2\xa4\xc7\x89\xa6\x1f\xbf\x85\x01\xa1\x3d\x3a\xc3\xe3\xf5\x91\xc5\x6b\x67\x1b\x2e\x8b\x7e\x6a\x99\x83\x20\x2e\xb7\xae\xb3\x72\x18\xb4\x95\x5b\x3a\x4e\x36\x9a\x5d\x79\x22\x2e\x63\xb8\x27\x71\xd9\x09\x1d\xf0\x28\x26\xdf\x2a\xe2\x87\x35\xd0\xf7\xdd\xaf\x54\x00\xb7\xfd\x69\xbb\xff\x4a\xc3\x7f\xa4\x2e\x99\x2a\x4d\x38\x13\xba\x29\x3e\x8c\x46\xb3\xca\x72\xe2\x43\x4a\x43\x5a\xd3\xb0\xe2\x46\x24\x85\xac\xb1\xe2\xc8\xe6\xa9\x1d\x26\x4b\x4e\x22\x87\x65\x9e\x49\xb1\xae\x1b\x1d\x33\x86\x6e\xcd\x8c\x8c\xf3\xa8\x84\xd7\x23\x0a\x6d\xab\x0f\x1c\x08\xca\x43\x31\x0e\x70\x7e\x6f\xd9\xca\xc0\x29\x8d\x05\x17\x77\xe2\x98\x07\xa8\xed\x3e\xae\x80\xd6\x18\x94\x3e\x0e\x77\x7e\x1a\xba\xc5\x62\x70\x20\xce\xff\xac\xfc\x6a\x38\x2a\xba\xb9\xa7\xa0\x9d\x2c\xa4\x0e\xe4\xd1\x15\x8c\x5f\x3a\x0f\xc9\x67\x4a\x57\x6d\x0c\xc5\xeb\x44\xfa\xee\x76\xe2\x14\xdf\x3a\x42\x1f\x57\xcc\x69\x62\x47\x1b\x7a\x7a\x5e\xe4\xbd\x63\xca\xb8\xf4\x65\x08\x9c\x5b\xdc\x51\x5f\x9d\x4d\x06\x2d\x45\xd0\x04\x8a\x4b\x70\x8c\x9e\xc2\x2a\x55\xd3\x2a\xe2\x7a\x1c\x71\xe2\xee\xfb\xac\x5f\x28\x9f\xe7\xb6\xf4\x77\x2b\x55\x21\x4f\x66\xd9\x0a\x3c\x31\x84\xb1\x30\xe1\xfb\xa2\x52\xee\xea\x08\xf5\x73\xb3\x3e\x65\x03\xd6\x98\xbc\xcf\x9f\x7e\x4b\x3b\xba\x30\x9b\xf4\xed\x5a\xf9\xb8\x37\x92\xf2\xd6\x1d\x06\xb4\x7a\xcb\xc3\xe1\x44\x39\xf7\xa0\xe0\xf4\xd5\xfd\x3d\x14\xd7\xca\xb3\xa4\xf8\xd4\x33\xa5\x58\x39\x61\x64\xdd\x13\xfd\x12\xff\x4a\x8f\x3e\x6a\x1d\x8f\xf8\x6e\xd0\x29\x4e\x9e\x0f\x98\xef\x2e\xa6\x81\xfe\x6e\x95\xc9\x18\x66\xf3\x59\xf7\x76\xa4\x09\x73\x76\x1e\xaf\x8e\x5b\xd5\x5e\x98\x58\x7e\x0e\x39\xab\x32\x4d\xf5\x8d\x30\x6a\xcd\xf3\x1e\x17\x28\xa9\x0a\x5d\xf2\xf5\xc1\xe4\x1c\x77\x5e\x4b\x08\xc1\x54\xe8\x1e\x04\xd0\xa1\x16\x5e\xed\x30\x8e\x33\xd4\xa7\x77\x33\x09\xe2\x83\x82\x1f\x9c\xa3\xb0\xaa\x94\xbb\x98\xa7\x9f\x2f\x86\x87\xb0\x31\x38\xf1\xa1\xeb\x54\x70\xe2\xeb\x51\x1f\xd5\x9e\xea\x84\x80\xcf\x84\xee\x14\x7f\x20\x74\x43\xe6\x98\x06\x4e\xf3\xff\xda\x08\x75\xd2\x00\xe4\x0f\xbd\x84\x9e\x6a\x7c\xca\x3b\x09\xba\xc8\xf7\x74\x6f\x39\xa0\x68\xe2\xf3\x10\xc7\x89\xbb\x81\xf2\x0f\x16\xbc\x3c\x56\x1d\xae\x76\xa8\x79\xf5\x15\x18\xed\x39\x3a\x59\xcc\x75\xf5\xd7\x2d\x1e\x40\x55\x3f\x0f\x64\x5f\x69\x95\x99\x55\x2c\x42\xf8\xe0\x70\xb2\x65\x9e\xd0\x15\x3f\x1f\x16\x03\x3d\x4d\xb0\xa0\x87\x42\x50\x1e\x6a\x41\x11\xe6\xad\xd1\x07\x10\x52\x22\x25\xb8\xac\x31\x3d\xd4\x3c\xeb\xdf\x04\xbe\xac\x85\x26\xfc\xf2\xfc\x84\xb6\x9e\x7f\x1a\x60\xf2\x2e\x48\x9f\x14\xed\xe3\x9e\xc7\x7d\x3f\x78\xa0\x83\x91\xb0\xb2\x76\xbb\x45\x6c\xb9\x5c\x07\x1d\xb3\x8d\xf2\xb3\x39\x34\x28\x38\x52\x7c\xcd\x41\xc4\xc5\xab\xab\xe0\xd0\x92\x77\x28\x9a\xa1\x94\x1f\x5a\xc3\xa2\x17\xe4\x85\xc7\xab\x8d\xf2\x8f\x27\xdc\xe0\xef\xbe\xcf\x7a\xd6\x07\x84\x81\x59\xaf\x63\xd6\xa3\x74\x26\xe4\x19\x16\x9b\x62\x0e\xff\xe2\xcd\x11\x5e\x6b\x1b\xaa\xe7\x45\x7c\x39\xf0\x76\xcb\x43\x2b\x41\x2b\x9c\x57\x32\x68\xe1\xfa\x28\x76\x52\x1e\x36\x98\x4e\xeb\xd5\x9e\x78\x39\x95\x2c\xab\x88\x1b\x69\x91\x56\xd2\x7e\x03\x79\xc0\x16\x15\x5d\x89\x95\xbc\x78\x71\x79\xfc\x7f\xee\xf0\x1d\xba\xdd\x89\x07\x5f\x9e\xb5\xc6\xee\xca\xa5\xfa\x53\x0e\xf3\x62\xcb\xed\x21\xe5\x8a\xd0\x67\xaf\xc8\x4f\xb3\x87\xe8\xec\x45\x99\x5d\x8c\x2f\x23\x71\xde\x99\x82\xb1\x56\xe4\xd1\x2c\x3a\x13\xae\xca\xcb\xf3\xcb\x8b\xb3\xee\x1a\xbf\xaa\x2a\x95\x76\x4d\x06\xf1\x57\x3c\xc3\x4c\xf0\x72\xfc\x3e\xf6\xf1\xfb\x7b\x70\xb1\x25\x7c\x83\x7b\x11\x9f\xf3\x27\x57\x7f\xfc\xad\x57\xf0\xb1\xed\xc4\xbf\xb9\xb9\xeb\x1b\x30\xcd\xbb\xb9\x30\xb8\xae\x1d\x83\xa9\xac\x27\xb0\x91\x18\x1a\x71\x88\x3b\xba\xde\x8d\xaf\x35\x86\xb4\xb5\xdb\xd0\x82\x22\x0a\x48\x60\x0d\x90\x6d\x10\xde\x87\x15\x3a\x83\x1e\x89\xa5\x87\x96\xc6\xc7\x98\xca\x50\xff\x0c\x30\xbb\xb1\x06\x67\xf9\x97\xd7\xd1\x80\xfc\x39\x26\x29\xa7\xe9\x0b\x4d\x3f\xdf\x45\xfb\x26\x5f\x86\xd1\x73\x76\x31\x3b\xfb\x5f\x00\x00\x00\xff\xff\x6c\x75\x4a\x7a\x38\x19\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x5f\x6f\x1b\xb9\x11\x7f\xf7\xa7\x18\x28\x0f\x49\x00\x69\x65\xc7\xb9\x43\xb1\x57\x1f\x90\x4b\x2e\x6e\x9a\x8b\x63\xc4\x4d\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\x52\x3a\xc1\xb8\xef\x5e\x0c\xb9\x7f\xb8\x96\x9c\x1c\xf2\xd6\x3c\xc4\x36\x77\xfe\x0f\xf9\x9b\x1f\xb9\x58\x2c\xce\x44\xab\xfe\x89\x8e\x94\x35\x25\x88\xb6\xa5\xe5\xee\xe2\x6c\xab\x4c\x55\xc2\x1b\x6c\xb5\x3d\x34\x68\xfc\x59\x83\x5e\x54\xc2\x8b\xf2\x0c\xc0\x88\x06\x4b\x58\xeb\xf0\xfb\xfd\x3d\xa8\x35\x14\x37\xa2\x41\x6a\x85\x44\xf8\xe3\x8f\xee\x7b\xfc\xb3\x84\xfb\xfb\xe9\xd7\xfb\x7b\x40\x53\xb1\x18\xb5\x28\xd9\x98\xc3\x56\x2b\x29\xa8\x84\x8b\x33\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x1a\xe1\x65\xfd\x9b\x58\xa1\xa6\xb4\x90\xfb\x66\x69\xef\x84\xc7\xcd\x21\x7d\xf4\x87\x16\x4b\xf8\x84\xd2\xa1\xf0\x78\x06\xe0\xb1\x69\xb5\xf0\xd8\x19\xcb\x32\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc6\x01\x5a\x67\x1b\xf4\x35\x06\x2a\x94\x5d\xb6\xd6\xf9\x12\x66\x97\xe7\x97\x17\x33\x78\x02\x1e\xb5\xce\x24\xc0\x5b\x20\xe9\x44\x8b\xb0\x6c\xd0\x3b\x25\x89\x93\x6b\xad\x32\xfe\x29\x01\x2b\x17\x9d\x61\x3d\xc9\xe1\x41\x16\x00\x7d\x2d\xe2\xef\xe8\x76\x4a\xe2\x2b\x29\x6d\x30\xfe\x66\x2a\x08\xb0\xb3\x3a\x34\x38\x98\x5a\x74\xa6\x36\xca\x2f\xb6\x78\x18\x1c\x10\x57\xc1\x8f\x0e\xfb\x95\xd1\xde\x82\x55\xaa\xd8\xe0\x4c\xaa\xc2\xb5\x08\xda\x7f\xb0\x15\x96\x70\xfe\xf2\xfc\x1c\x9e\xc0\xbe\x46\x03\x0d\x47\x83\x15\x38\x14\xd5\xc2\x1a\x7d\x98\xc3\x1e\x61\x6f\xcd\x53\x0f\x2b\x04\xb1\xd2\xc8\xf5\x90\x75\x63\xab\xb3\xce\xe0\x13\xf8\x47\xad\x08\x14\x81\x00\xdf\xb4\x6b\x82\x40\x58\xc1\xda\x3a\xd8\xa0\x41\x27\xbc\x32\x1b\xb8\xbb\xfb\x1b\x6c\xf1\x40\x05\xbc\x33\xf0\xfe\x2f\x04\x3f\x5f\xc1\x45\x71\x71\x3e\x1f\xac\xf4\xbe\x53\x0a\x04\xc2\x61\x1e\x07\x59\x0e\xc5\x20\x56\x20\x80\xb0\x15\xbc\x29\xba\x42\xc1\x1e\x07\x33\x52\x18\xd8\x3b\xe5\x39\xd0\xe2\x74\xfd\x36\x68\x86\x62\x60\xd3\xfa\xc3\x1b\xe5\xf2\x22\x36\x58\xa9\xd0\x94\xf0\x01\x1b\xeb\x0e\x79\x9e\x08\x6b\xab\xb5\xdd\x73\x46\x9d\x6b\x45\x31\xd5\x40\xbc\x26\x40\x06\xf2\xb6\x51\x5c\x81\xad\xb1\x7b\xf3\x9f\xda\x92\xa7\xc1\xc4\x5a\x69\x9c\xc3\xbe\x56\xb2\x86\x83\x0d\xb0\x57\x5a\xa7\xa4\xbc\x85\xca\xf2\x39\xe3\x65\x56\xe2\x5f\x1c\xd8\xbd\xe1\xb0\x07\x03\x0e\x5b\x0b\x4e\xf8\x1a\x1d\xf8\x5a\x98\xce\xf1\x46\xf9\x3a\xac\xc0\xf2\x22\x82\x56\x5b\x2c\xe0\xdf\x36\x3c\xd5\x1a\x84\x26\xdb\xbb\x98\x16\x1b\x94\x07\x65\xbc\x8d\x3a\xd2\x1a\x2f\x94\x41\x37\x87\x15\x6a\xbb\x2f\xe0\x0e\xc7\xaa\xd6\xde\xb7\x54\x2e\x97\x95\x95\x54\xf0\xc6\x92\x15\x1f\x1d\x34\x4b\x3e\x7a\xe4\x97\x9b\xa0\x2a\xa4\x65\x20\x5c\xb4\x4e\xed\x84\xc7\xb8\xf5\x38\x91\xa2\xf6\x8d\x1e\x2c\xf5\xbd\x20\xaa\x17\xd2\x9a\xb5\xda\x0c\x9f\x00\xd2\xc2\x07\xd1\x96\xd9\x62\x7e\x90\x16\x99\xda\xf7\xf6\xa5\xd8\x86\x15\x2e\x93\x91\x71\xfb\x7d\xb3\x27\x7b\x45\x35\xaf\xd4\x62\x87\x20\xa0\x52\xeb\x35\x3a\x06\xcd\xde\x42\x77\xaa\x46\x60\x8c\x2d\x48\xe6\xf2\x26\x30\xb8\xec\x54\x85\x7d\xd9\xd7\x6a\xd3\x88\x76\x0c\x44\xf9\x1a\x84\x01\x34\xde\x1d\x62\x0e\x5f\x92\xd0\x97\x39\x08\x53\x41\x30\xd2\x36\x8c\xd6\x51\x3f\x65\xfb\x21\xb6\x53\x98\x6a\xb0\x82\x66\x17\x2d\x28\xa4\xae\x9f\x47\x1d\xe0\x32\x7c\x47\x07\x32\xb5\x6f\x76\x20\x22\x81\xb7\xa0\x1a\xc6\x49\xb8\xbe\xbd\x8e\x20\x00\xcf\x38\x2d\x52\x1b\xa3\xcc\xe8\x9c\x93\xdb\xa1\x53\x6b\x25\x23\x60\x43\x1b\x5c\x6b\x09\xe9\xf9\x9f\x28\xe4\x60\x25\xc1\x47\xaa\x22\x17\x88\xfd\xfd\x89\xc2\x81\x70\x9b\xf1\x98\x3e\x52\xb1\x4d\xbb\x61\xfc\xa0\xac\x34\x53\x08\x7e\xf2\x08\x08\x1f\xeb\x9d\x00\xe1\xbe\x9c\xc3\x49\x3c\xc2\xff\x6c\x42\x74\x55\x77\x18\x71\xd2\x58\x98\x95\xe9\x24\xce\x40\x35\x62\x83\x69\xf7\xb3\x42\x01\x6f\x95\xa9\x62\xce\x0d\xc3\x8a\x43\x39\xee\xda\x04\x29\x1a\x05\x21\x83\x47\x54\xe5\x26\x30\x4f\x00\xe1\x87\x73\x5f\x87\x55\x51\x59\xb9\x45\x57\x48\xdb\x2c\xdd\x32\x61\x40\xfc\xb1\xf4\x62\x28\x5d\xdf\x47\x9e\xf7\xcc\x05\xd8\xab\x17\x1b\xe0\x48\x8b\x41\x26\xba\x29\xa1\x33\xa8\x6c\x6e\xad\xbc\x28\x2e\x5e\x16\x2f\xa6\xb2\xb7\x41\xeb\x5b\xab\x95\x3c\x94\xf0\x6e\x7d\x63\xfd\xad\x43\xca\xb3\x70\x48\x36\x38\x89\x94\xe3\xb8\xc3\xff\x06\x24\x3f\x59\x03\x90\x6d\x28\xe1\x87\xf3\x66\xb2\xd8\x44\xa8\x2f\xe1\xc7\x97\x1f\xd4\x48\x13\xac\xcb\x95\x17\x63\x67\x6e\x23\x65\xb8\x3c\xbf\xe4\xc9\xa9\xcc\xda\xba\x26\x6e\x59\xa1\x07\x69\xad\x76\x68\x90\xe8\xd6\xd9\x15\xe6\x11\x70\x49\xaf\xa7\x53\x3b\xb9\x4a\x06\xa7\xcb\xc2\xd7\x25\x2c\x45\xab\x52\xa5\x77\x3f\x2e\x55\x85\xc6\x2b\x7f\x28\xda\xb0\xca\x64\x95\x51\x5e\x09\xfd\x06\xb5\x38\xdc\xf1\xf9\xac\xa8\x84\x1f\x32\x01\xaf\x1a\xb4\xc1\x9f\xf8\xc6\x43\x56\xfd\x7f\x84\x9a\x1d\xda\x49\x63\x4e\xd3\x23\x48\x63\xee\x36\x45\x86\x5e\xc6\xc8\xaa\x25\x51\xcd\x3c\xcf\x26\xe6\x09\xda\x76\x78\xb3\xe1\x96\x81\x32\x69\xcf\x3d\xa5\xa4\x43\x54\x2f\x27\x30\xd9\xd7\xec\xa3\xd1\x87\x12\xbc\x0b\xc8\xd6\x98\x03\x45\x84\x5a\x75\xc0\xce\x47\xaa\x45\xb7\xb6\x4e\x22\x1b\x4d\xa4\x87\x39\xcf\x63\x81\xe7\xbc\x64\x1a\xfb\x4e\xb8\x2e\xf6\x24\xf6\x7d\xe1\x67\x67\xf4\x9d\x91\x3a\x44\xe4\x64\xea\x96\x06\x5c\x8f\xaa\x89\x1b\x7c\x83\xca\xf4\x64\xe6\x27\x56\x7d\x40\x33\x06\x74\x85\x0a\xa5\x16\x8e\x29\xdb\xca\xee\x32\x00\xf8\x0a\x0d\x48\xf0\x98\x27\xef\xac\xf5\xcb\x82\xa8\x7e\x34\x01\x61\x26\x5e\x67\xe3\x88\x9a\x25\xcf\xf3\x5e\x24\xb3\x80\x66\xa7\x9c\x35\x71\x20\xa4\x59\x3b\x7b\xff\xf9\x97\x5f\x5f\x7f\xbc\x79\xfb\xee\x7a\x96\x46\xc0\x9c\xeb\x61\x77\xe8\xdc\x74\x5e\x67\x66\xe2\x88\x5b\x1d\xd2\x34\xf5\xfa\x54\x8e\x47\x83\xf6\x38\xc7\x71\x73\xb2\xf0\xa3\x89\xf2\xcc\xe3\x8b\x47\xef\x8d\x21\x3a\xa3\x22\x5d\x74\xb1\x27\x99\x89\x87\x84\x26\x6f\x7a\x64\x33\x3d\xf5\x16\x06\x84\xf6\xe8\x0c\x53\xeb\xa3\x88\xd7\xce\x36\xbc\x2d\x7a\xc6\x32\x07\x41\xbc\xdd\xba\xa9\xca\x65\xd0\x56\x6e\xe9\xb8\xd9\x68\x76\xe5\x89\xba\x8c\xe5\x9e\xd4\x65\x27\x74\xc0\xa3\x9a\x7c\x6b\x13\x3f\xdc\x03\xfd\xcc\xfd\xca\x0e\xe0\x91\x3f\x1d\xf5\x5f\x19\xf6\x8f\xec\x4b\x96\x4a\xec\x66\x22\x37\xc5\x87\x31\x68\x76\x59\x4e\x72\x48\x6d\x48\x57\x34\xac\x78\x10\x49\x21\x6b\xac\xb8\xb2\x79\x6b\x07\x56\xc9\x4d\xe4\xb2\xcc\x33\x2b\xd6\x75\xb4\x31\x53\xe8\xae\x98\x51\x71\x1e\x9d\xf0\xd5\x88\x42\xdb\xea\x03\x17\x82\xf2\x52\x8c\xe4\xcd\xef\x2d\x47\x19\xb8\xa5\x71\xc3\xc5\xfb\x70\xec\x03\xd4\x76\x1f\xaf\x7f\xd6\x18\x94\x3e\x12\x3b\x3f\x2d\xdd\x62\x31\x24\x10\xb9\x3f\x3b\xbf\x1a\x96\x8a\x8e\xf3\x14\xb4\x93\x85\xd4\x81\x3c\xba\x82\xf1\x4b\xe7\x25\xf9\x4c\xe9\xa8\x8d\xa5\x78\x9d\x44\xdf\xdd\x4e\x92\xe2\x53\x47\xe8\xe3\xf5\x72\xda\xd8\x31\x86\x5e\x9e\x2f\xf1\xde\xb1\x64\xbc\xf0\x65\x08\x9c\x47\xdc\x49\x5f\x9d\x4d\x48\x96\x22\x68\x02\xc5\x0b\x70\xac\x9e\xc2\x2a\xed\xa6\x55\xc4\xf5\x48\x71\xe2\xbd\xf7\x59\x7f\x99\x7c\x9e\xc7\xd2\x9f\xad\xb4\x0b\x99\x95\x65\xd7\xdf\x49\x20\x8c\x85\x09\xdf\x17\x95\x72\x57\x47\xa8\x9f\x87\xf5\x29\x23\x58\x63\xf3\x3e\x7f\xfa\x2d\xdd\xcf\x85\xd9\xa4\x6f\xd7\xca\xc7\x3b\x23\x29\x6f\xdd\x61\x40\xab\xb7\x4c\x0c\x27\xce\x79\x06\x05\xa7\xaf\xee\xef\xa1\xb8\x56\x9e\x2d\xc5\x67\x9e\xa9\xc4\xca\x09\x23\xeb\x5e\xe8\x97\xf8\x57\x7a\xf0\x51\xeb\xb8\xc4\x67\x83\x4e\x69\x32\x3f\x60\xbd\xbb\xd8\x06\xfa\xbb\x55\x26\x53\x98\xcd\x67\xdd\xbb\x91\x26\xcc\xd5\x99\x5e\x1d\x8f\xaa\xbd\x30\x71\xfb\x39\xe4\xae\xca\xc4\xe8\x1b\x61\xd4\x9a\xf9\x1e\x6f\x50\x52\x15\xba\x94\xeb\x03\xd6\x1c\xef\xbb\x96\x10\x82\xa9\xd0\x3d\x28\xa0\x43\x2d\xbc\xda\x61\xa4\x33\xd4\xb7\x77\x33\x29\xe2\x83\x0d\x3f\x24\x47\x61\x55\x29\x77\x31\x4f\x3f\x5f\x0c\x8f\x60\x63\x71\xe2\x23\xd7\xa9\xe2\xc4\x97\xa3\xbe\xaa\xbd\xd4\x09\x03\x9f\x09\xdd\x29\xfd\x40\xe8\x86\xce\xb1\x0c\x9c\xd6\xff\xb5\x11\xea\x64\x00\xc8\x1f\x7a\x0b\xbd\xd4\xf8\x8c\x77\x12\x74\x91\xcf\xe9\xde\x72\x41\xd1\xc4\xa7\x21\xae\x13\x4f\x03\xe5\x1f\x5c\xee\xf2\x5a\x75\xb8\xda\xa1\xe6\xd5\x57\x60\xb4\xd7\xe8\x6c\xb1\xd6\xd5\x5f\xb7\x78\x00\x55\xfd\x3c\x88\x7d\x65\x54\x66\x51\xb1\x09\xe1\x83\xc3\xc9\x0d\xf3\x84\xaf\xf8\xf9\xb0\x18\xe4\x69\x82\x05\x3d\x14\x82\xf2\x50\x0b\x8a\x30\x6f\x8d\x3e\x80\x90\x12\x29\xc1\x65\x8d\xe9\x91\xe6\x59\xff\x1e\xf0\x65\x2d\x34\xe1\x97\xe7\x27\xbc\xf5\xfa\xd3\x02\x93\x77\x41\xfa\xe4\x68\x1f\xef\x78\x3c\xf7\x83\x07\x3a\x18\x09\x2b\x6b\xb7\x5b\xc4\x96\xb7\xeb\xe0\x63\xb6\x51\x7e\x36\x87\x06\x05\x57\x8a\x8f\x39\x88\x78\xf1\xea\x76\x70\x68\xc9\x3b\x14\xcd\xb0\x95\x1f\x46\xc3\xa6\x17\xe4\x85\xc7\xab\x8d\xf2\x8f\x37\xdc\xe0\xef\xbe\xef\x7a\x36\x07\x84\x81\x59\xef\x63\xd6\xa3\x74\x66\xe4\x19\x16\x9b\x62\x0e\xff\x42\xa6\x1b\xaf\xb5\x0d\xd5\xf3\x22\xbe\x1a\x78\xbb\x65\xd2\x4a\xd0\x0a\xe7\x95\x0c\x5a\xb8\xbe\x8a\x9d\x95\x87\x03\xa6\xf3\x7a\xb5\x27\xbe\x98\x4a\xb6\x55\xec\xd9\x6e\xb1\xb7\x6e\x4b\xc3\x0d\xe4\x81\x5a\x74\x74\x25\x56\xf2\xe2\xc5\xe5\xf1\xff\x79\xc2\x77\xe8\x76\x27\x1e\x7b\x99\x6b\x8d\xd3\x95\xb7\xea\x4f\x39\xcc\x8b\x2d\x8f\x87\xd4\x2b\x42\x9f\xbd\x20\x3f\xcd\x1e\xa1\xb3\xd7\x64\x4e\x31\xbe\x8a\x44\xbe\x33\x05\x63\xad\xc8\xa3\x59\x74\x21\x5c\x95\x97\xe7\x97\x17\x67\xdd\x31\x7e\x55\x55\x2a\xdd\x35\x19\xc4\x5f\x31\x87\x99\xe0\xe5\xf8\x7d\x9c\xe3\xf7\xf7\xe0\xe2\x48\xf8\x86\xf6\x22\x3e\xe5\x4f\x8e\xfe\xf8\x5b\xef\xe0\x63\xdb\x99\x7f\x73\x73\xd7\x0f\x60\x9a\x77\xbc\x30\xb8\x6e\x1c\x83\xa9\xac\x27\xb0\x51\x18\x1a\x71\x88\x77\x74\xbd\x1b\x5f\x6a\x0c\x69\x6b\xb7\xa1\x05\x45\x14\x90\xc0\x1a\x20\xdb\x20\xbc\x0f\x2b\x74\x06\x3d\x12\x5b\x0f\x2d\x8d\x0f\x31\x95\xa1\xfe\x19\x60\x76\x63\x0d\xce\xf2\x2f\xaf\x63\x00\xf9\x53\x4c\x72\x4e\xd3\xd7\x99\x9e\xdf\xc5\xf8\x26\x5f\x06\xea\x39\xbb\x98\x9d\xfd\x2f\x00\x00\xff\xff\x52\x89\xd6\x57\x34\x19\x00\x00"), }, "/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "flux-secret.yaml.tmpl", diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl index b246298aa..46994c1ae 100644 --- 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 index be8a95355..a15c3d9f7 100644 --- 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 index 0d0660387..76c40049c 100644 --- 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 index 812bd4721..840cb27da 100644 --- 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