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.

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

Already on GitHub? Sign in to your account

change master to main in scripts and docs #1569

Merged
merged 2 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Go

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
env:
# Avoid noisy outputs like "tput: No value for $TERM and no -T specified"
TERM: dumb
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,4 @@ jobs:
with:
go-version: ${{ matrix.go }}
- name: "Run go vet"
run: "go vet ./pkg/..."
- name: "Run staticcheck"
uses: dominikh/staticcheck-action@v1
with:
cache-key: "${{ matrix.go }}"
install-go: false
version: "latest"
working-directory: "pkg"
run: "go vet ./pkg/..."
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Kompose CI
on:
push:
branches:
- master
- main
pull_request:
env:
# Avoid noisy outputs like "tput: No value for $TERM and no -T specified"
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,12 @@ gen-cmd:

# run all validation tests
.PHONY: validate
validate: gofmt vet staticcheck
validate: gofmt vet

.PHONY: vet
vet:
go vet ./pkg/...

.PHONY: staticcheck
staticcheck:
staticcheck ./pkg/...

.PHONY: gofmt
gofmt:
./script/check-gofmt.sh
Expand All @@ -114,7 +110,6 @@ test: bin test-dep validate test-unit-cover install test-cmd
test-dep:
go install github.com/mattn/goveralls@latest
go install github.com/modocache/gover@latest
go install honnef.co/go/tools/cmd/staticcheck@latest
go install github.com/mitchellh/gox@latest


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

## Use Case

Convert [`docker-compose.yaml`](https://github.com/raw/kubernetes/kompose/master/examples/docker-compose.yaml) into Kubernetes deployments and services with one simple command:
Convert [`docker-compose.yaml`](https://github.com/raw/kubernetes/kompose/main/examples/docker-compose.yaml) into Kubernetes deployments and services with one simple command:

```sh
$ kompose convert -f docker-compose.yaml
Expand Down Expand Up @@ -121,7 +121,7 @@ $ make test

## Documentation

Documentation can be found at our [kompose.io](http://kompose.io) website or our [docs](https://github.com/kubernetes/kompose/tree/master/docs) folder.
Documentation can be found at our [kompose.io](http://kompose.io) website or our [docs](https://github.com/kubernetes/kompose/tree/main/docs) folder.

Here is a list of all available docs:

Expand All @@ -148,7 +148,7 @@ Participation in the Kubernetes community is governed by the [Kubernetes Code of
[Build Status Widget]: https://github.com/kubernetes/kompose/workflows/Kompose%20CI/badge.svg
[GoDoc]: https://godoc.org/github.com/kubernetes/kompose
[GoDoc Widget]: https://godoc.org/github.com/kubernetes/kompose?status.svg
[Coverage Status Widget]: https://coveralls.io/repos/github/kubernetes/kompose/badge.svg?branch=master
[Coverage Status]: https://coveralls.io/github/kubernetes/kompose?branch=master
[Coverage Status Widget]: https://coveralls.io/repos/github/kubernetes/kompose/badge.svg?branch=main
[Coverage Status]: https://coveralls.io/github/kubernetes/kompose?branch=main
[GoReportCard Widget]: https://goreportcard.com/badge/github.com/kubernetes/kompose
[GoReportCardResult]: https://goreportcard.com/report/github.com/kubernetes/kompose
4 changes: 2 additions & 2 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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`.

Expand Down
12 changes: 6 additions & 6 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ Starting cluster components...
Kubectl is now configured to use the cluster
```

**Download an [example Docker Compose file](https://github.com/raw/kubernetes/kompose/master/examples/docker-compose.yaml), or use your own:**
**Download an [example Docker Compose file](https://github.com/raw/kubernetes/kompose/main/examples/docker-compose.yaml), or use your own:**

```sh
wget https://github.com/raw/kubernetes/kompose/master/examples/docker-compose.yaml
wget https://github.com/raw/kubernetes/kompose/main/examples/docker-compose.yaml
```

**Convert your Docker Compose file to Kubernetes:**
Expand Down Expand Up @@ -134,10 +134,10 @@ Starting local OpenShift cluster using 'kvm' hypervisor...
...
```

**Download an [example Docker Compose file](https://github.com/raw/kubernetes/kompose/master/examples/docker-compose.yaml), or use your own:**
**Download an [example Docker Compose file](https://github.com/raw/kubernetes/kompose/main/examples/docker-compose.yaml), or use your own:**

```sh
wget https://github.com/raw/kubernetes/kompose/master/examples/docker-compose.yaml
wget https://github.com/raw/kubernetes/kompose/main/examples/docker-compose.yaml
```

**Convert your Docker Compose file to OpenShift:**
Expand Down Expand Up @@ -254,10 +254,10 @@ Starting local OpenShift cluster using 'kvm' hypervisor...
...
```

**Download an [example Docker Compose file](https://github.com/raw/kubernetes/kompose/master/examples/docker-compose.yaml), or use your own:**
**Download an [example Docker Compose file](https://github.com/raw/kubernetes/kompose/main/examples/docker-compose.yaml), or use your own:**

```sh
wget https://github.com/raw/kubernetes/kompose/master/examples/docker-compose.yaml
wget https://github.com/raw/kubernetes/kompose/main/examples/docker-compose.yaml
```

**Convert your Docker Compose file to OpenShift:**
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/maven-example.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 0 additions & 2 deletions script/test_in_container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ ENV PATH="$PATH:$GOPATH/bin:$GOROOT/bin" \
WORKDIR /tmp/go
RUN curl https://storage.googleapis.com/golang/go$GOVERSION.linux-amd64.tar.gz | tar -xz -C /usr/local

RUN go get honnef.co/go/tools/cmd/staticcheck@latest

WORKDIR $KOMPOSE_SRC
# This image can be run as any user
RUN chmod -R ugo+rw $GOPATH
Expand Down