change master to main in scripts and docs (#1569)

* change master to main in scripts and docs

Changes the naming from master to main in the scripts and documentation.

Do not merge unless CI passes!

Signed-off-by: Charlie Drage <charlie@charliedrage.com>

* remove 1.18, specify version of staticcheck

---------

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
This commit is contained in:
Charlie Drage
2023-02-08 15:42:16 -05:00
committed by GitHub
parent a2b2a1f304
commit d43aefd882
10 changed files with 19 additions and 33 deletions
+2 -2
View File
@@ -41,7 +41,7 @@ git checkout -b myfeature
```console
git fetch upstream
git rebase upstream/master
git rebase upstream/main
```
Note: If you have write access to the main repository at github.com/kubernetes/kompose, you should modify your git configuration so that you can't accidentally push to upstream:
@@ -77,7 +77,7 @@ Currently, it is not possible to use a different Kubernetes version from the ver
### Adding CLI tests
[Kompose CLI tests](https://github.com/kubernetes/kompose/tree/master/script/test/cmd) run `kompose convert` with docker-compose files, and cross-check the k8s and OpenShift artifacts generated with the template files.
[Kompose CLI tests](https://github.com/kubernetes/kompose/tree/main/script/test/cmd) run `kompose convert` with docker-compose files, and cross-check the k8s and OpenShift artifacts generated with the template files.
To generate CLI tests, please run `make gen-cmd`.
+6 -6
View File
@@ -44,10 +44,10 @@ Starting cluster components...
Kubectl is now configured to use the cluster
```
**Download an [example Docker Compose file](https://raw.githubusercontent.com/kubernetes/kompose/master/examples/docker-compose.yaml), or use your own:**
**Download an [example Docker Compose file](https://raw.githubusercontent.com/kubernetes/kompose/main/examples/docker-compose.yaml), or use your own:**
```sh
wget https://raw.githubusercontent.com/kubernetes/kompose/master/examples/docker-compose.yaml
wget https://raw.githubusercontent.com/kubernetes/kompose/main/examples/docker-compose.yaml
```
**Convert your Docker Compose file to Kubernetes:**
@@ -134,10 +134,10 @@ Starting local OpenShift cluster using 'kvm' hypervisor...
...
```
**Download an [example Docker Compose file](https://raw.githubusercontent.com/kubernetes/kompose/master/examples/docker-compose.yaml), or use your own:**
**Download an [example Docker Compose file](https://raw.githubusercontent.com/kubernetes/kompose/main/examples/docker-compose.yaml), or use your own:**
```sh
wget https://raw.githubusercontent.com/kubernetes/kompose/master/examples/docker-compose.yaml
wget https://raw.githubusercontent.com/kubernetes/kompose/main/examples/docker-compose.yaml
```
**Convert your Docker Compose file to OpenShift:**
@@ -254,10 +254,10 @@ Starting local OpenShift cluster using 'kvm' hypervisor...
...
```
**Download an [example Docker Compose file](https://raw.githubusercontent.com/kubernetes/kompose/master/examples/docker-compose.yaml), or use your own:**
**Download an [example Docker Compose file](https://raw.githubusercontent.com/kubernetes/kompose/main/examples/docker-compose.yaml), or use your own:**
```sh
wget https://raw.githubusercontent.com/kubernetes/kompose/master/examples/docker-compose.yaml
wget https://raw.githubusercontent.com/kubernetes/kompose/main/examples/docker-compose.yaml
```
**Convert your Docker Compose file to OpenShift:**
+1 -1
View File
@@ -37,7 +37,7 @@ Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v
## Go
Installing using `go install` pulls from the master branch with the latest development changes.
Installing using `go install` pulls from the main branch with the latest development changes.
```sh
go install github.com/kubernetes/kompose@latest
+1 -1
View File
@@ -106,4 +106,4 @@ Created the new window in existing browser session.
It will open your application endpoint in default browser.
![Output-Diagram](https://github.com/kubernetes/kompose/blob/master/docs/images/kompose-maven-output-diagram.png)
![Output-Diagram](https://github.com/kubernetes/kompose/blob/main/docs/images/kompose-maven-output-diagram.png)