Skip to content

Commit

Permalink
Branch rename master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
emosbaugh committed Dec 9, 2021
1 parent 0404926 commit 892e92f
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,9 @@
<!-- Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines here:
https://github.com/replicatedhq/kots/blob/master/CONTRIBUTING.md.
https://github.com/replicatedhq/kots/blob/main/CONTRIBUTING.md.
2. Ensure you have added appropriate tests for your PR. For more information read here:
https://github.com/replicatedhq/kots/blob/master/CONTRIBUTING.md#testing
https://github.com/replicatedhq/kots/blob/main/CONTRIBUTING.md#testing
3. If the PR is unfinished, please mark it as a draft.
-->

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/alpha.yaml
Expand Up @@ -3,7 +3,7 @@ name: alpha
on:
push:
branches:
- master
- main

jobs:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codespaces.yaml
Expand Up @@ -2,7 +2,7 @@ name: prebuild codespace
on:
push:
branches:
- master
- main
- codespaces-sandbox
workflow_dispatch:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yaml
Expand Up @@ -56,8 +56,8 @@ jobs:
automated-pr
images
draft: false
base: "master"
body: "Automated changes by the [trigger-nightly](https://github.com/replicatedhq/kots/blob/master/.github/workflows/nightly.yaml) GitHub action"
base: "main"
body: "Automated changes by the [trigger-nightly](https://github.com/replicatedhq/kots/blob/main/.github/workflows/nightly.yaml) GitHub action"

- name: Check outputs
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Expand Up @@ -513,7 +513,7 @@ jobs:
GIT_TAG: ${{ steps.get_tag.outputs.GIT_TAG }}
GITOPS_OWNER: replicatedcom
GITOPS_REPO: gitops-deploy
GITOPS_BRANCH: master
GITOPS_BRANCH: main
RUN_ID: ${{ github.run_id }}
run: ./hack/deploy-kgrid.sh

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
@@ -1,7 +1,7 @@
# Contributing to KOTS

Thank you for your interest in KOTS, we welcome your participation. Please familiarize yourself with our
[Code of Conduct](https://github.com/replicatedhq/kots/blob/master/CODE_OF_CONDUCT.md) prior to contributing.
[Code of Conduct](https://github.com/replicatedhq/kots/blob/main/CODE_OF_CONDUCT.md) prior to contributing.

## Pull Requests

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,7 +2,7 @@


# Kubernetes Off-The-Shelf (KOTS) Software
Replicated KOTS is the collective set of tools that enable the distribution and management of Kubernetes Off-The-Shelf (KOTS) software. The Kots CLI (a Kubectl plugin) is a general purpose, client-side binary for configuring and building dynamic Kubernetes manifests. The Kots CLI also serves as the bootstrapper for the in-cluster Kubernetes application Admin Console [kotsadm](https://github.com/replicatedhq/kots/tree/master/kotsadm) which can be used to automate the core Kots CLI tasks for managing applications (license verification, configuration, updates, image renaming, version controlling changes, and deployment) as well as additional KOTS tasks (running preflight checks and performing support bundle analysis).
Replicated KOTS is the collective set of tools that enable the distribution and management of Kubernetes Off-The-Shelf (KOTS) software. The Kots CLI (a Kubectl plugin) is a general purpose, client-side binary for configuring and building dynamic Kubernetes manifests. The Kots CLI also serves as the bootstrapper for the in-cluster Kubernetes application Admin Console [kotsadm](https://github.com/replicatedhq/kots/tree/main/kotsadm) which can be used to automate the core Kots CLI tasks for managing applications (license verification, configuration, updates, image renaming, version controlling changes, and deployment) as well as additional KOTS tasks (running preflight checks and performing support bundle analysis).

## Distributing a KOTS application
Software vendors can [package their Kubernetes applications](https://kots.io/vendor/) or [Helm charts](https://kots.io/vendor/helm/using-helm-charts) or [Operators](https://kots.io/vendor/operators/packaging-an-operator/) as a KOTS application in order to distribute the application to cluster operators.
Expand Down Expand Up @@ -42,7 +42,7 @@ For questions about using KOTS, there's a [Replicated Community](https://help.re

# Notifications

If KOTS is installed into an existing Kubernetes cluster, by default KOTS will leverage [MinIO](https://github.com/minio/minio) as a standalone object store instance to store application archives and support bundles. All communication between KOTS and the MinIO object store is limited to a REST API released under the Apache 2.0 license. KOTS has not modified the MinIO source code. Use of [MinIO](https://github.com/minio/minio) is currently governed by the GNU AGPLv3 license that can be found in their [LICENSE](https://github.com/minio/minio/blob/master/LICENSE) file. To remove MinIO usage for this use case, an optional install flag `--with-minio=false` is available for new [KOTS installs](https://kots.io/kots-cli/install/) or [upgrades from existing versions](https://kots.io/kots-cli/admin-console/upgrade/).
If KOTS is installed into an existing Kubernetes cluster, by default KOTS will leverage [MinIO](https://github.com/minio/minio) as a standalone object store instance to store application archives and support bundles. All communication between KOTS and the MinIO object store is limited to a REST API released under the Apache 2.0 license. KOTS has not modified the MinIO source code. Use of [MinIO](https://github.com/minio/minio) is currently governed by the GNU AGPLv3 license that can be found in their [LICENSE](https://github.com/minio/minio/blob/main/LICENSE) file. To remove MinIO usage for this use case, an optional install flag `--with-minio=false` is available for new [KOTS installs](https://kots.io/kots-cli/install/) or [upgrades from existing versions](https://kots.io/kots-cli/admin-console/upgrade/).

# Software Bill of Materials
Signed SBOMs for KOTS Go dependencies and are included in each release.
Expand Down
2 changes: 1 addition & 1 deletion design/docs/installing/README.md
Expand Up @@ -16,5 +16,5 @@ After installing, verify it's working with
kubectl kots version
```

For additional installation options, visit the [advanced installation options](https://github.com/replicatedhq/kots/blob/master/docs/installing/advanced.md) documentation.
For additional installation options, visit the [advanced installation options](https://github.com/replicatedhq/kots/blob/main/docs/installing/advanced.md) documentation.

2 changes: 1 addition & 1 deletion design/docs/proposals/object-store.md
Expand Up @@ -108,7 +108,7 @@ This covers a proposal for `kots install`. It includes migrating the `kotsadm-mi
- Add a flag to the kots CLI --object-store-bucket-name
- Add a flag to the kots CLI --object-store-endpoint but can be empty to use Amazon S3

**Question:** should the object store types `minio` and `external` should be constants in the `types` package? Or a separate configuration package? https://github.com/replicatedhq/kots/blob/master/pkg/kotsadm/types/constants.go
**Question:** should the object store types `minio` and `external` should be constants in the `types` package? Or a separate configuration package? https://github.com/replicatedhq/kots/blob/main/pkg/kotsadm/types/constants.go

### Internal changes

Expand Down
2 changes: 1 addition & 1 deletion pkg/template/license_context.go
Expand Up @@ -28,7 +28,7 @@ func (ctx licenseCtx) licenseFieldValue(name string) string {
return ""
}

// Update docs at https://github.com/replicatedhq/kots.io/blob/master/content/reference/template-functions/license-context.md
// Update docs at https://github.com/replicatedhq/kots.io/blob/main/content/reference/template-functions/license-context.md
// when adding new values
switch name {
case "isGitOpsSupported":
Expand Down
2 changes: 1 addition & 1 deletion pkg/template/static_context.go
@@ -1,7 +1,7 @@
package template

/*
This was taken from https://github.com/replicatedhq/replicated/blob/master/templates/context.go
This was taken from https://github.com/replicatedhq/replicated/blob/main/templates/context.go
*/

import (
Expand Down

0 comments on commit 892e92f

Please sign in to comment.