From d85321009b4523ecc33f0450e04077bb324e9aae Mon Sep 17 00:00:00 2001 From: Sean Wei Date: Mon, 25 Apr 2022 15:54:40 +0800 Subject: [PATCH 1/4] Fix GitHub word for Jenkins scripts --- hack/jenkins/cloud_shell_functional_tests_docker.sh | 2 +- hack/jenkins/linux_integration_tests_docker.sh | 2 +- hack/jenkins/linux_integration_tests_docker_arm64.sh | 2 +- hack/jenkins/linux_integration_tests_docker_containerd.sh | 2 +- .../linux_integration_tests_docker_containerd_arm64.sh | 2 +- hack/jenkins/linux_integration_tests_docker_crio.sh | 2 +- hack/jenkins/linux_integration_tests_docker_crio_arm64.sh | 2 +- hack/jenkins/linux_integration_tests_kvm.sh | 2 +- hack/jenkins/linux_integration_tests_kvm_containerd.sh | 2 +- hack/jenkins/linux_integration_tests_kvm_crio.sh | 2 +- hack/jenkins/linux_integration_tests_none.sh | 2 +- hack/jenkins/linux_integration_tests_podman.sh | 2 +- hack/jenkins/linux_integration_tests_virtualbox.sh | 2 +- hack/jenkins/minikube_cross_build_and_upload.sh | 2 +- hack/jenkins/minikube_set_pending.sh | 6 +++--- hack/jenkins/osx_integration_tests_docker.sh | 2 +- hack/jenkins/osx_integration_tests_hyperkit.sh | 2 +- hack/jenkins/osx_integration_tests_virtualbox.sh | 2 +- hack/jenkins/release_build_and_upload.sh | 2 +- hack/jenkins/release_github_page.sh | 4 ++-- hack/jenkins/release_update_releases_json.sh | 2 +- hack/jenkins/test-flake-chart/compute_flake_rate.sh | 2 +- hack/jenkins/test-flake-chart/sync_tests.sh | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hack/jenkins/cloud_shell_functional_tests_docker.sh b/hack/jenkins/cloud_shell_functional_tests_docker.sh index 512e3108b4..bf4fbc24f2 100755 --- a/hack/jenkins/cloud_shell_functional_tests_docker.sh +++ b/hack/jenkins/cloud_shell_functional_tests_docker.sh @@ -20,7 +20,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -x diff --git a/hack/jenkins/linux_integration_tests_docker.sh b/hack/jenkins/linux_integration_tests_docker.sh index 6e85d4d133..76d2a75268 100755 --- a/hack/jenkins/linux_integration_tests_docker.sh +++ b/hack/jenkins/linux_integration_tests_docker.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_docker_arm64.sh b/hack/jenkins/linux_integration_tests_docker_arm64.sh index cf10462fd8..3e37be2439 100644 --- a/hack/jenkins/linux_integration_tests_docker_arm64.sh +++ b/hack/jenkins/linux_integration_tests_docker_arm64.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" diff --git a/hack/jenkins/linux_integration_tests_docker_containerd.sh b/hack/jenkins/linux_integration_tests_docker_containerd.sh index 73165241c1..a6fd8eeef6 100755 --- a/hack/jenkins/linux_integration_tests_docker_containerd.sh +++ b/hack/jenkins/linux_integration_tests_docker_containerd.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh b/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh index 3ea2454c4f..6e0e505fe2 100644 --- a/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh +++ b/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" diff --git a/hack/jenkins/linux_integration_tests_docker_crio.sh b/hack/jenkins/linux_integration_tests_docker_crio.sh index 0f7327173c..466e62f685 100755 --- a/hack/jenkins/linux_integration_tests_docker_crio.sh +++ b/hack/jenkins/linux_integration_tests_docker_crio.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh b/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh index b573c28abb..eeb7b03a6d 100644 --- a/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh +++ b/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" diff --git a/hack/jenkins/linux_integration_tests_kvm.sh b/hack/jenkins/linux_integration_tests_kvm.sh index 7491153ea8..e88b2c5b0f 100755 --- a/hack/jenkins/linux_integration_tests_kvm.sh +++ b/hack/jenkins/linux_integration_tests_kvm.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_kvm_containerd.sh b/hack/jenkins/linux_integration_tests_kvm_containerd.sh index 116ab5a142..82c5c89930 100755 --- a/hack/jenkins/linux_integration_tests_kvm_containerd.sh +++ b/hack/jenkins/linux_integration_tests_kvm_containerd.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_kvm_crio.sh b/hack/jenkins/linux_integration_tests_kvm_crio.sh index 5b99712ad0..10414d1a7a 100755 --- a/hack/jenkins/linux_integration_tests_kvm_crio.sh +++ b/hack/jenkins/linux_integration_tests_kvm_crio.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 118fdd08e9..10d5aa4d85 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh index fcdd5072e6..fd19ae9e2a 100755 --- a/hack/jenkins/linux_integration_tests_podman.sh +++ b/hack/jenkins/linux_integration_tests_podman.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/linux_integration_tests_virtualbox.sh b/hack/jenkins/linux_integration_tests_virtualbox.sh index 9bf1ff7b26..0957872928 100755 --- a/hack/jenkins/linux_integration_tests_virtualbox.sh +++ b/hack/jenkins/linux_integration_tests_virtualbox.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index d0a0a1cc3e..5f9a4effbe 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -15,7 +15,7 @@ # limitations under the License. # This script builds the minikube binary for all 3 platforms and uploads them. -# This is to done as part of the CI tests for Github PRs +# This is to done as part of the CI tests for GitHub PRs # The script expects the following env variables: # ghprbPullId: The pull request ID, injected from the ghpbr plugin. diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index 410715566e..cd35c0959f 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -15,14 +15,14 @@ # limitations under the License. -# This script creates several Github statuses using the Github API: https://developer.github.com/v3/repos/statuses/ -# This is intended to run before the tests start, so the icons show up on the Github PR and block submit until +# This script creates several GitHub statuses using the GitHub API: https://developer.github.com/v3/repos/statuses/ +# This is intended to run before the tests start, so the icons show up on the GitHub PR and block submit until # the tests finish. # The script expects the following env variables: # ghprbPullId: The pull request ID, injected from the ghpbr plugin. # ghprbActualCommit: The commit hash, injected from the ghpbr plugin. -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -eux -o pipefail diff --git a/hack/jenkins/osx_integration_tests_docker.sh b/hack/jenkins/osx_integration_tests_docker.sh index 3635553cb5..a177d0d41e 100755 --- a/hack/jenkins/osx_integration_tests_docker.sh +++ b/hack/jenkins/osx_integration_tests_docker.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -e diff --git a/hack/jenkins/osx_integration_tests_hyperkit.sh b/hack/jenkins/osx_integration_tests_hyperkit.sh index f1acffbdef..52d81595f3 100755 --- a/hack/jenkins/osx_integration_tests_hyperkit.sh +++ b/hack/jenkins/osx_integration_tests_hyperkit.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. set -ex diff --git a/hack/jenkins/osx_integration_tests_virtualbox.sh b/hack/jenkins/osx_integration_tests_virtualbox.sh index b10f6a52f7..06aa488ba8 100755 --- a/hack/jenkins/osx_integration_tests_virtualbox.sh +++ b/hack/jenkins/osx_integration_tests_virtualbox.sh @@ -21,7 +21,7 @@ # MINIKUBE_LOCATION: GIT_COMMIT from upstream build. # COMMIT: Actual commit ID from upstream build # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests -# access_token: The Github API access token. Injected by the Jenkins credential provider. +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. OS="darwin" diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh index 48cf78d198..0f3cfd110e 100755 --- a/hack/jenkins/release_build_and_upload.sh +++ b/hack/jenkins/release_build_and_upload.sh @@ -22,7 +22,7 @@ # VERSION_MINOR: The minor version of the tag to be released. # VERSION_BUILD: The build version of the tag to be released. # BUCKET: The GCP bucket the build files should be uploaded to. -# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider. +# GITHUB_TOKEN: The GitHub API access token. Injected by the Jenkins credential provider. set -eux -o pipefail readonly VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}" diff --git a/hack/jenkins/release_github_page.sh b/hack/jenkins/release_github_page.sh index 9bf7f646a2..932c9134d0 100755 --- a/hack/jenkins/release_github_page.sh +++ b/hack/jenkins/release_github_page.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This script generates the Github Release page and uploads all the binaries/etc to that page +# This script generates the GitHub Release page and uploads all the binaries/etc to that page # This is intended to be run on a new release tag in order to generate the github release page for that release # The script expects the following env variables: @@ -22,7 +22,7 @@ # VERSION_MINOR: The minor version of the tag to be released. # VERSION_BUILD: The build version of the tag to be released. # ISO_SHA256: The sha 256 of the minikube-iso for the current release. -# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider. +# GITHUB_TOKEN: The GitHub API access token. Injected by the Jenkins credential provider. set -eux -o pipefail readonly VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}" diff --git a/hack/jenkins/release_update_releases_json.sh b/hack/jenkins/release_update_releases_json.sh index ea17bd31fb..ceda9ae838 100755 --- a/hack/jenkins/release_update_releases_json.sh +++ b/hack/jenkins/release_update_releases_json.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This script generates the Github Release page and uploads all the binaries/etc to that page +# This script generates the GitHub Release page and uploads all the binaries/etc to that page # This is intended to be run on a new release tag in order to generate the github release page for that release # The script expects the following env variables: diff --git a/hack/jenkins/test-flake-chart/compute_flake_rate.sh b/hack/jenkins/test-flake-chart/compute_flake_rate.sh index eb4c6d5165..9637f37701 100644 --- a/hack/jenkins/test-flake-chart/compute_flake_rate.sh +++ b/hack/jenkins/test-flake-chart/compute_flake_rate.sh @@ -39,7 +39,7 @@ CLOSE_ISSUE_THRESHOLD=20 "${DIR}/../installers/check_install_gh.sh" || true -# Get a list of issues from Github and extract only those that look like flake issues. +# Get a list of issues from GitHub and extract only those that look like flake issues. # Sort by test name for later usage. EXISTING_ISSUES_LIST=$(mktemp) gh issue list -L 10000 -s all -A "minikube-bot" -l kind/failing-test \ diff --git a/hack/jenkins/test-flake-chart/sync_tests.sh b/hack/jenkins/test-flake-chart/sync_tests.sh index a3b12dab7a..c09b51879c 100644 --- a/hack/jenkins/test-flake-chart/sync_tests.sh +++ b/hack/jenkins/test-flake-chart/sync_tests.sh @@ -20,7 +20,7 @@ # flakes or uploads flakes to flake data. # # This script expects the following env variables: -# MINIKUBE_LOCATION: The Github location being run on (e.g. master, 11000). +# MINIKUBE_LOCATION: The GitHub location being run on (e.g. master, 11000). # COMMIT: Commit hash the tests ran on. # ROOT_JOB_ID: Job ID to use for synchronization. From 892cb035d392e168ed8a0d3e828ea0dae02ad04d Mon Sep 17 00:00:00 2001 From: Sean Wei Date: Mon, 25 Apr 2022 15:56:42 +0800 Subject: [PATCH 2/4] Fix GitHub word for document --- README.md | 2 +- site/content/en/docs/contrib/documentation.en.md | 2 +- site/content/en/docs/contrib/external-packages.en.md | 2 +- site/content/en/docs/contrib/releasing/binaries.md | 2 +- site/content/en/docs/contrib/tests.en.md | 2 +- site/content/en/docs/tutorials/continuous_integration.md | 2 +- .../en/docs/tutorials/setup_minikube_in_github_actions.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e254d5edbd..f2f63d7fb3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Actions Status](https://github.com/kubernetes/minikube/workflows/build/badge.svg)](https://github.com/kubernetes/minikube/actions) [![GoReport Widget]][GoReport Status] -[![Github All Releases](https://img.shields.io/github/downloads/kubernetes/minikube/total.svg)](https://github.com/kubernetes/minikube/releases/latest) +[![GitHub All Releases](https://img.shields.io/github/downloads/kubernetes/minikube/total.svg)](https://github.com/kubernetes/minikube/releases/latest) [![Latest Release](https://img.shields.io/github/v/release/kubernetes/minikube?include_prereleases)](https://github.com/kubernetes/minikube/releases/latest) diff --git a/site/content/en/docs/contrib/documentation.en.md b/site/content/en/docs/contrib/documentation.en.md index 7e6102d10c..d91ee3feeb 100644 --- a/site/content/en/docs/contrib/documentation.en.md +++ b/site/content/en/docs/contrib/documentation.en.md @@ -16,7 +16,7 @@ In production, the minikube website is served using [Netlify](https://netlify.co ## Small or cosmetic contributions -Use Github's repositories and markdown editor as described by [Kubernetes's general guideline for documentation contributing](https://kubernetes.io/docs/contribute/start/#submit-a-pull-request) +Use GitHub's repositories and markdown editor as described by [Kubernetes's general guideline for documentation contributing](https://kubernetes.io/docs/contribute/start/#submit-a-pull-request) ## Local documentation website diff --git a/site/content/en/docs/contrib/external-packages.en.md b/site/content/en/docs/contrib/external-packages.en.md index 5530bf896c..66cd24a32e 100644 --- a/site/content/en/docs/contrib/external-packages.en.md +++ b/site/content/en/docs/contrib/external-packages.en.md @@ -11,6 +11,6 @@ Chocolatey is a software package manager for Windows that wraps installers, exec * Chocolatey community is the maintainer of the Minikube package. Latest approved version is available for [Install, Upgrade and Uninstall](https://community.chocolatey.org/packages/Minikube/). * Get the [current status](https://gist.github.com/choco-bot/a14b1e5bfaf70839b338eb1ab7f8226f) of the Chocolatey pacakge. -* Minikube Chocolatey update script on [Github](https://github.com/chocolatey-community/chocolatey-coreteampackages/tree/master/automatic/minikube). +* Minikube Chocolatey update script on [GitHub](https://github.com/chocolatey-community/chocolatey-coreteampackages/tree/master/automatic/minikube). **Note: Windows support is limited to 64bit operating systems.** diff --git a/site/content/en/docs/contrib/releasing/binaries.md b/site/content/en/docs/contrib/releasing/binaries.md index 2d8763604f..9eb147773d 100644 --- a/site/content/en/docs/contrib/releasing/binaries.md +++ b/site/content/en/docs/contrib/releasing/binaries.md @@ -85,7 +85,7 @@ After job completion, click "Console Output" to verify that the release complete The release script updates https://storage.googleapis.com/minikube/releases.json - which is used by the minikube binary to check for updates, and is live immediately. -minikube-bot will also send out a PR to merge this into the tree. Please merge this PR to keep GCS and Github in sync. +minikube-bot will also send out a PR to merge this into the tree. Please merge this PR to keep GCS and GitHub in sync. ## Package managers which include minikube diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index 5f4456d227..cc1a736fa5 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -148,7 +148,7 @@ Steps: makes sure minikube start respects the HTTPS_PROXY environment variable and works with custom certs a proxy is started by calling the mitmdump binary in the background, then installing the certs generated by the binary mitmproxy/dump creates the proxy at localhost at port 8080 -only runs on Github Actions for amd64 linux, otherwise validateStartWithProxy runs instead +only runs on GitHub Actions for amd64 linux, otherwise validateStartWithProxy runs instead #### validateAuditAfterStart makes sure the audit log contains the correct logging after minikube start diff --git a/site/content/en/docs/tutorials/continuous_integration.md b/site/content/en/docs/tutorials/continuous_integration.md index 6abe339aec..9b3498466d 100644 --- a/site/content/en/docs/tutorials/continuous_integration.md +++ b/site/content/en/docs/tutorials/continuous_integration.md @@ -23,7 +23,7 @@ For any platform not yet listed we are looking for your help! Please file Pull R |---|---|--| | [Prow](https://github.com/kubernetes/test-infra/tree/master/prow) | [Yes](https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes/minikube) ✔️ | [![Prow](https://prow.k8s.io/badge.svg?jobs=pull-minikube-build)](https://prow.k8s.io/?job=pull-minikube-build) | | [Google Cloud Build](https://cloud.google.com/cloud-build/) | [Yes](https://github.com/minikube-ci/examples/blob/master/gcb.md) ✔️ | [![cloud build status](https://storage.googleapis.com/minikube-ci-example/build/working.svg)](https://pantheon.corp.google.com/cloud-build/dashboard?project=k8s-minikube) | -| [Github](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-continuous-integration) | [Yes](https://github.com/minikube-ci/examples/blob/master/.github/workflows/minikube.yml) ✔️ | [![Github](https://github.com/minikube-ci/examples/workflows/Minikube/badge.svg)](https://github.com/minikube-ci/examples/actions) | +| [GitHub](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-continuous-integration) | [Yes](https://github.com/minikube-ci/examples/blob/master/.github/workflows/minikube.yml) ✔️ | [![GitHub](https://github.com/minikube-ci/examples/workflows/Minikube/badge.svg)](https://github.com/minikube-ci/examples/actions) | | [Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/) | [Yes](https://github.com/minikube-ci/examples/blob/master/azure-pipelines.yml) ✔️ | [![Azure Pipelines](https://dev.azure.com/medyagh0825/minikube-ci/_apis/build/status/examples?api-version=5.1-preview.1)](https://dev.azure.com/medyagh0825/minikube-ci/_build) | [Travis CI](https://travis-ci.com/) | [Yes](https://github.com/minikube-ci/examples/blob/master/.travis.yml) ✔️ | [![Travis CI](https://travis-ci.com/minikube-ci/examples.svg?branch=master)](https://travis-ci.com/minikube-ci/examples/) | | [CircleCI](https://circleci.com/) | [Yes](https://github.com/minikube-ci/examples/blob/master/.circleci) ✔️ | [![CircleCI](https://circleci.com/gh/minikube-ci/examples.svg?style=svg)](https://circleci.com/gh/minikube-ci/examples) | diff --git a/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md b/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md index 100c2e38ed..a727bf8566 100644 --- a/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md +++ b/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md @@ -1,6 +1,6 @@ --- title: "Setup minikube as CI step in github actions" -linkTitle: "Minikube in Github Actions" +linkTitle: "Minikube in GitHub Actions" weight: 1 date: 2020-06-02 description: > From 6dee7b7edbfb8093b137114902e796ad44ef7bc6 Mon Sep 17 00:00:00 2001 From: Sean Wei Date: Mon, 25 Apr 2022 15:57:45 +0800 Subject: [PATCH 3/4] Fix GitHub word for code comments --- hack/update/kubernetes_version/update_kubernetes_version.go | 2 +- pkg/minikube/notify/constants.go | 4 ++-- pkg/perf/monitor/github.go | 2 +- test/integration/functional_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/update/kubernetes_version/update_kubernetes_version.go b/hack/update/kubernetes_version/update_kubernetes_version.go index 1751e35dc7..7c67524603 100644 --- a/hack/update/kubernetes_version/update_kubernetes_version.go +++ b/hack/update/kubernetes_version/update_kubernetes_version.go @@ -139,7 +139,7 @@ func main() { } data := Data{StableVersion: stable, LatestVersion: latest, LatestVersionMM: latestMM, LatestVersionP0: latestP0} - // Print PR title for Github action. + // Print PR title for GitHub action. fmt.Printf("Bump Kubernetes version default: %s and latest: %s\n", data.StableVersion, data.LatestVersion) update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue) diff --git a/pkg/minikube/notify/constants.go b/pkg/minikube/notify/constants.go index a7bfbc7988..f66bfbd424 100644 --- a/pkg/minikube/notify/constants.go +++ b/pkg/minikube/notify/constants.go @@ -19,11 +19,11 @@ package notify const ( // GithubMinikubeReleasesURL is the URL of the minikube github releases JSON file GithubMinikubeReleasesURL = "https://storage.googleapis.com/minikube/releases-v2.json" - // GithubMinikubeBetaReleasesURL is the URL of the minikube Github beta releases JSON file + // GithubMinikubeBetaReleasesURL is the URL of the minikube GitHub beta releases JSON file GithubMinikubeBetaReleasesURL = "https://storage.googleapis.com/minikube/releases-beta-v2.json" // GithubMinikubeReleasesAliyunURL is the URL of the minikube github releases JSON file from Aliyun Mirror GithubMinikubeReleasesAliyunURL = "https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/releases.json" - // GithubMinikubeBetaReleasesAliyunURL is the URL of the minikube Github beta releases JSON file + // GithubMinikubeBetaReleasesAliyunURL is the URL of the minikube GitHub beta releases JSON file GithubMinikubeBetaReleasesAliyunURL = "https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/releases-beta.json" ) diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go index bded6c3a65..7b77a96f04 100644 --- a/pkg/perf/monitor/github.go +++ b/pkg/perf/monitor/github.go @@ -28,7 +28,7 @@ import ( ) // Client provides the context and client with necessary auth -// for interacting with the Github API +// for interacting with the GitHub API type Client struct { ctx context.Context *github.Client diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index b54c946d06..b04df234f5 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -611,7 +611,7 @@ func validateStartWithProxy(ctx context.Context, t *testing.T, profile string) { // validateStartWithCustomCerts makes sure minikube start respects the HTTPS_PROXY environment variable and works with custom certs // a proxy is started by calling the mitmdump binary in the background, then installing the certs generated by the binary // mitmproxy/dump creates the proxy at localhost at port 8080 -// only runs on Github Actions for amd64 linux, otherwise validateStartWithProxy runs instead +// only runs on GitHub Actions for amd64 linux, otherwise validateStartWithProxy runs instead func validateStartWithCustomCerts(ctx context.Context, t *testing.T, profile string) { defer PostMortemLogs(t, profile) err := startProxyWithCustomCerts(ctx, t) From 0fdefd570eace0bfc4b1a0fc27e2d62a4309002d Mon Sep 17 00:00:00 2001 From: Sean Wei Date: Mon, 25 Apr 2022 16:04:27 +0800 Subject: [PATCH 4/4] Use GitHub Actions word correctly --- site/content/en/docs/contrib/releasing/binaries.md | 2 +- .../en/docs/tutorials/setup_minikube_in_github_actions.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/content/en/docs/contrib/releasing/binaries.md b/site/content/en/docs/contrib/releasing/binaries.md index 9eb147773d..ed54e1e85a 100644 --- a/site/content/en/docs/contrib/releasing/binaries.md +++ b/site/content/en/docs/contrib/releasing/binaries.md @@ -66,7 +66,7 @@ sh hack/tag_release.sh 1.. ## Build the Release -This step uses the git tag to publish new binaries to GCS and create a github release: +This step uses the git tag to publish new binaries to GCS and create a GitHub release: * Navigate to the minikube "Release" jenkins job * Ensure that you are logged in (top right) diff --git a/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md b/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md index a727bf8566..92f2c79f82 100644 --- a/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md +++ b/site/content/en/docs/tutorials/setup_minikube_in_github_actions.md @@ -1,13 +1,13 @@ --- -title: "Setup minikube as CI step in github actions" +title: "Setup minikube as CI step in GitHub Actions" linkTitle: "Minikube in GitHub Actions" weight: 1 date: 2020-06-02 description: > - How to use minikube in github actions for testing your app + How to use minikube in GitHub Actions for testing your app --- -To install and start a minikube cluster, add the following step to your [github action workflow](https://help.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow). +To install and start a minikube cluster, add the following step to your [GitHub Actions workflow](https://help.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow). ```yaml steps: @@ -16,7 +16,7 @@ To install and start a minikube cluster, add the following step to your [github uses: medyagh/setup-minikube@master ``` -for more information see github actions marketplace [setup-minikube]( https://github.com/marketplace/actions/setup-minikube). +for more information see GitHub Actions marketplace [setup-minikube](https://github.com/marketplace/actions/setup-minikube). ## Example: build image & deploy to minikube on each PR