weaveworks · casibbald · Dec 16, 2024 · Dec 10, 2024 · Dec 10, 2024 · Dec 16, 2024
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -40,7 +40,7 @@ jobs:
           yarn install --frozen-lockfile
           yarn clear
           export DOC_BASE_URL="/$GITHUB_HEAD_REF/"
-          export DOC_URL=https://staging.docs.gitops.weave.works
+          export DOC_URL=https://staging.docs.gitops.weaveworks.org
           export STAGING_BUILD=true
           yarn build
       - id: auth
@@ -51,7 +51,7 @@ jobs:
         uses: google-github-actions/upload-cloud-storage@e95a15f226403ed658d3e65f40205649f342ba2c # v1.0.3
         with:
           path: website/build
-          destination: staging.docs.gitops.weave.works/${{ github.head_ref }}
+          destination: staging.docs.gitops.weaveworks.org/${{ github.head_ref }}
           parent: false
           headers: |-
             cache-control: no-cache
@@ -64,7 +64,7 @@ jobs:
           {
             "state": "success",
             "context": "Doc site preview",
-            "target_url": "https://staging.docs.gitops.weave.works/$GITHUB_HEAD_REF"
+            "target_url": "https://staging.docs.gitops.weaveworks.org/$GITHUB_HEAD_REF"
           }
           EOF
           )
@@ -104,5 +104,5 @@ jobs:
         uses: google-github-actions/upload-cloud-storage@e95a15f226403ed658d3e65f40205649f342ba2c # v1.0.3
         with:
           path: website/build
-          destination: production.docs.gitops.weave.works
+          destination: production.docs.gitops.weaveworks.org
           parent: false
diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
@@ -120,7 +120,7 @@ jobs:
              |--------------------|------------------|
              | `v2.0`            | `>= 2.0.0`   |
 
-             For Flux migrations to v2.0 see [flux](https://github.com/fluxcd/flux2/releases/tag/v2.0.0) or [weave gitops](https://docs.gitops.weave.works/docs/guides/fluxga-upgrade/) documentation.
+             For Flux migrations to v2.0 see [flux](https://github.com/fluxcd/flux2/releases/tag/v2.0.0) or [weave gitops](https://docs.gitops.weaveworks.org/docs/guides/fluxga-upgrade/) documentation.
 
            ${{ steps.github_release.outputs.changelog }}
           token: ${{ secrets.WEAVE_GITOPS_BOT_ACCESS_TOKEN }}

diff --git a/.goreleaser.brew.yml b/.goreleaser.brew.yml
@@ -6,7 +6,7 @@ brews:
       name: weave-gitops-bot
       email: [email protected]
     folder: Formula
-    homepage: "https://docs.gitops.weave.works/docs/getting-started"
+    homepage: "https://docs.gitops.weaveworks.org/docs/getting-started"
     description: "GitOps support for Kubernetes"
     install: |
         bin.install "gitops"

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -4,4 +4,4 @@ Weaveworks follows the [CNCF Code of Conduct](https://github.com/cncf/foundation
 
 Instances of abusive, harassing, or otherwise unacceptable behavior
 may be reported by contacting a Weaveworks project maintainer, or
-Alexis Richardson (alexis@weave.works).
+Alexis Richardson (alexis@weaveworks.org).
diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ brew tap weaveworks/tap
 brew install weaveworks/tap/gitops
 ```
 
-Please see the [getting started guide](https://docs.gitops.weave.works/docs/next/open-source/getting-started/install-OSS/).
+Please see the [getting started guide](https://docs.gitops.weaveworks.org/docs/next/open-source/getting-started/install-OSS/).
 
 ## CLI Reference
 
@@ -96,7 +96,7 @@ Examples:
   # Get the version of gitops along with commit, branch, and flux version
   gitops version
 
-  To learn more, you can find our documentation at https://docs.gitops.weave.works/
+  To learn more, you can find our documentation at https://docs.gitops.weaveworks.org/
 
 
 Available Commands:
@@ -120,7 +120,7 @@ Flags:
 Use "gitops [command] --help" for more information about a command.
 ```
 
-For more information please see the [docs](https://docs.gitops.weave.works/docs/references/cli-reference/gitops/)
+For more information please see the [docs](https://docs.gitops.weaveworks.org/docs/references/cli-reference/gitops/)
 
 ## FAQ
 
@@ -131,7 +131,7 @@ Please see our Weave GitOps OSS [FAQ](https://www.weave.works/faqs-for-weave-git
 Need help or want to contribute? Please see the links below.
 
 - Getting Started?
-    - Follow our [Get Started guide](https://docs.gitops.weave.works/docs/next/open-source/getting-started/install-OSS/) and give us feedback
+    - Follow our [Get Started guide](https://docs.gitops.weaveworks.org/docs/next/open-source/getting-started/install-OSS/) and give us feedback
 - Need help?
     - Talk to us in
       the [#weave-gitops channel](https://app.slack.com/client/T2NDH1D9D/C0248LVC719/thread/C2ND76PAA-1621532937.019800)

diff --git a/SECURITY.md b/SECURITY.md
@@ -8,7 +8,7 @@ This document defines security reporting, handling and disclosure information fo
 
 We're very thankful for – and if desired happy to credit – security researchers and users who report vulnerabilities to the Weave GitOps community.
 
-- To make a report please email the private security list at <security@weave.works> with the details.
+- To make a report please email the private security list at <security@weaveworks.org> with the details.
   We ask that reporters act in good faith by not disclosing the issue to others.
 - The Security Team will investigate the issue as soon as possible and where needed, coordinate a release date with relevant parties.
 - You will be able to choose if you want public acknowledgement of your effort and how you would like to be credited.

diff --git a/charts/gitops-server/values.yaml b/charts/gitops-server/values.yaml
@@ -25,15 +25,15 @@ envVars:
   - name: WEAVE_GITOPS_FEATURE_CLUSTER
     value: "false"
   # -- Enable this feature flag if you want to expand Flux Runtime UI with other Weave GitOps components like Policy Agent or TF-Controller.
-  # Ensure that Weave GitOps Deployment and CRDs have the label 'app.kubernetes.io/part-of=weave-gitops'. See https://docs.gitops.weave.works/docs/open-source/getting-started/install-OSS for more info.
+  # Ensure that Weave GitOps Deployment and CRDs have the label 'app.kubernetes.io/part-of=weave-gitops'. See https://docs.gitops.weaveworks.org/docs/open-source/getting-started/install-OSS for more info.
   - name: WEAVE_GITOPS_FEATURE_GITOPS_RUNTIME
     value: "false"
 
 # -- Annotations to add to the deployment
 annotations: {}
 # Should the 'oidc-auth' secret be created. For a detailed
 # explanation of these attributes please see our documentation:
-# https://docs.gitops.weave.works/docs/configuration/securing-access-to-the-dashboard/#login-via-an-oidc-provider
+# https://docs.gitops.weaveworks.org/docs/configuration/securing-access-to-the-dashboard/#login-via-an-oidc-provider
 oidcSecret:
   create: false
   # clientID:

diff --git a/cmd/gitops/root/cmd.go b/cmd/gitops/root/cmd.go
@@ -59,7 +59,7 @@ func RootCmd() *cobra.Command {
   # Get the version of gitops along with commit, branch, and flux version
   gitops version
 
-  To learn more, you can find our documentation at https://docs.gitops.weave.works/
+  To learn more, you can find our documentation at https://docs.gitops.weaveworks.org/
 `,
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			// Sync flag values and env vars.
@@ -102,7 +102,7 @@ func RootCmd() *cobra.Command {
 
 			gitopsConfig, err = config.GetConfig(false)
 			if err != nil {
-				fmt.Fprintln(os.Stderr, "To improve our product, we would like to collect analytics data. You can read more about what data we collect here: https://docs.gitops.weave.works/docs/feedback-and-telemetry/")
+				fmt.Fprintln(os.Stderr, "To improve our product, we would like to collect analytics data. You can read more about what data we collect here: https://docs.gitops.weaveworks.org/docs/feedback-and-telemetry/")
 
 				enableAnalytics := false
 

diff --git a/doc/adr/0015-current-api-authentication-strategy.md b/doc/adr/0015-current-api-authentication-strategy.md
@@ -18,7 +18,7 @@ The 'decision' section has been skipped as the decisions have been made and reve
 * **Principal** an entity that is interacting with a system, this may be a user or an automated system
 * **Authentication (AKA auth, authN)** the process of verifying who a principal is
 * **Authorization (AKA authZ)** the process of determining what actions a principal is permitted to carry out (this is out of scope of this document)
-* **OIDC** [OpenID Connect](https://docs.gitops.weave.works/docs/configuration/securing-access-to-the-dashboard/), a protocol that allows third-parties to authenticate end-users to an application
+* **OIDC** [OpenID Connect](https://docs.gitops.weaveworks.org/docs/configuration/securing-access-to-the-dashboard/), a protocol that allows third-parties to authenticate end-users to an application
 * **BearerToken** A token that allows direct authentication with the kubernetes API, used in the token-passthrough authentication method
 
 ## Context
@@ -80,8 +80,8 @@ flowchart TD
 
 Currently there are 3 supported methods:
 
-* [OIDC (via header and cookie)](https://docs.gitops.weave.works/docs/configuration/service-account-permissions/)
-* [Cluster user account](https://docs.gitops.weave.works/docs/configuration/service-account-permissions/)
+* [OIDC (via header and cookie)](https://docs.gitops.weaveworks.org/docs/configuration/service-account-permissions/)
+* [Cluster user account](https://docs.gitops.weaveworks.org/docs/configuration/service-account-permissions/)
 * Token passthrough -- this is only used as part of enterprise installations.
 
 methods must implement the `PrincipalGetter` interface which returns a `UserPrincipal`:
@@ -105,7 +105,7 @@ It is important to note that the authentication method is also 'used' by the `/o
 
 ### Authentication from the server to Kubernetes
 
-The Gitops server's service account only needs a very limited set of permissions (`impersonate`, `get,list` on the secrets used to configure authentication and `get,list` on namespaces), the purpose of these permissions is covered in the [security docs](https://docs.gitops.weave.works/docs/configuration/service-account-permissions/). All interactions with the Kubernetes API should go via a `clustermngr` which will correctly set the Kubernetes client's impersonation configuration or bearer token (depending on the authentication method used).
+The Gitops server's service account only needs a very limited set of permissions (`impersonate`, `get,list` on the secrets used to configure authentication and `get,list` on namespaces), the purpose of these permissions is covered in the [security docs](https://docs.gitops.weaveworks.org/docs/configuration/service-account-permissions/). All interactions with the Kubernetes API should go via a `clustermngr` which will correctly set the Kubernetes client's impersonation configuration or bearer token (depending on the authentication method used).
 
 The principal returned by `WithAPIAuthentication` is added to the request context to authenticate with the Kubernetes API. For OIDC and user-account methods the principal is extracted from the header or cookie token which is expected to have the following attributes:
 

diff --git a/ui/components/Footer.tsx b/ui/components/Footer.tsx
@@ -46,8 +46,8 @@ function Footer({ className }: Props) {
       <LeftFoot>
         <Text noWrap>Need help? Contact us at</Text>
         <Spacer padding="xxs" />
-        <Link newTab href="mailto:sales@weave.works">
-          sales@weave.works
+        <Link newTab href="mailto:sales@weaveworks.org">
+          sales@weaveworks.org
         </Link>
       </LeftFoot>
       <RightFoot>

diff --git a/ui/components/UserSettings.tsx b/ui/components/UserSettings.tsx
@@ -70,7 +70,7 @@ function UserSettings({ className, darkModeEnabled = true }: Props) {
       <Tooltip title="Docs" enterDelay={500} enterNextDelay={500}>
         <Link
           as={PersonButton}
-          href="https://docs.gitops.weave.works/"
+          href="https://docs.gitops.weaveworks.org/"
           target="_blank"
           rel="noreferrer"
         >

diff --git a/ui/components/__tests__/__snapshots__/Footer.test.tsx.snap b/ui/components/__tests__/__snapshots__/Footer.test.tsx.snap
@@ -116,15 +116,15 @@ exports[`Footer snapshots default 1`] = `
     />
     <a
       class="c5 Link"
-      href="mailto:sales@weave.works"
+      href="mailto:sales@weaveworks.org"
       rel="noreferrer"
       target="_blank"
     >
       <span
         class="c6"
         color="primary"
       >
-        sales@weave.works
+        sales@weaveworks.org
       </span>
     </a>
   </div>
@@ -315,15 +315,15 @@ exports[`Footer snapshots no api version 1`] = `
     />
     <a
       class="c5 Link"
-      href="mailto:sales@weave.works"
+      href="mailto:sales@weaveworks.org"
       rel="noreferrer"
       target="_blank"
     >
       <span
         class="c6"
         color="primary"
       >
-        sales@weave.works
+        sales@weaveworks.org
       </span>
     </a>
   </div>

diff --git a/ui/components/__tests__/__snapshots__/Page.test.tsx.snap b/ui/components/__tests__/__snapshots__/Page.test.tsx.snap
@@ -324,7 +324,7 @@ exports[`Page snapshots default 1`] = `
         aria-describedby={null}
         aria-disabled={false}
         className="MuiButtonBase-root MuiIconButton-root c10 c11 Link"
-        href="https://docs.gitops.weave.works/"
+        href="https://docs.gitops.weaveworks.org/"
         onBlur={[Function]}
         onDragLeave={[Function]}
         onFocus={[Function]}

diff --git a/ui/pages/SignIn.tsx b/ui/pages/SignIn.tsx
@@ -224,7 +224,7 @@ function SignIn({ darkModeEnabled = true }: Props) {
         <DocsWrapper center align>
           Need help? Have a look at the&nbsp;
           <a
-            href="https://docs.gitops.weave.works/docs/getting-started"
+            href="https://docs.gitops.weaveworks.org/docs/getting-started"
             target="_blank"
             rel="noopener noreferrer"
           >

diff --git a/website/README.md b/website/README.md
@@ -4,7 +4,7 @@ This website is built using [Docusaurus 2](https://docusaurus.io/), a modern sta
 It requires Node.js installed on your system. Install or Update your current setup for Node.js from [here](https://nodejs.org/en/download/)
 Install yarn from [here](https://classic.yarnpkg.com/en/docs/install)
 
-The website is live [here](https://docs.gitops.weave.works/).
+The website is live [here](https://docs.gitops.weaveworks.org/).
 
 ## Developing the docs
 

diff --git a/website/docs/cluster-management/cluster-management-intro.mdx b/website/docs/cluster-management/cluster-management-intro.mdx
@@ -11,7 +11,7 @@ In line with the mantra “cattle, not pets,” Weave GitOps Enterprise (WGE) si
 
 WGE fully supports a range of options, including:
 - [Crossplane integration](https://www.weave.works/blog/gitops-goes-beyond-kubernetes-with-weave-gitops-upbound-s-universal-crossplane)
-- Terraform integration, with a [Terraform Controller](https://docs.gitops.weave.works/docs/terraform/overview/) that follows the patterns established by Flux
+- Terraform integration, with a [Terraform Controller](https://docs.gitops.weaveworks.org/docs/terraform/overview/) that follows the patterns established by Flux
 - [Cluster API](https://cluster-api.sigs.k8s.io/)
 
 ## Helm Charts and Kustomizations Made Easy with Our UI

diff --git a/website/docs/enterprise/getting-started/install-enterprise-azure.mdx b/website/docs/enterprise/getting-started/install-enterprise-azure.mdx
@@ -35,7 +35,7 @@ If you are planning to manage or connect CAPI clusters to the WE service make su
 
 ## 2. Apply the Entitlements Secret
 
-Contact sales@weave.works for a valid entitlements secret. This will come in the form of a file “entitlements.yaml”. Apply it to the cluster:
+Contact sales@weaveworks.org for a valid entitlements secret. This will come in the form of a file “entitlements.yaml”. Apply it to the cluster:
 
 ```
 kubectl apply -f entitlements.yaml

diff --git a/website/docs/enterprise/getting-started/install-enterprise-cli.mdx b/website/docs/enterprise/getting-started/install-enterprise-cli.mdx
@@ -120,7 +120,7 @@ For SSH, `private key path` & `private key password`. For HTTPS, `username` and
 
 Weave GitOps Enterprise Entitlement is your obtained license to use our product. The Entitlements file is a Kubernetes secret that contains your licence.
 `Bootstrapping` checks that the secret exists on the management cluster, and that it is valid will check if it has valid content and the entitlement is not expired.
-To get the entitlement secret please contact *sales@weave.works*, then apply it on your management cluster with the name `weave-gitops-enterprise-credentials` under `flux-system` namespace. 
+To get the entitlement secret please contact *sales@weaveworks.org*, then apply it on your management cluster with the name `weave-gitops-enterprise-credentials` under `flux-system` namespace.
 
 #### Configure Git Access
 
@@ -200,4 +200,4 @@ After installation is successful. The CLI will print out the URL where you can a
 -  `--repo-url`                     Git repo URL for your Flux repository. For supported URL examples see [here](https://fluxcd.io/flux/cmd/flux_bootstrap_git/)
 -  `-s`, `--silent`                 chose the defaults with current provided information without asking any questions
 -  `-v`, `--version`                version of Weave GitOps Enterprise (should be from the latest 3 versions)
--  `-p`, `--password`               The Weave GitOps Enterprise password for dashboard access
+-  `-p`, `--password`               The Weave GitOps Enterprise password for dashboard access
diff --git a/website/docs/enterprise/getting-started/install-enterprise.mdx b/website/docs/enterprise/getting-started/install-enterprise.mdx
@@ -15,7 +15,7 @@ import oauthAzureDevOpsSuccess from '/img/oauth-azure-devops-success.png';
 # Install Weave GitOps Enterprise<TierLabel tiers="Enterprise" />
 
 :::info
-To purchase an entitlement to Weave GitOps Enterprise, please contact [sales@weave.works](mailto:sales@weave.works).
+To purchase an entitlement to Weave GitOps Enterprise, please contact [sales@weaveworks.org](mailto:sales@weaveworks.org).
 :::
 
 Follow the instructions on this page to:
@@ -115,7 +115,7 @@ At this point your Flux management cluster should be running. Take a look at the
 
 ### Apply Your Entitlements Secret to Your Cluster
 
-As noted above, you receive your entitlements secret by contacting sales@weave.works. Use this command to apply it to the cluster:
+As noted above, you receive your entitlements secret by contacting sales@weaveworks.org. Use this command to apply it to the cluster:
 
 ```bash
 kubectl apply -f entitlements.yaml
@@ -1120,6 +1120,6 @@ Flux will reconcile the helm-release and WGE will be deployed into the cluster.
 
 Here are a couple of options for you to take your next steps with WGE. Explore one option or all of them, in no particular order.
 
-- [Cluster Management](https://docs.gitops.weave.works/docs/next/cluster-management/intro/): We'll show you how to join WGE to a cluster and install an application on that cluster *without* using Cluster API. But if you prefer using Cluster API, our docs cover that too.
+- [Cluster Management](https://docs.gitops.weaveworks.org/docs/next/cluster-management/intro/): We'll show you how to join WGE to a cluster and install an application on that cluster *without* using Cluster API. But if you prefer using Cluster API, our docs cover that too.
 - Install the [Terraform Controller](https://weaveworks.github.io/tf-controller/) to reconcile your Terraform resources in a GitOps way. With Flux and the TF Controller, WGE makes it easy to add Terraform templates to your clusters and continuously reconcile any changes made to the Terraform source manifest.
 - Install [Policy agent](../../policy/intro.mdx), which comes packaged with the WGE chart.
diff --git a/website/docs/enterprise/getting-started/intro-enterprise.mdx b/website/docs/enterprise/getting-started/intro-enterprise.mdx
@@ -8,7 +8,7 @@ import Link from "@docusaurus/Link";
 # Weave GitOps Enterprise <TierLabel tiers="Enterprise" />
 
 :::tip Ready for more GitOps?
-To purchase an entitlement to Weave GitOps Enterprise, please contact [sales@weave.works](mailto:sales@weave.works).
+To purchase an entitlement to Weave GitOps Enterprise, please contact [sales@weaveworks.org](mailto:sales@weaveworks.org).
 :::
 
 Weave GitOps Enterprise provides ops teams with an easy way to assess the

diff --git a/website/docs/enterprise/getting-started/join-cluster-azure-flux.mdx b/website/docs/enterprise/getting-started/join-cluster-azure-flux.mdx
@@ -182,7 +182,7 @@ Kubernetes 1.24+ [will not create secrets for Service Accounts for you](https://
 	--from-file=value=./demo-01-kubeconfig
 	```
 
-You can also take care of this step in WGE's [Secrets UI](https://docs.gitops.weave.works/docs/next/secrets/intro/), setting up a a secret in [SOPS](https://docs.gitops.weave.works/docs/next/secrets/setup-sops/) or [ESO](https://docs.gitops.weave.works/docs/next/secrets/setup-eso/).
+You can also take care of this step in WGE's [Secrets UI](https://docs.gitops.weaveworks.org/docs/next/secrets/intro/), setting up a a secret in [SOPS](https://docs.gitops.weaveworks.org/docs/next/secrets/setup-sops/) or [ESO](https://docs.gitops.weaveworks.org/docs/next/secrets/setup-eso/).
 
 Flux CRDs are compatible with the Azure Flux Configuration CRDs. This means that there are no compatibility issues between WGE and Azure Flux.