diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2cc573ef5..2e83c2ce7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main pull_request: concurrency: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0a36ba71a..0242db1e6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '34 23 * * 4' diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml index e30076c8c..3d690a6ab 100644 --- a/.github/workflows/e2e-test.yaml +++ b/.github/workflows/e2e-test.yaml @@ -3,7 +3,7 @@ name: e2e-test on: push: branches: - - master + - main pull_request: concurrency: diff --git a/.github/workflows/operator-release.yml b/.github/workflows/operator-release.yml index 4c8b45f29..cb8f803e1 100644 --- a/.github/workflows/operator-release.yml +++ b/.github/workflows/operator-release.yml @@ -151,9 +151,9 @@ jobs: sync-release-docs: # The steps above only bump version references in the ephemeral checkout # used to package the chart - they're never committed back to git, so - # master keeps referring to whichever tag was last bumped by hand. This + # main keeps referring to whichever tag was last bumped by hand. This # job closes that gap for canonical dated releases by opening a PR - # against master (direct pushes are blocked by branch protection). + # against main (direct pushes are blocked by branch protection). runs-on: ubuntu-latest needs: [prepare, release-helm] if: needs.prepare.outputs.is_canonical == 'true' @@ -161,10 +161,10 @@ jobs: contents: write pull-requests: write steps: - - name: Checkout master + - name: Checkout main uses: actions/checkout@v6 with: - ref: master + ref: main - name: Update version references run: ./scripts/bump-release-version.sh "${{ needs.prepare.outputs.tag }}" - name: Open PR with version bump @@ -177,9 +177,9 @@ jobs: Automated version reference bump for release `${{ needs.prepare.outputs.tag }}`. --- - *Generated by https://github.com/adobe/koperator/blob/master/.github/workflows/operator-release.yml* + *Generated by https://github.com/adobe/koperator/blob/main/.github/workflows/operator-release.yml* branch: release-docs/${{ needs.prepare.outputs.tag }} - base: master + base: main delete-branch: true labels: | release diff --git a/.github/workflows/update-go-deps.yml b/.github/workflows/update-go-deps.yml index 265c641c6..00c913bc6 100644 --- a/.github/workflows/update-go-deps.yml +++ b/.github/workflows/update-go-deps.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout code uses: actions/checkout@v6 with: - ref: master + ref: main fetch-depth: 0 - name: Set up Go @@ -68,7 +68,7 @@ jobs: Please review the changes and ensure all tests pass before merging. --- - *Generated by https://github.com/adobe/koperator/blob/master/.github/workflows/update-go-deps.yml* + *Generated by https://github.com/adobe/koperator/blob/main/.github/workflows/update-go-deps.yml* branch: automated/update-go-deps delete-branch: true labels: | diff --git a/README.md b/README.md index bdd9e05c3..19815d5a7 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,12 @@

-![Go version](https://img.shields.io/github/go-mod/go-version/adobe/koperator/master) +![Go version](https://img.shields.io/github/go-mod/go-version/adobe/koperator/main) [![Go Report Card](https://goreportcard.com/badge/github.com/adobe/koperator)](https://goreportcard.com/report/github.com/adobe/koperator) -![CI](https://img.shields.io/github/actions/workflow/status/adobe/koperator/ci.yml?branch=master&label=CI) -![CI](https://img.shields.io/github/actions/workflow/status/adobe/koperator/codeql-analysis.yml?branch=master&label=CodeQL) -![Image](https://img.shields.io/github/actions/workflow/status/adobe/koperator/e2e-test.yaml?branch=master&label=E2E) -![Helm chart](https://img.shields.io/github/actions/workflow/status/adobe/koperator/helm.yml?branch=master&label=Helm%20chart) +![CI](https://img.shields.io/github/actions/workflow/status/adobe/koperator/ci.yml?branch=main&label=CI) +![CI](https://img.shields.io/github/actions/workflow/status/adobe/koperator/codeql-analysis.yml?branch=main&label=CodeQL) +![Image](https://img.shields.io/github/actions/workflow/status/adobe/koperator/e2e-test.yaml?branch=main&label=E2E) +![Helm chart](https://img.shields.io/github/actions/workflow/status/adobe/koperator/helm.yml?branch=main&label=Helm%20chart)

@@ -114,10 +114,10 @@ You can deploy Koperator using a Helm chart from GitHub Container Registry (OCI) 1. Install the Koperator `CustomResourceDefinition` resources (adjust the version number to the Koperator release you want to install). This is performed in a separate step to allow you to uninstall and reinstall Koperator without deleting your already installed custom resources. ```sh -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_cruisecontroloperations.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkatopics.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkausers.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_cruisecontroloperations.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkatopics.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkausers.yaml ``` 2. Install Koperator into the `kafka` namespace using the OCI Helm chart from GitHub Container Registry. Use `--skip-crds` since the CRDs were already installed in the previous step - without it, Helm's own CRD install can conflict with the `kubectl apply` above ([#265](https://github.com/adobe/koperator/issues/265)): @@ -147,7 +147,7 @@ helm install kafka-operator ./kafka-operator/ --namespace=kafka --create-namespa 1. Create the Kafka cluster using the `KafkaCluster` custom resource. The quick start uses a minimal custom resource, but there are other examples in the same directory. ```sh -kubectl create -n kafka -f https://raw.githubusercontent.com/adobe/koperator/master/config/samples/simplekafkacluster.yaml +kubectl create -n kafka -f https://raw.githubusercontent.com/adobe/koperator/main/config/samples/simplekafkacluster.yaml ``` 1. Verify that the Kafka cluster has been created. @@ -209,7 +209,7 @@ For detailed documentation on the Koperator project, see the [Koperator document We use GitHub to track issues and accept contributions. If you would like to raise an issue or open a pull request, please refer to our [contribution guide](./CONTRIBUTING.md). -If you use Koperator in a production environment, we encourage you to add yourself to the list of production [adopters](https://github.com/adobe/koperator/blob/master/ADOPTERS.md). +If you use Koperator in a production environment, we encourage you to add yourself to the list of production [adopters](https://github.com/adobe/koperator/blob/main/ADOPTERS.md). ## Community diff --git a/charts/kafka-operator/README.md b/charts/kafka-operator/README.md index 5c530eea3..9d1c77843 100644 --- a/charts/kafka-operator/README.md +++ b/charts/kafka-operator/README.md @@ -13,10 +13,10 @@ Before installing the chart, you must first install the Koperator CustomResource This is performed in a separate step to allow you to easily uninstall and reinstall Koperator without deleting your installed custom resources. ```bash -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_cruisecontroloperations.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkatopics.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkausers.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_cruisecontroloperations.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkatopics.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkausers.yaml ``` To install the chart from the OCI registry. Use `--skip-crds` since the CRDs were already installed in the diff --git a/renovate.json b/renovate.json index a0942e8da..0810a07c7 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "forkProcessing": "enabled", - "baseBranchPatterns": ["master", "gh-pages"], + "baseBranchPatterns": ["main", "gh-pages"], "extends": [ ":dependencyDashboard", ":ignoreUnstable", @@ -70,9 +70,9 @@ "matchManagers": [ "gomod" ], - "matchBaseBranches": ["master"], + "matchBaseBranches": ["main"], "enabled": false, - "description": "Disable Go module updates on master - handled by automated workflow: .github/workflows/update-go-deps.yml. gh-pages' go.mod is Hugo Modules (theme deps like docsy), not app code, so it stays enabled there." + "description": "Disable Go module updates on main - handled by automated workflow: .github/workflows/update-go-deps.yml. gh-pages' go.mod is Hugo Modules (theme deps like docsy), not app code, so it stays enabled there." }, { "matchCategories": [