Fix GitHub actions and documentation links after renaming the default branch to main

.github/workflows/go.yml

@@ -7,9 +7,9 @@ env:
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main, 0.5.x ]
   pull_request:
-    branches: [ master ]
+    branches: [ main, 0.5.x ]
 
 jobs:
 
@@ -31,14 +31,14 @@ jobs:
         driver: docker
     - name: Containerized End-to-End Tests
       run: eval $(minikube -p minikube docker-env) && make test-e2e-minikube
-    - name: Docker Login to Quay.io (master only)
+    - name: Docker Login to Quay.io (main only)
       uses: docker/[email protected]
-      if: github.ref == 'refs/heads/master'
+      if: github.ref == 'refs/heads/main'
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ env.REGISTRY_USER }}
         password: ${{ env.REGISTRY_PASSWORD }}
-    - name: Build and Push Image (master only)
-      if: github.ref == 'refs/heads/master'
+    - name: Build and Push Image (main only)
+      if: github.ref == 'refs/heads/main'
       run: make push
 

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v2
-      - name: Docker Login to Quay.io (master only)
+      - name: Docker Login to Quay.io (main only)
         uses: docker/[email protected]
         with:
           registry: ${{ env.REGISTRY }}

README.adoc

@@ -1,4 +1,4 @@
-image:https://github.com/wildfly/wildfly-operator/actions/workflows/go.yml/badge.svg?branch=master["Go",link="https://github.com/wildfly/wildfly-operator/actions/workflows/go.yml"]
+image:https://github.com/wildfly/wildfly-operator/actions/workflows/go.yml/badge.svg?branch=main["Go",link="https://github.com/wildfly/wildfly-operator/actions/workflows/go.yml"]
 image:https://quay.io/repository/wildfly/wildfly-operator/status?token=c568da69-fcdb-4b58-8821-5e98f6522290["Docker Repository on Quay", link="https://quay.io/repository/wildfly/wildfly-operator"]
 image:https://goreportcard.com/badge/github.com/wildfly/wildfly-operator["Go Report Card", link="https://goreportcard.com/report/github.com/wildfly/wildfly-operator"]
 image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Join Chat", link="https://wildfly.zulipchat.com/"]
@@ -17,7 +17,7 @@ Once installed, the WildFly Operator provides the following features:
 
 The operator acts on the following Custom Resource Definitions (CRDs):
 
-* `WildFlyServer`, which defines a WildFly deployment. The `Spec` and `Status` of this resources are defined in the https://github.com/wildfly/wildfly-operator/blob/master/doc/apis.adoc[API documentation].
+* `WildFlyServer`, which defines a WildFly deployment. The `Spec` and `Status` of this resources are defined in the https://github.com/wildfly/wildfly-operator/blob/main/doc/apis.adoc[API documentation].
 
 ## Quickstart
 
@@ -35,7 +35,7 @@ $ kubectl apply -f deploy/operator.yaml
 
 ### Install a custom resource
 
-An example of a custom resource of `WildFlyServer` is described in https://github.com/wildfly/wildfly-operator/blob/master/deploy/crds/quickstart-cr.yaml[quickstart-cr.yaml]:
+An example of a custom resource of `WildFlyServer` is described in https://github.com/wildfly/wildfly-operator/blob/main/deploy/crds/quickstart-cr.yaml[quickstart-cr.yaml]:
 
 [source,yaml]
 ----

build/release.sh

@@ -32,11 +32,11 @@ main() {
   else
     # push the tag
     git push upstream ${RELEASE_NAME}
-    # merge the release branch into master
-    git checkout master
+    # merge the release branch into main
+    git checkout main
     git merge --ff-only ${RELEASE_BRANCH}
-    # and push master to upstream
-    git push upstream master
+    # and push main to upstream
+    git push upstream main
     git branch -D ${RELEASE_BRANCH}
   fi
 }

doc/apis.adoc

@@ -11,9 +11,9 @@ This document describes the types introduced by the WildFly Operator to be consu
 [options="header,footer"]
 |=======================
 | Field  | Description |Scheme| Required
-| `metadata` | Standard object's metadata (https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata[more info]) | https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#objectmeta-v1-meta[metav1.ObjectMeta] | false
-| `spec` | Specification of the desired behaviour of the WildFly deployment (https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status[more info]) | <<wildflyserverspec>> | true
-| `status` | Most recent observed status of the WildFly deployment. Read-only. (https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status[more info]) | <<wildflyserverstatus>> | false |
+| `metadata` | Standard object's metadata (https://github.com/kubernetes/community/blob/main/contributors/devel/sig-architecture/api-conventions.md#metadata[more info]) | https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#objectmeta-v1-meta[metav1.ObjectMeta] | false
+| `spec` | Specification of the desired behaviour of the WildFly deployment (https://github.com/kubernetes/community/blob/main/contributors/devel/sig-architecture/api-conventions.md#spec-and-status[more info]) | <<wildflyserverspec>> | true
+| `status` | Most recent observed status of the WildFly deployment. Read-only. (https://github.com/kubernetes/community/blob/main/contributors/devel/sig-architecture/api-conventions.md#spec-and-status[more info]) | <<wildflyserverstatus>> | false |
 |=======================
 
 [[wildflyservelist]]
@@ -24,7 +24,7 @@ This document describes the types introduced by the WildFly Operator to be consu
 [options="header,footer"]
 |=======================
 | Field  | Description |Scheme| Required
-| `metadata` | Standard list's metadata (https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata[more info]) | https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#listmeta-v1-meta[metav1.ListMeta] | false
+| `metadata` | Standard list's metadata (https://github.com/kubernetes/community/blob/main/contributors/devel/sig-architecture/api-conventions.md#metadata[more info]) | https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#listmeta-v1-meta[metav1.ListMeta] | false
 | `items` | List of `WildFlyServer` | []<<wildflyserver>> | true
 |=======================
 

examples/clustering/README.adoc

@@ -18,7 +18,7 @@ Since the default clustering mechanism used by WildFly requires interaction with
 $ kubectl apply -f examples/clustering/crds/role_binding.yaml
 ----
 
-The application is defined in the https://github.com/wildfly/wildfly-operator/blob/master/examples/clustering/crds/clusterbenc.yaml[clusterbench.yaml file]:
+The application is defined in the https://github.com/wildfly/wildfly-operator/blob/main/examples/clustering/crds/clusterbenc.yaml[clusterbench.yaml file]:
 
 [source,yaml]
 ----

examples/postgresql/README.adoc

@@ -72,7 +72,7 @@ database-password:  16 bytes
 
 # Deploy the application
 
-The application is defined in the https://github.com/wildfly/wildfly-operator/blob/master/examples/tasksrs/crds/taskrs-app.yaml[taksrs-app.yaml file]:
+The application is defined in the https://github.com/wildfly/wildfly-operator/blob/main/examples/tasksrs/crds/taskrs-app.yaml[taksrs-app.yaml file]:
 
 [source,yaml]
 ----
@@ -105,7 +105,7 @@ spec:
         name: postgresql
 ----
 
-This custom resource will run the https://github.com/wildfly/wildfly-s2i/tree/master/test/test-app-postgres[test-app-postgres] application from the https://quay.io/repository/wildfly-quickstarts/taskrs-app[quay.io/wildfly-quickstarts/taskrs-app:latest] image that is using the https://github.com/wildfly/wildfly-s2i[Source-to-Image (S2I) template for WildFly].
+This custom resource will run the https://github.com/wildfly/wildfly-s2i/tree/main/test/test-app-postgres[test-app-postgres] application from the https://quay.io/repository/wildfly-quickstarts/taskrs-app[quay.io/wildfly-quickstarts/taskrs-app:latest] image that is using the https://github.com/wildfly/wildfly-s2i[Source-to-Image (S2I) template for WildFly].
 
 The application requires the following Environment variables to configure its connection to PostgreSQL:
 

test/e2e/wildflyserver_test.go

@@ -1,3 +1,4 @@
+//go:build !unit
 // +build !unit
 
 package e2e
@@ -36,7 +37,7 @@ func TestWildFlyServer(t *testing.T) {
 		// It can be run when the operator is inside the container platform.
 		// However for the CI tests, that means that it will not use the operator code
 		// from the same commit but the latest image from wildfly/wildfly-operator
-		// (corresponding to the latest commit on master branch)
+		// (corresponding to the latest commit on main branch)
 		t.Run("ScaleDownTest", wildflyScaleDownTest)
 	}
 }