Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:

concurrency:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: e2e-test
on:
push:
branches:
- master
- main
pull_request:

concurrency:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/operator-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,20 @@ 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'
permissions:
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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-go-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v6
with:
ref: master
ref: main
fetch-depth: 0

- name: Set up Go
Expand Down Expand Up @@ -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: |
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

<p align="center">

![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)


</p>
Expand Down Expand Up @@ -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)):
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions charts/kafka-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": [
Expand Down