Skip to content

Commit 0743821

Browse files
committed
Change default branch to main
Signed-off-by: Tobias Giese <[email protected]>
1 parent 9945531 commit 0743821

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

RELEASE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
1. Make sure your repo is clean by git's standards.
22-
1. Make sure you are on the correct branch (`master` for the current release and `release-0.x` for older releases).
22+
1. Make sure you are on the correct branch (`main` for the current release and `release-0.x` for older releases).
2323
1. Set an environment variable with the version, e.g.:
2424
- `VERSION=v0.4.0`
2525
3. Create an annotated tag
@@ -51,11 +51,11 @@
5151
Releasing requires a particular set of permissions.
5252

5353
* Approver role for the image promoter process ([kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-capi-openstack/OWNERS](https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-capi-openstack/OWNERS))
54-
* Tag push and release creation rights to the GitHub repository (team `cluster-api-provider-openstack-maintainers` in [kubernetes/org/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml](https://github.com/kubernetes/org/blob/master/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml))
54+
* Tag push and release creation rights to the GitHub repository (team `cluster-api-provider-openstack-maintainers` in [kubernetes/org/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml](https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml))
5555

5656
## Staging
5757

58-
There is a post-submit Prow job running after each commit on master which pushes a new image to the staging repo (`gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:latest`). Following configuration is involved:
58+
There is a post-submit Prow job running after each commit on `main` which pushes a new image to the staging repo (`gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:latest`). Following configuration is involved:
5959
* staging gcr bucket: [kubernetes/k8s.io/blob/main/k8s.gcr.io/manifests/k8s-staging-capi-openstack/promoter-manifest.yaml](https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/manifests/k8s-staging-capi-openstack/promoter-manifest.yaml)
6060
* post-submit `post-capi-openstack-push-images` Prow job: [kubernetes/test-infra/blob/master/config/jobs/image-pushing/k8s-staging-cluster-api.yaml](https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/k8s-staging-cluster-api.yaml)) (corresponding dashboard is located at [https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-capi-openstack-push-images](https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-capi-openstack-push-images))
61-
* Google Cloud Build configuration which is used by the Prow job: [kubernetes-sigs/cluster-api-provider-openstack/cloudbuild.yaml](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/master/cloudbuild.yaml)
61+
* Google Cloud Build configuration which is used by the Prow job: [kubernetes-sigs/cluster-api-provider-openstack/cloudbuild.yaml](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/cloudbuild.yaml)

docs/book/src/clusteropenstack/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
# Required configuration
3636

3737
The cluster configuration file can be generated by using [`clusterctl config cluster`](https://cluster-api.sigs.k8s.io/user/quick-start.html#generating-the-cluster-configuration) command.
38-
This command actually uses [the template file](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/master/templates/cluster-template.yaml) and replace the values surrounded by `${}` with environment variables. You have to set all required environment variables in advance. The following sections explain some more details about what should be configured.
38+
This command actually uses [the template file](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/templates/cluster-template.yaml) and replace the values surrounded by `${}` with environment variables. You have to set all required environment variables in advance. The following sections explain some more details about what should be configured.
3939

40-
Note: You can use [the template file](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/master/templates/cluster-template.yaml) by manually replacing values.
40+
Note: You can use [the template file](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/templates/cluster-template.yaml) by manually replacing values.
4141

4242
**Note:** By default the command creates highly available control plane with internal OpenStack cloud provider. If you wish to create highly available control plane with external OpenStack cloud provider or single control plane without load balancer, use external-cloud-provider or without-lb [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors) respectively. For example,
4343

docs/book/src/development/development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ After generating `infrastructure-components.yaml`, replace the `us.gcr.io/k8s-ar
4848

4949
## Developing with Tilt
5050

51-
We have support for using [Tilt](https://tilt.dev/) for rapid iterative development. Please visit the [Cluster API documentation on Tilt](https://master.cluster-api.sigs.k8s.io/developer/tilt.html) for information on how to set up your development environment.
51+
We have support for using [Tilt](https://tilt.dev/) for rapid iterative development. Please visit the [Cluster API documentation on Tilt](https://cluster-api.sigs.k8s.io/developer/tilt.html) for information on how to set up your development environment.
5252

5353
## Running E2E tests locally
5454

@@ -104,7 +104,7 @@ $ openstack network list --external
104104

105105
### OpenStack prerequisites
106106

107-
The file [`test/e2e/data/e2e_conf.yaml`](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/master/test/e2e/data/e2e_conf.yaml) and the test templates under [`test/e2e/data/infrastructure-openstack`](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/tree/master/test/e2e/data/infrastructure-openstack) reference several OpenStack resources which must exist before running the test:
107+
The file [`test/e2e/data/e2e_conf.yaml`](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/test/e2e/data/e2e_conf.yaml) and the test templates under [`test/e2e/data/infrastructure-openstack`](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/tree/main/test/e2e/data/infrastructure-openstack) reference several OpenStack resources which must exist before running the test:
108108

109109
* Glance images
110110
* `cirros-0.5.1-x86_64-disk`

docs/book/src/topics/external-cloud-provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# External Cloud Provider
1111

12-
To deploy a cluster using [external cloud provider](https://github.com/kubernetes/cloud-provider-openstack), create a cluster configuration with the [external cloud provider template](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/master/templates/cluster-template-external-cloud-provider.yaml).
12+
To deploy a cluster using [external cloud provider](https://github.com/kubernetes/cloud-provider-openstack), create a cluster configuration with the [external cloud provider template](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/templates/cluster-template-external-cloud-provider.yaml).
1313

1414
## Steps
1515

netlify.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ GO_VERSION = "1.16"
88

99
# Standard Netlify redirects
1010
[[redirects]]
11-
from = "https://master--kubernetes-sigs-cluster-api-openstack.netlify.com/*"
12-
to = "https://master.cluster-api-openstack.sigs.k8s.io/:splat"
11+
from = "https://main--kubernetes-sigs-cluster-api-openstack.netlify.com/*"
12+
to = "https://main.cluster-api-openstack.sigs.k8s.io/:splat"
1313
status = 301
1414
force = true
1515

1616
[[redirects]]
17-
from = "http://master--kubernetes-sigs-cluster-api-openstack.netlify.com/*"
18-
to = "http://master.cluster-api-openstack.sigs.k8s.io/:splat"
17+
from = "http://main--kubernetes-sigs-cluster-api-openstack.netlify.com/*"
18+
to = "http://main.cluster-api-openstack.sigs.k8s.io/:splat"
1919
status = 301
2020
force = true
2121

2222
# HTTP-to-HTTPS rules
2323
[[redirects]]
24-
from = "http://master.cluster-api-openstack.sigs.k8s.io/*"
25-
to = "https://master.cluster-api-openstack.sigs.k8s.io/:splat"
24+
from = "http://main.cluster-api-openstack.sigs.k8s.io/*"
25+
to = "https://main.cluster-api-openstack.sigs.k8s.io/:splat"
2626
status = 301
2727
force = true

0 commit comments

Comments
 (0)