Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃尡 Change a few more references from master branch to main branch #5312

Merged
merged 1 commit into from Sep 24, 2021
Merged

馃尡 Change a few more references from master branch to main branch #5312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/golangci-lint.yml
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ on:
types: [opened, edited, synchronize, reopened]
branches:
- main
- master
jobs:
golangci:
name: lint
Expand Down
2 changes: 1 addition & 1 deletion OWNERS
View file
Open in desktop
@@ -1,5 +1,5 @@
# See the OWNERS docs at https://go.k8s.io/owners for information on OWNERS files.
# See the OWNERS_ALIASES file at https://github.com/kubernetes-sigs/cluster-api/blob/master/OWNERS_ALIASES for a list of members for each alias.
# See the OWNERS_ALIASES file at https://github.com/kubernetes-sigs/cluster-api/blob/main/OWNERS_ALIASES for a list of members for each alias.

approvers:
- sig-cluster-lifecycle-leads
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/config/default/manager_image_patch.yaml
View file
Open in desktop
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:master
- image: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:main
name: manager
6 changes: 3 additions & 3 deletions cmd/clusterctl/client/cluster/template_test.go
View file
Open in desktop
Expand Up @@ -188,15 +188,15 @@ func Test_templateClient_getGitHubFileContent(t *testing.T) {
{
name: "Return custom template",
args: args{
rURL: mustParseURL("https://github.com/kubernetes-sigs/cluster-api/blob/master/config/default/cluster-template.yaml"),
rURL: mustParseURL("https://github.com/kubernetes-sigs/cluster-api/blob/main/config/default/cluster-template.yaml"),
},
want: []byte(template),
wantErr: false,
},
{
name: "Wrong url",
args: args{
rURL: mustParseURL("https://github.com/kubernetes-sigs/cluster-api/blob/master/config/default/something-else.yaml"),
rURL: mustParseURL("https://github.com/kubernetes-sigs/cluster-api/blob/main/config/default/something-else.yaml"),
},
want: nil,
wantErr: true,
Expand Down Expand Up @@ -331,7 +331,7 @@ func Test_templateClient_GetFromURL(t *testing.T) {
{
name: "Get from GitHub",
args: args{
templateURL: "https://github.com/kubernetes-sigs/cluster-api/blob/master/config/default/cluster-template.yaml",
templateURL: "https://github.com/kubernetes-sigs/cluster-api/blob/main/config/default/cluster-template.yaml",
targetNamespace: "",
skipTemplateProcess: false,
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/repository/repository_github_test.go
View file
Open in desktop
Expand Up @@ -608,7 +608,7 @@ func Test_gitHubRepository_downloadFilesFromRelease(t *testing.T) {
client, mux, teardown := test.NewFakeGitHub()
defer teardown()

providerConfig := config.NewProvider("test", "https://github.com/o/r/releases/v0.4.1/file.yaml", clusterctlv1.CoreProviderType) // tree/master/path not relevant for the test
providerConfig := config.NewProvider("test", "https://github.com/o/r/releases/v0.4.1/file.yaml", clusterctlv1.CoreProviderType) // tree/main/path not relevant for the test

// test.NewFakeGitHub an handler for returning a fake release asset
mux.HandleFunc("/repos/o/r/releases/assets/1", func(w http.ResponseWriter, r *http.Request) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/tree/doc.go
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ understanding if there are problems and where.
The "at glance" view is based on the idea that we should avoid to overload the user with information, but instead
surface problems, if any; in practice:

- The view assumes we are processing objects conforming with https://github.com/kubernetes-sigs/cluster-api/blob/master/docs/proposals/20200506-conditions.md.
- The view assumes we are processing objects conforming with https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20200506-conditions.md.
As a consequence each object should have a Ready condition summarizing the object state.

- The view organizes objects in a hierarchical tree, however it is not required that the
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/cmd/generate_cluster.go
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ var generateClusterClusterCmd = &cobra.Command{
clusterctl generate cluster my-cluster --from-config-map MyTemplates

# Generates a yaml file for creating workload clusters using a template from a specific URL.
clusterctl generate cluster my-cluster --from https://github.com/foo-org/foo-repository/blob/master/cluster-template.yaml
clusterctl generate cluster my-cluster --from https://github.com/foo-org/foo-repository/blob/main/cluster-template.yaml

# Generates a yaml file for creating workload clusters using a template stored locally.
clusterctl generate cluster my-cluster --from ~/workspace/cluster-template.yaml
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/cmd/generate_yaml.go
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ var generateYamlCmd = &cobra.Command{
Example: Examples(`
# Generates a configuration file with variable values using
a template from a specific URL.
clusterctl generate yaml --from https://github.com/foo-org/foo-repository/blob/master/cluster-template.yaml
clusterctl generate yaml --from https://github.com/foo-org/foo-repository/blob/main/cluster-template.yaml

# Generates a configuration file with variable values using
a template stored locally.
Expand Down
16 changes: 8 additions & 8 deletions cmd/clusterctl/internal/util/objs_test.go
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ func Test_inspectImages(t *testing.T) {
"containers": []map[string]interface{}{
{
"name": controllerContainerName,
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:master",
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:main",
},
},
},
Expand All @@ -63,7 +63,7 @@ func Test_inspectImages(t *testing.T) {
},
},
},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master"},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:main"},
wantErr: false,
},
{
Expand All @@ -80,7 +80,7 @@ func Test_inspectImages(t *testing.T) {
"containers": []map[string]interface{}{
{
"name": controllerContainerName,
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:master",
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:main",
},
},
},
Expand All @@ -90,7 +90,7 @@ func Test_inspectImages(t *testing.T) {
},
},
},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master"},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:main"},
wantErr: false,
},
{
Expand All @@ -107,7 +107,7 @@ func Test_inspectImages(t *testing.T) {
"containers": []map[string]interface{}{
{
"name": controllerContainerName,
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:master",
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:main",
},
},
"initContainers": []map[string]interface{}{
Expand All @@ -123,7 +123,7 @@ func Test_inspectImages(t *testing.T) {
},
},
},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master", "gcr.io/k8s-staging-cluster-api/cluster-api-controller:init"},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:main", "gcr.io/k8s-staging-cluster-api/cluster-api-controller:init"},
wantErr: false,
},
{
Expand All @@ -140,7 +140,7 @@ func Test_inspectImages(t *testing.T) {
"containers": []map[string]interface{}{
{
"name": controllerContainerName,
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:master",
"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:main",
},
},
"initContainers": []map[string]interface{}{
Expand All @@ -156,7 +156,7 @@ func Test_inspectImages(t *testing.T) {
},
},
},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master", "gcr.io/k8s-staging-cluster-api/cluster-api-controller:init"},
want: []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:main", "gcr.io/k8s-staging-cluster-api/cluster-api-controller:init"},
wantErr: false,
},
}
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
View file
Open in desktop
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: gcr.io/k8s-staging-cluster-api/cluster-api-controller:master
- image: gcr.io/k8s-staging-cluster-api/cluster-api-controller:main
name: manager
2 changes: 1 addition & 1 deletion controlplane/kubeadm/config/default/manager_image_patch.yaml
View file
Open in desktop
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:master
- image: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:main
name: manager
2 changes: 1 addition & 1 deletion controlplane/kubeadm/controllers/remediation.go
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ import (
)

// reconcileUnhealthyMachines tries to remediate KubeadmControlPlane unhealthy machines
// based on the process described in https://github.com/kubernetes-sigs/cluster-api/blob/master/docs/proposals/20191017-kubeadm-based-control-plane.md#remediation-using-delete-and-recreate
// based on the process described in https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20191017-kubeadm-based-control-plane.md#remediation-using-delete-and-recreate
func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.Context, controlPlane *internal.ControlPlane) (ret ctrl.Result, retErr error) {
log := ctrl.LoggerFrom(ctx)

Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/developer/e2e.md
View file
Open in desktop
Expand Up @@ -205,7 +205,7 @@ test specs for the most common Cluster API use cases.
[deprecated InitManagementCluster method]: https://pkg.go.dev/sigs.k8s.io/cluster-api/test/framework?tab=doc#InitManagementCluster
[Apply method]: https://pkg.go.dev/sigs.k8s.io/cluster-api/test/framework?tab=doc#Applier
[CAPA E2E tests]: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/scripts/ci-e2e.sh
[CAPG E2E tests]: https://github.com/kubernetes-sigs/cluster-api-provider-gcp/blob/master/scripts/ci-e2e.sh
[CAPG E2E tests]: https://github.com/kubernetes-sigs/cluster-api-provider-gcp/blob/main/scripts/ci-e2e.sh
[WaitForClusterToProvision]: https://pkg.go.dev/sigs.k8s.io/cluster-api/test/framework?tab=doc#WaitForClusterToProvision
[WaitForKubeadmControlPlaneMachinesToExist]: https://pkg.go.dev/sigs.k8s.io/cluster-api/test/framework?tab=doc#WaitForKubeadmControlPlaneMachinesToExist
[controller-runtime Client]: https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.5.2/pkg/client?tab=doc#Client
Expand Down
4 changes: 2 additions & 2 deletions docs/book/src/reference/providers.md
View file
Open in desktop
Expand Up @@ -33,6 +33,6 @@ updated info about which API version they are supporting.

Following are the implementations managed by third-parties adopting the standard cluster-api and/or machine-api being developed here.

* [Kubermatic machine controller](https://github.com/kubermatic/machine-controller/tree/master)
* [OpenShift Machine API Operator](https://github.com/openshift/machine-api-operator/tree/master)
* [Kubermatic machine controller](https://github.com/kubermatic/machine-controller)
* [OpenShift Machine API Operator](https://github.com/openshift/machine-api-operator)
* [Gardener Machine controller manager](https://github.com/gardener/machine-controller-manager/tree/cluster-api)
2 changes: 1 addition & 1 deletion docs/proposals/20191017-kubeadm-based-control-plane.md
View file
Open in desktop
Expand Up @@ -489,7 +489,7 @@ When `MaxSurge` is set to 0 the rollout algorithm is as follows:
###### Why delete and recreate

When replacing a KCP machine the most critical component to be taken into account is etcd, and
according to the [etcd documentation](https://github.com/etcd-io/etcd/blob/master/Documentation/faq.md#should-i-add-a-member-before-removing-an-unhealthy-member),
according to the [etcd documentation](https://etcd.io/docs/v3.5/faq/#should-i-add-a-member-before-removing-an-unhealthy-member),
it's important to remove an unhealthy etcd member first and then add its replacement:

- etcd employs distributed consensus based on a quorum model; (n/2)+1 members, a majority, must agree on a proposal before
Expand Down
4 changes: 2 additions & 2 deletions docs/proposals/20200511-clusterctl-extensible-template-processing.md
View file
Open in desktop
Expand Up @@ -62,12 +62,12 @@ Some templating tools that can be used to manage your templates.
* Cue - Cue Data Constraint Language.
* Source: https://github.com/cuelang/cue
* Dhall - Dhall Programming Configuration Language.
* Source: https://github.com/dhall-lang/dhall-lang/blob/master/README.md
* Source: https://github.com/dhall-lang/dhall-lang
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change technically changes the link, we are now pointing to the repo root rather than the readme explicitly. Does this matter?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it really matters as the repo root also shows the README, but it's totally fine for me if we want to change it back

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really have a strong opinion, but my thought was basically, when this was introduced, was there a deliberate intention to make it point to the readme file directly 馃

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, let's see if anyone else remembers :)

* Golang Library: https://github.com/philandstuff/dhall-golang
* Kubernetes Library: https://github.com/dhall-lang/dhall-kubernetes
* Helm Template
* Doc: https://helm.sh/docs/helm/helm_template/
* Code: https://github.com/helm/helm/blob/master/cmd/helm/template.go
* Code: https://github.com/helm/helm/blob/main/cmd/helm/template.go


## Summary
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/config/default/manager_image_patch.yaml
View file
Open in desktop
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: gcr.io/k8s-staging-cluster-api/capd-manager:master
- image: gcr.io/k8s-staging-cluster-api/capd-manager:main
name: manager
2 changes: 1 addition & 1 deletion test/infrastructure/docker/third_party/forked/rerun-process-wrapper/README.md
View file
Open in desktop
@@ -1,7 +1,7 @@
# Rerunning your process via `live_update`
## i.e., simulating [`restart_container()`](https://docs.tilt.dev/live_update_reference.html#restart_container) on non-Docker clusters

As of 6/28/19: `restart_container()`, a command that can be passed to a `live_update`, doesn't work on non-Docker clusters. However there's a workaround available to simulate `restart_container()`'s functionality. It's used in [the onewatch integration test](https://github.com/windmilleng/tilt/tree/master/integration/onewatch) so that the test passes on non-Docker clusters. Here's how to do it yourself:
As of 6/28/19: `restart_container()`, a command that can be passed to a `live_update`, doesn't work on non-Docker clusters. However there's a workaround available to simulate `restart_container()`'s functionality. It's used in [the onewatch integration test](https://github.com/tilt-dev/tilt/tree/master/integration/onewatch) so that the test passes on non-Docker clusters. Here's how to do it yourself:

Copy `start.sh` and `restart.sh` to your container working dir.

Expand Down