Skip to content

Commit

Permalink
Rename references to the default branch to main
Browse files Browse the repository at this point in the history
Signed-off-by: Naadir Jeewa <[email protected]>
  • Loading branch information
randomvariable authored and Sedef committed Apr 22, 2021
1 parent 2eb156f commit 262a449
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/book/src/topics/machinepools.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ clusterctl config cluster my-cluster --kubernetes-version v1.16.8 --flavor machi
```

The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors)
is located [here](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/templates/cluster-template-machinepool.yaml).
is located [here](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/templates/cluster-template-machinepool.yaml).

## AWSManagedMachinePool

Expand All @@ -48,7 +48,7 @@ clusterctl config cluster my-cluster --kubernetes-version v1.16.8 --flavor eks-m
```

The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors)
is located [here](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/templates/cluster-template-eks-managedmachinepool.yaml).
is located [here](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/templates/cluster-template-eks-managedmachinepool.yaml).



Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/topics/multitenancy.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Multi-tenancy

Starting from v0.6.5, single controller multi-tenancy is supported that allows using a different AWS Identity for each workload cluster.
For details, see the [multi-tenancy proposal](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/docs/proposal/20200506-single-controller-multitenancy.md).
For details, see the [multi-tenancy proposal](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/docs/proposal/20200506-single-controller-multitenancy.md).


For multi-tenancy support, a reference field (`identityRef`) is added to `AWSCluster`, which describes the identity to be used when reconciling the cluster.
Expand Down
24 changes: 21 additions & 3 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,37 @@
# Standard Netlify redirects
[[redirects]]
from = "https://master--cluster-api-aws.netlify.com/*"
to = "https://master.cluster-api-aws.sigs.k8s.io/:splat"
to = "https://main.cluster-api-aws.sigs.k8s.io/:splat"
status = 301
force = true

[[redirects]]
from = "https://main--cluster-api-aws.netlify.com/*"
to = "https://main.cluster-api-aws.sigs.k8s.io/:splat"
status = 301
force = true

# HTTP-to-HTTPS rules
[[redirects]]
from = "http://master.cluster-api-aws.sigs.k8s.io/*"
to = "https://master.cluster-api-aws.sigs.k8s.io/:splat"
to = "https://main.cluster-api-aws.sigs.k8s.io/:splat"
status = 301
force = true

[[redirects]]
from = "http://main.cluster-api-aws.sigs.k8s.io/*"
to = "https://main.cluster-api-aws.sigs.k8s.io/:splat"
status = 301
force = true

[[redirects]]
from = "http://master--cluster-api-aws.netlify.com/*"
to = "http://master.cluster-api-aws.sigs.k8s.io/:splat"
to = "http://main.cluster-api-aws.sigs.k8s.io/:splat"
status = 301
force = true

[[redirects]]
from = "http://main--cluster-api-aws.netlify.com/*"
to = "http://main.cluster-api-aws.sigs.k8s.io/:splat"
status = 301
force = true

0 comments on commit 262a449

Please sign in to comment.