From a60b4c8666a9e4c5ec0085621762468e4a284a0d Mon Sep 17 00:00:00 2001 From: Martin Montes Date: Sat, 18 Mar 2023 13:10:14 +0100 Subject: [PATCH] Migrated to GitHub organization and GHCR registry --- .github/workflows/helm.yml | 4 ++-- .github/workflows/release.yml | 9 ++++---- PROJECT | 18 +++++++-------- README.md | 22 +++++++++---------- ROADMAP.md | 18 +++++++-------- api/v1alpha1/backup_webhook_test.go | 4 ++-- api/v1alpha1/common_types.go | 2 +- api/v1alpha1/connection_webhook_test.go | 2 +- api/v1alpha1/database_webhook_test.go | 2 +- api/v1alpha1/grant_webhook_test.go | 2 +- api/v1alpha1/mariadb_webhook_test.go | 4 ++-- api/v1alpha1/restore_webhook_test.go | 4 ++-- api/v1alpha1/user_webhook _test.go | 2 +- cmd/controller/root.go | 14 ++++++------ cmd/controller/webhook.go | 2 +- ...adb_v1alpha1_sqljob_02-1-insert-users.yaml | 2 +- controllers/backup_controller.go | 10 ++++----- controllers/backup_controller_test.go | 2 +- controllers/connection_controller.go | 12 +++++----- controllers/connection_controller_test.go | 2 +- controllers/database_controller.go | 10 ++++----- controllers/database_controller_finalizer.go | 6 ++--- controllers/database_controller_test.go | 2 +- controllers/grant_controller.go | 10 ++++----- controllers/grant_controller_finalizer.go | 6 ++--- controllers/grant_controller_test.go | 2 +- controllers/mariadb_controller.go | 10 ++++----- controllers/mariadb_controller_metrics.go | 8 +++---- controllers/mariadb_controller_test.go | 4 ++-- controllers/restore_controller.go | 10 ++++----- controllers/restore_controller_test.go | 2 +- controllers/sqljob_controller.go | 12 +++++----- controllers/sqljob_controller_test.go | 4 ++-- controllers/suite_test.go | 14 ++++++------ controllers/suite_test_data.go | 4 ++-- controllers/user_controller.go | 10 ++++----- controllers/user_controller_finalizer.go | 6 ++--- controllers/user_controller_test.go | 2 +- deploy/charts/mariadb-operator/Chart.yaml | 10 ++++----- deploy/charts/mariadb-operator/README.md | 10 ++++----- .../charts/mariadb-operator/README.md.gotmpl | 4 ++-- .../mariadb-operator/templates/NOTES.txt | 2 +- deploy/charts/mariadb-operator/values.yaml | 4 ++-- deploy/manifests/README.md | 2 +- .../production/flux-system/gotk-sync.yaml | 2 +- .../mariadb-operator-helmrepository.yaml | 2 +- go.mod | 2 +- hack/config/openssl.conf | 2 +- main.go | 2 +- make/deploy.mk | 4 ++-- pkg/builder/backup_builder.go | 4 ++-- pkg/builder/batch_builder.go | 10 ++++----- pkg/builder/connection_builder.go | 2 +- pkg/builder/database_builder.go | 4 ++-- pkg/builder/labels/labels.go | 2 +- pkg/builder/persistentvolumeclaim_builder.go | 2 +- pkg/builder/service_builder.go | 4 ++-- pkg/builder/servicemonitor_builder.go | 4 ++-- pkg/builder/statefulset_builder.go | 4 ++-- pkg/command/backup/backup.go | 4 ++-- pkg/command/backup/logical.go | 4 ++-- pkg/command/backup/physical.go | 4 ++-- pkg/command/command.go | 2 +- pkg/command/sql/sql.go | 4 ++-- pkg/conditions/conditions.go | 2 +- pkg/controller/batch/controller.go | 6 ++--- pkg/controller/configmap/controller.go | 2 +- pkg/controller/sql/controller.go | 8 +++---- pkg/controller/sql/finalizer.go | 6 ++--- pkg/controller/sql/types.go | 6 ++--- pkg/mariadb/crd.go | 4 ++-- pkg/refresolver/refresolver.go | 2 +- pkg/webhook/inmutable_webhook_test.go | 4 ++-- 73 files changed, 200 insertions(+), 199 deletions(-) diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 57e54fd6a6..9ef54e522a 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -79,9 +79,9 @@ jobs: CR_RELEASE_NAME_TEMPLATE: "helm-chart-{{ .Version }}" with: charts_dir: deploy/charts - charts_repo_url: https://mmontes11.github.io/mariadb-operator + charts_repo_url: https://mariadb-operator.github.io/mariadb-operator - name: Dispatch helm workflow - run: gh workflow run bundle.yaml --repo mmontes11/mariadb-operator-helm -f version=$(make helm-chart-version) + run: gh workflow run bundle.yaml --repo mariadb-operator/mariadb-operator-helm -f version=$(make helm-chart-version) env: GITHUB_TOKEN: "${{ secrets.GHA_TOKEN }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f5b2d7de3..c90a99103c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,8 +37,9 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io - name: Prepare id: prep @@ -59,8 +60,8 @@ jobs: file: ./Dockerfile platforms: linux/arm64,linux/amd64 tags: | - docker.io/mmontes11/mariadb-operator:${{ steps.prep.outputs.VERSION }} - docker.io/mmontes11/mariadb-operator:latest + ghcr.io/${{ github.repository_owner }}/mariadb-operator:${{ steps.prep.outputs.VERSION }} + ghcr.io/${{ github.repository_owner }}/mariadb-operator:latest labels: | org.opencontainers.image.title=${{ github.event.repository.name }} org.opencontainers.image.description=${{ github.event.repository.description }} diff --git a/PROJECT b/PROJECT index 135ee94f31..3a88b2eb36 100644 --- a/PROJECT +++ b/PROJECT @@ -2,7 +2,7 @@ domain: mmontes.io layout: - go.kubebuilder.io/v3 projectName: mariadb-operator -repo: github.com/mmontes11/mariadb-operator +repo: github.com/mariadb-operator/mariadb-operator resources: - api: crdVersion: v1 @@ -11,7 +11,7 @@ resources: domain: mmontes.io group: mariadb kind: MariaDB - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -23,7 +23,7 @@ resources: domain: mmontes.io group: mariadb kind: Backup - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -35,7 +35,7 @@ resources: domain: mmontes.io group: mariadb kind: Restore - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -47,7 +47,7 @@ resources: domain: mmontes.io group: mariadb kind: User - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -59,7 +59,7 @@ resources: domain: mmontes.io group: mariadb kind: Grant - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -71,7 +71,7 @@ resources: domain: mmontes.io group: mariadb kind: Database - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -83,7 +83,7 @@ resources: domain: mmontes.io group: mariadb kind: Connection - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -95,7 +95,7 @@ resources: domain: mmontes.io group: mariadb kind: SqlJob - path: github.com/mmontes11/mariadb-operator/api/v1alpha1 + path: github.com/mariadb-operator/mariadb-operator/api/v1alpha1 version: v1alpha1 webhooks: validation: true diff --git a/README.md b/README.md index 956dc8cb54..d53677515e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@

-mariadb +mariadb

-CI -Helm -Release -Go Report Card -Go Reference +CI +Helm +Release +Go Report Card +Go Reference

@@ -31,7 +31,7 @@ Run and operate MariaDB in a cloud native way. Declaratively manage your MariaDB - Additional printer columns to report the current CRD status - CRDs designed according to the Kubernetes [API conventions](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md) - [GitOps](https://opengitops.dev/) friendly -- Multi-arch [docker](https://hub.docker.com/repository/docker/mmontes11/mariadb-operator/tags?page=1&ordering=last_updated) image +- Multi-arch [docker](https://github.com/orgs/mariadb-operator/packages/container/package/mariadb-operator) image - Install it using [kubectl](./deploy/manifests), [helm](https://artifacthub.io/packages/helm/mariadb-operator/mariadb-operator) or [OLM](https://operatorhub.io/operator/mariadb-operator) ## Bare minimum installation @@ -39,7 +39,7 @@ Run and operate MariaDB in a cloud native way. Declaratively manage your MariaDB This installation flavour provides the minimum resources required to run `mariadb-operator` in your cluster. ```bash -helm repo add mariadb-operator https://mmontes11.github.io/mariadb-operator +helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator helm install mariadb-operator mariadb-operator/mariadb-operator ``` @@ -50,14 +50,14 @@ The recommended installation includes the following features to provide a better - **Webhook certificate renewal**: Automatic webhook certificate issuance and renewal using [cert-manager](https://cert-manager.io/docs/installation/). By default, a static self-signed certificate is generated. ```bash -helm repo add mariadb-operator https://mmontes11.github.io/mariadb-operator +helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator helm install mariadb-operator mariadb-operator/mariadb-operator \ --set metrics.enabled=true --set webhook.certificate.certManager=true ``` ## Openshift -The Openshift installation is managed separately in the [mariadb-operator-helm](https://github.com/mmontes11/mariadb-operator-helm) repository, which contains a [helm based operator](https://sdk.operatorframework.io/docs/building-operators/helm/) that allows you to install `mariadb-operator` via [OLM](https://olm.operatorframework.io/docs/). +The Openshift installation is managed separately in the [mariadb-operator-helm](https://github.com/mariadb-operator/mariadb-operator-helm) repository, which contains a [helm based operator](https://sdk.operatorframework.io/docs/building-operators/helm/) that allows you to install `mariadb-operator` via [OLM](https://olm.operatorframework.io/docs/). ## Quickstart @@ -175,4 +175,4 @@ Take a look at our [🛣️ roadmap](./ROADMAP.md) and feel free to open an issu ## Contributing -If you want to report a 🐛 or you think something can be improved, please check our [contributing](./CONTRIBUTING.md) guide and take a look at our open [issues](https://github.com/mmontes11/mariadb-operator/issues). PRs are welcome! +If you want to report a 🐛 or you think something can be improved, please check our [contributing](./CONTRIBUTING.md) guide and take a look at our open [issues](https://github.com/mariadb-operator/mariadb-operator/issues). PRs are welcome! diff --git a/ROADMAP.md b/ROADMAP.md index a3de62f3c2..ca3b2530dc 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,12 +1,12 @@ # 🛣️ Roadmap - ~~Improve and fully automate the CI/CD to ensure the quality of the artifacts. Become a serious open source project in this matter.~~ -- ~~Leveraging the previous automation, support deploying the operator using the [openshift OLM](https://docs.openshift.com/container-platform/4.8/operators/understanding/olm/olm-understanding-olm.html).: https://github.com/mmontes11/mariadb-operator/issues/10~~ -- ~~COMMUNITY REQUEST - Support for custom `my.cnf`: https://github.com/mmontes11/mariadb-operator/issues/51~~ -- ~~COMMUNITY REQUEST - Support for db initialization scripts: https://github.com/mmontes11/mariadb-operator/issues/47~~ -- High availability support via [replication](https://mariadb.org/mariadb-k8s-how-to-replicate-mariadb-in-k8s/): https://github.com/mmontes11/mariadb-operator/issues/61 -- Abstract both [mysqldump](https://dev.mysql.com/doc/refman/8.0/en/mysqldump.html) and [mariabackup](https://mariadb.com/kb/en/mariabackup-overview/) in an easy to use CLI: `mariactl`. The binary will be released along with the operator in the new CI/CD: https://github.com/mmontes11/mariadb-operator/issues/16 -- Making use of `mariactl`, abstract the most relevant features of `mariabackup` via Kubernetes CRDs, such as incremental backups: https://github.com/mmontes11/mariadb-operator/issues/17 -- The operator has recently been refactored to easily support new storage types for the backups. The next one to be supported will be S3: https://github.com/mmontes11/mariadb-operator/issues/6 -- Create a documentation site hosted in GitHub Pages, something like [this](https://gateway-api.sigs.k8s.io/). It would be generated from markdown by the new CI/CD: https://github.com/mmontes11/mariadb-operator/issues/21 - - High availability support via [Galera](https://mariadb.com/kb/en/what-is-mariadb-galera-cluster/): https://github.com/mmontes11/mariadb-operator/issues/4 +- ~~Leveraging the previous automation, support deploying the operator using the [openshift OLM](https://docs.openshift.com/container-platform/4.8/operators/understanding/olm/olm-understanding-olm.html).: https://github.com/mariadb-operator/mariadb-operator/issues/10~~ +- ~~COMMUNITY REQUEST - Support for custom `my.cnf`: https://github.com/mariadb-operator/mariadb-operator/issues/51~~ +- ~~COMMUNITY REQUEST - Support for db initialization scripts: https://github.com/mariadb-operator/mariadb-operator/issues/47~~ +- High availability support via [replication](https://mariadb.org/mariadb-k8s-how-to-replicate-mariadb-in-k8s/): https://github.com/mariadb-operator/mariadb-operator/issues/61 +- Abstract both [mysqldump](https://dev.mysql.com/doc/refman/8.0/en/mysqldump.html) and [mariabackup](https://mariadb.com/kb/en/mariabackup-overview/) in an easy to use CLI: `mariactl`. The binary will be released along with the operator in the new CI/CD: https://github.com/mariadb-operator/mariadb-operator/issues/16 +- Making use of `mariactl`, abstract the most relevant features of `mariabackup` via Kubernetes CRDs, such as incremental backups: https://github.com/mariadb-operator/mariadb-operator/issues/17 +- The operator has recently been refactored to easily support new storage types for the backups. The next one to be supported will be S3: https://github.com/mariadb-operator/mariadb-operator/issues/6 +- Create a documentation site hosted in GitHub Pages, something like [this](https://gateway-api.sigs.k8s.io/). It would be generated from markdown by the new CI/CD: https://github.com/mariadb-operator/mariadb-operator/issues/21 + - High availability support via [Galera](https://mariadb.com/kb/en/what-is-mariadb-galera-cluster/): https://github.com/mariadb-operator/mariadb-operator/issues/4 diff --git a/api/v1alpha1/backup_webhook_test.go b/api/v1alpha1/backup_webhook_test.go index fbc3b8426a..aceb7d2db6 100644 --- a/api/v1alpha1/backup_webhook_test.go +++ b/api/v1alpha1/backup_webhook_test.go @@ -31,7 +31,7 @@ var _ = Describe("Backup webhook", func() { It("Should validate", func() { storageClassName := "standard" // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string backup Backup @@ -203,7 +203,7 @@ var _ = Describe("Backup webhook", func() { Expect(k8sClient.Create(testCtx, &backup)).To(Succeed()) // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string patchFn func(mdb *Backup) diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go index 3c2b351d7e..794166ad1d 100644 --- a/api/v1alpha1/common_types.go +++ b/api/v1alpha1/common_types.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/mmontes11/mariadb-operator/pkg/webhook" + "github.com/mariadb-operator/mariadb-operator/pkg/webhook" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/api/v1alpha1/connection_webhook_test.go b/api/v1alpha1/connection_webhook_test.go index 797472910c..fd0d291218 100644 --- a/api/v1alpha1/connection_webhook_test.go +++ b/api/v1alpha1/connection_webhook_test.go @@ -73,7 +73,7 @@ var _ = Describe("Connection webhook", func() { Expect(k8sClient.Create(testCtx, &conn)).To(Succeed()) // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string patchFn func(conn *Connection) diff --git a/api/v1alpha1/database_webhook_test.go b/api/v1alpha1/database_webhook_test.go index 0dfafff39c..f9a1b245a3 100644 --- a/api/v1alpha1/database_webhook_test.go +++ b/api/v1alpha1/database_webhook_test.go @@ -52,7 +52,7 @@ var _ = Describe("Database webhook", func() { Expect(k8sClient.Create(testCtx, &database)).To(Succeed()) // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string patchFn func(mdb *Database) diff --git a/api/v1alpha1/grant_webhook_test.go b/api/v1alpha1/grant_webhook_test.go index 50c1b1625e..9c857a8495 100644 --- a/api/v1alpha1/grant_webhook_test.go +++ b/api/v1alpha1/grant_webhook_test.go @@ -57,7 +57,7 @@ var _ = Describe("Grant webhook", func() { Expect(k8sClient.Create(testCtx, &grant)).To(Succeed()) // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string patchFn func(mdb *Grant) diff --git a/api/v1alpha1/mariadb_webhook_test.go b/api/v1alpha1/mariadb_webhook_test.go index ba2863ffaf..66fc21e8eb 100644 --- a/api/v1alpha1/mariadb_webhook_test.go +++ b/api/v1alpha1/mariadb_webhook_test.go @@ -34,7 +34,7 @@ var _ = Describe("MariaDB webhook", func() { Namespace: testNamespace, } // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string mdb MariaDB @@ -181,7 +181,7 @@ var _ = Describe("MariaDB webhook", func() { Expect(k8sClient.Create(testCtx, &mariaDb)).To(Succeed()) // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string patchFn func(mdb *MariaDB) diff --git a/api/v1alpha1/restore_webhook_test.go b/api/v1alpha1/restore_webhook_test.go index e1ccb6dbea..84c325f2d2 100644 --- a/api/v1alpha1/restore_webhook_test.go +++ b/api/v1alpha1/restore_webhook_test.go @@ -30,7 +30,7 @@ var _ = Describe("Restore webhook", func() { Context("When creating a Restore", func() { It("Should validate", func() { // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string restore Restore @@ -211,7 +211,7 @@ var _ = Describe("Restore webhook", func() { Expect(k8sClient.Create(testCtx, &restore)).To(Succeed()) // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string patchFn func(mdb *Restore) diff --git a/api/v1alpha1/user_webhook _test.go b/api/v1alpha1/user_webhook _test.go index 23705fbfd2..97ff9a9953 100644 --- a/api/v1alpha1/user_webhook _test.go +++ b/api/v1alpha1/user_webhook _test.go @@ -57,7 +57,7 @@ var _ = Describe("User webhook", func() { Expect(k8sClient.Create(testCtx, &initialUser)).To(Succeed()) // TODO: migrate to Ginkgo v2 and use Ginkgo table tests - // https://github.com/mmontes11/mariadb-operator/issues/3 + // https://github.com/mariadb-operator/mariadb-operator/issues/3 tt := []struct { by string patchFn func(mdb *User) diff --git a/cmd/controller/root.go b/cmd/controller/root.go index 2286146bf3..117d4a0d76 100644 --- a/cmd/controller/root.go +++ b/cmd/controller/root.go @@ -24,13 +24,13 @@ package controller import ( "os" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/controllers" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/batch" - "github.com/mmontes11/mariadb-operator/pkg/controller/configmap" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/controllers" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/batch" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/configmap" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/spf13/cobra" "go.uber.org/zap/zapcore" diff --git a/cmd/controller/webhook.go b/cmd/controller/webhook.go index 84f3aef625..3a507c3268 100644 --- a/cmd/controller/webhook.go +++ b/cmd/controller/webhook.go @@ -24,7 +24,7 @@ package controller import ( "os" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" "github.com/spf13/cobra" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" diff --git a/config/samples/sqljobs/mariadb_v1alpha1_sqljob_02-1-insert-users.yaml b/config/samples/sqljobs/mariadb_v1alpha1_sqljob_02-1-insert-users.yaml index 0a16357dfa..6f66ad1853 100644 --- a/config/samples/sqljobs/mariadb_v1alpha1_sqljob_02-1-insert-users.yaml +++ b/config/samples/sqljobs/mariadb_v1alpha1_sqljob_02-1-insert-users.yaml @@ -13,5 +13,5 @@ spec: key: password database: mariadb sql: | - INSERT INTO users(username, email) VALUES('mmontes11','martin11lrx@gmail.com') + INSERT INTO users(username, email) VALUES('mmontes11','mariadb-operator@proton.me') ON DUPLICATE KEY UPDATE username='mmontes11'; diff --git a/controllers/backup_controller.go b/controllers/backup_controller.go index d1ae892232..53f1a6032f 100644 --- a/controllers/backup_controller.go +++ b/controllers/backup_controller.go @@ -22,11 +22,11 @@ import ( "time" "github.com/hashicorp/go-multierror" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/batch" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/batch" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" batchv1 "k8s.io/api/batch/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/controllers/backup_controller_test.go b/controllers/backup_controller_test.go index 2b8650ff32..ec72bef03f 100644 --- a/controllers/backup_controller_test.go +++ b/controllers/backup_controller_test.go @@ -17,7 +17,7 @@ limitations under the License. package controllers import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" batchv1 "k8s.io/api/batch/v1" diff --git a/controllers/connection_controller.go b/controllers/connection_controller.go index ea7f50b2ec..d7dccc5d3e 100644 --- a/controllers/connection_controller.go +++ b/controllers/connection_controller.go @@ -23,12 +23,12 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/mmontes11/mariadb-operator/api/v1alpha1" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/mariadb" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/connection_controller_test.go b/controllers/connection_controller_test.go index d1570a40d9..56c9623f54 100644 --- a/controllers/connection_controller_test.go +++ b/controllers/connection_controller_test.go @@ -19,7 +19,7 @@ package controllers import ( "time" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/controllers/database_controller.go b/controllers/database_controller.go index 6afd2a3073..8f67741875 100644 --- a/controllers/database_controller.go +++ b/controllers/database_controller.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/sql" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/sql" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/database_controller_finalizer.go b/controllers/database_controller_finalizer.go index 882f9d02f5..a48b821a16 100644 --- a/controllers/database_controller_finalizer.go +++ b/controllers/database_controller_finalizer.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/controller/sql" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/sql" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" "sigs.k8s.io/controller-runtime/pkg/client" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" diff --git a/controllers/database_controller_test.go b/controllers/database_controller_test.go index 3b6c132129..7ea0275d08 100644 --- a/controllers/database_controller_test.go +++ b/controllers/database_controller_test.go @@ -17,7 +17,7 @@ limitations under the License. package controllers import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/controllers/grant_controller.go b/controllers/grant_controller.go index 6a4dfddfe1..e250687053 100644 --- a/controllers/grant_controller.go +++ b/controllers/grant_controller.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/sql" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/sql" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/grant_controller_finalizer.go b/controllers/grant_controller_finalizer.go index 7b1ec44f3f..57deb90376 100644 --- a/controllers/grant_controller_finalizer.go +++ b/controllers/grant_controller_finalizer.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/controller/sql" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/sql" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/grant_controller_test.go b/controllers/grant_controller_test.go index 92fcba11de..5c4e1b5476 100644 --- a/controllers/grant_controller_test.go +++ b/controllers/grant_controller_test.go @@ -17,7 +17,7 @@ limitations under the License. package controllers import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/controllers/mariadb_controller.go b/controllers/mariadb_controller.go index d782fa030a..01923f9efa 100644 --- a/controllers/mariadb_controller.go +++ b/controllers/mariadb_controller.go @@ -21,11 +21,11 @@ import ( "fmt" "github.com/hashicorp/go-multierror" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/configmap" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/configmap" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/controllers/mariadb_controller_metrics.go b/controllers/mariadb_controller_metrics.go index 17c6b4dd6f..5d6f546272 100644 --- a/controllers/mariadb_controller_metrics.go +++ b/controllers/mariadb_controller_metrics.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - labels "github.com/mmontes11/mariadb-operator/pkg/builder/labels" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + labels "github.com/mariadb-operator/mariadb-operator/pkg/builder/labels" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" "github.com/sethvargo/go-password/password" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/mariadb_controller_test.go b/controllers/mariadb_controller_test.go index b870682f32..2bcc9ba17b 100644 --- a/controllers/mariadb_controller_test.go +++ b/controllers/mariadb_controller_test.go @@ -3,8 +3,8 @@ package controllers import ( "time" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/controllers/restore_controller.go b/controllers/restore_controller.go index b39200c9be..293e6ab622 100644 --- a/controllers/restore_controller.go +++ b/controllers/restore_controller.go @@ -23,11 +23,11 @@ import ( "time" "github.com/hashicorp/go-multierror" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/batch" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/batch" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" batchv1 "k8s.io/api/batch/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/controllers/restore_controller_test.go b/controllers/restore_controller_test.go index cfcfaee2b2..91559315f4 100644 --- a/controllers/restore_controller_test.go +++ b/controllers/restore_controller_test.go @@ -19,7 +19,7 @@ package controllers import ( "time" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" batchv1 "k8s.io/api/batch/v1" diff --git a/controllers/sqljob_controller.go b/controllers/sqljob_controller.go index 2ee6c1144c..3102a0ecf8 100644 --- a/controllers/sqljob_controller.go +++ b/controllers/sqljob_controller.go @@ -22,12 +22,12 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/mmontes11/mariadb-operator/api/v1alpha1" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/configmap" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/configmap" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/sqljob_controller_test.go b/controllers/sqljob_controller_test.go index f96d93b4fa..b7b72ff560 100644 --- a/controllers/sqljob_controller_test.go +++ b/controllers/sqljob_controller_test.go @@ -17,7 +17,7 @@ limitations under the License. package controllers import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" batchv1 "k8s.io/api/batch/v1" @@ -96,7 +96,7 @@ var _ = Describe("SqlJob controller", func() { }, Database: &testDatabase, Sql: func() *string { - sql := `INSERT INTO users(username, email) VALUES('mmontes11','martin11lrx@gmail.com') + sql := `INSERT INTO users(username, email) VALUES('mmontes11','mariadb-operator@proton.me') ON DUPLICATE KEY UPDATE username='mmontes11';` return &sql }(), diff --git a/controllers/suite_test.go b/controllers/suite_test.go index efee0477dd..41375f0270 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -22,13 +22,13 @@ import ( "path/filepath" "testing" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/batch" - "github.com/mmontes11/mariadb-operator/pkg/controller/configmap" - "github.com/mmontes11/mariadb-operator/pkg/portforwarder" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/batch" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/configmap" + "github.com/mariadb-operator/mariadb-operator/pkg/portforwarder" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" diff --git a/controllers/suite_test_data.go b/controllers/suite_test_data.go index de7caf7834..5668a2e659 100644 --- a/controllers/suite_test_data.go +++ b/controllers/suite_test_data.go @@ -20,8 +20,8 @@ import ( "context" "time" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/controllers/user_controller.go b/controllers/user_controller.go index cbffb14d5c..e0cb85d681 100644 --- a/controllers/user_controller.go +++ b/controllers/user_controller.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - "github.com/mmontes11/mariadb-operator/pkg/controller/sql" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/sql" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/user_controller_finalizer.go b/controllers/user_controller_finalizer.go index 3277043e46..fac42886d8 100644 --- a/controllers/user_controller_finalizer.go +++ b/controllers/user_controller_finalizer.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/controller/sql" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/controller/sql" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) diff --git a/controllers/user_controller_test.go b/controllers/user_controller_test.go index b89fa03459..f37e389963 100644 --- a/controllers/user_controller_test.go +++ b/controllers/user_controller_test.go @@ -17,7 +17,7 @@ limitations under the License. package controllers import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/deploy/charts/mariadb-operator/Chart.yaml b/deploy/charts/mariadb-operator/Chart.yaml index 35da0f0f6b..387d0f838c 100644 --- a/deploy/charts/mariadb-operator/Chart.yaml +++ b/deploy/charts/mariadb-operator/Chart.yaml @@ -1,15 +1,15 @@ apiVersion: v2 name: mariadb-operator description: Run and operate MariaDB in a cloud native way -home: https://github.com/mmontes11/mariadb-operator -icon: https://mmontes11.github.io/mariadb-operator/assets/mariadb.png +home: https://github.com/mariadb-operator/mariadb-operator +icon: https://mariadb-operator.github.io/mariadb-operator/assets/mariadb.png type: application -version: 0.10.0 -appVersion: "v0.0.10" +version: 0.11.0 +appVersion: "v0.0.11" kubeVersion: ">= 1.16.0-0" maintainers: - name: mmontes11 - email: martin11lrx@gmail.com + email: mariadb-operator@proton.me keywords: - "mariadb" - "operator" diff --git a/deploy/charts/mariadb-operator/README.md b/deploy/charts/mariadb-operator/README.md index e07cd1bfcb..affc3091fa 100644 --- a/deploy/charts/mariadb-operator/README.md +++ b/deploy/charts/mariadb-operator/README.md @@ -3,16 +3,16 @@ [//]: # (README.md generated by gotmpl. DO NOT EDIT.)

-mariadb +mariadb

-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![AppVersion: v0.0.10](https://img.shields.io/badge/AppVersion-v0.0.10-informational?style=flat-square) +![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![AppVersion: v0.0.11](https://img.shields.io/badge/AppVersion-v0.0.11-informational?style=flat-square) Run and operate MariaDB in a cloud native way ## Installing ```bash -helm repo add mariadb-operator https://mmontes11.github.io/mariadb-operator +helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator helm install mariadb-operator mariadb-operator/mariadb-operator ``` @@ -32,7 +32,7 @@ helm uninstall mariadb-operator | ha.leaseId | string | `"mariadb.mmontes.io"` | Lease resource name to be used for leader election | | ha.replicas | int | `3` | Number of replicas | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.repository | string | `"mmontes11/mariadb-operator"` | | +| image.repository | string | `"ghcr.io/mariadb-operator/mariadb-operator"` | | | image.tag | string | `""` | Image tag to use. By default the chart appVersion is used | | logLevel | string | `"INFO"` | Controller log level | | metrics.enabled | bool | `false` | Enable prometheus metrics. Prometheus must be installed in the cluster | @@ -58,7 +58,7 @@ helm uninstall mariadb-operator | webhook.enabled | bool | `true` | Enable webhooks. Cert-manager must be installed in the cluster | | webhook.hostNetwork | bool | `false` | Expose the webhook server in the host network | | webhook.image.pullPolicy | string | `"IfNotPresent"` | | -| webhook.image.repository | string | `"mmontes11/mariadb-operator"` | | +| webhook.image.repository | string | `"ghcr.io/mariadb-operator/mariadb-operator"` | | | webhook.image.tag | string | `""` | Image tag to use. By default the chart appVersion is used | | webhook.nodeSelector | object | `{}` | Node selectors to add to controller Pod | | webhook.podAnnotations | object | `{}` | Annotations to add to webhook Pod | diff --git a/deploy/charts/mariadb-operator/README.md.gotmpl b/deploy/charts/mariadb-operator/README.md.gotmpl index 3a6fd31241..582aa0950d 100644 --- a/deploy/charts/mariadb-operator/README.md.gotmpl +++ b/deploy/charts/mariadb-operator/README.md.gotmpl @@ -1,10 +1,10 @@ -{{ $chartRepo := "https://mmontes11.github.io/mariadb-operator" }} +{{ $chartRepo := "https://mariadb-operator.github.io/mariadb-operator" }} {{ $org := "mariadb-operator" }} {{ $release := "mariadb-operator" }} [//]: # (README.md generated by gotmpl. DO NOT EDIT.)

-mariadb +mariadb

{{ template "chart.typeBadge" . }}{{ template "chart.versionBadge" . }}{{ template "chart.appVersionBadge" . }} diff --git a/deploy/charts/mariadb-operator/templates/NOTES.txt b/deploy/charts/mariadb-operator/templates/NOTES.txt index a365e384c5..ff5e0bb16b 100644 --- a/deploy/charts/mariadb-operator/templates/NOTES.txt +++ b/deploy/charts/mariadb-operator/templates/NOTES.txt @@ -1,4 +1,4 @@ mariadb-operator has been successfully deployed! 🦭 Not sure what to do next? 😅 Check out: -https://github.com/mmontes11/mariadb-operator#quickstart \ No newline at end of file +https://github.com/mariadb-operator/mariadb-operator#quickstart \ No newline at end of file diff --git a/deploy/charts/mariadb-operator/values.yaml b/deploy/charts/mariadb-operator/values.yaml index 70cc59bbba..6bc8bed6ea 100644 --- a/deploy/charts/mariadb-operator/values.yaml +++ b/deploy/charts/mariadb-operator/values.yaml @@ -2,7 +2,7 @@ nameOverride: "" fullnameOverride: "" image: - repository: mmontes11/mariadb-operator + repository: ghcr.io/mariadb-operator/mariadb-operator pullPolicy: IfNotPresent # -- Image tag to use. By default the chart appVersion is used tag: "" @@ -41,7 +41,7 @@ webhook: # -- Annotations for webhook configurations. annotations: {} image: - repository: mmontes11/mariadb-operator + repository: ghcr.io/mariadb-operator/mariadb-operator pullPolicy: IfNotPresent # -- Image tag to use. By default the chart appVersion is used tag: "" diff --git a/deploy/manifests/README.md b/deploy/manifests/README.md index 8c7939b97e..a0a0ec6bc0 100644 --- a/deploy/manifests/README.md +++ b/deploy/manifests/README.md @@ -1,5 +1,5 @@ # Manifests source directory -This directory contains the helm values used to generate the manifest bundles in every release. They are attached in the [GitHub release page](https://github.com/mmontes11/mariadb-operator/releases) along with other artifacts. +This directory contains the helm values used to generate the manifest bundles in every release. They are attached in the [GitHub release page](https://github.com/mariadb-operator/mariadb-operator/releases) along with other artifacts. To install the manifests bundle, refer to the root [README.md](../../README.md) \ No newline at end of file diff --git a/examples/flux/clusters/production/flux-system/gotk-sync.yaml b/examples/flux/clusters/production/flux-system/gotk-sync.yaml index a9e8fe40a2..b15998cd71 100644 --- a/examples/flux/clusters/production/flux-system/gotk-sync.yaml +++ b/examples/flux/clusters/production/flux-system/gotk-sync.yaml @@ -11,7 +11,7 @@ spec: branch: flux-example secretRef: name: flux-system - url: ssh://git@github.com/mmontes11/mariadb-operator + url: ssh://git@github.com/mariadb-operator/mariadb-operator --- apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization diff --git a/examples/flux/infrastructure/mariadb-operator/mariadb-operator-helmrepository.yaml b/examples/flux/infrastructure/mariadb-operator/mariadb-operator-helmrepository.yaml index 7689e0e5c2..ff87f63f24 100644 --- a/examples/flux/infrastructure/mariadb-operator/mariadb-operator-helmrepository.yaml +++ b/examples/flux/infrastructure/mariadb-operator/mariadb-operator-helmrepository.yaml @@ -4,4 +4,4 @@ metadata: name: mariadb-operator spec: interval: 5m - url: https://mmontes11.github.io/mariadb-operator + url: https://mariadb-operator.github.io/mariadb-operator diff --git a/go.mod b/go.mod index ee779ea80a..580594a111 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mmontes11/mariadb-operator +module github.com/mariadb-operator/mariadb-operator go 1.18 diff --git a/hack/config/openssl.conf b/hack/config/openssl.conf index d6481892a7..3297638a52 100644 --- a/hack/config/openssl.conf +++ b/hack/config/openssl.conf @@ -4,5 +4,5 @@ prompt=no [distinguished_name] countryName=ES -organizationName=mmontes11 +organizationName=mariadb-operator commonName=localhost \ No newline at end of file diff --git a/main.go b/main.go index f1e3dc2a20..9e564597aa 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ THE SOFTWARE. */ package main -import "github.com/mmontes11/mariadb-operator/cmd/controller" +import "github.com/mariadb-operator/mariadb-operator/cmd/controller" func main() { controller.Execute() diff --git a/make/deploy.mk b/make/deploy.mk index 8d2dfb5811..935822463f 100644 --- a/make/deploy.mk +++ b/make/deploy.mk @@ -4,7 +4,7 @@ CLUSTER ?= mdb ##@ Docker PLATFORM ?= linux/amd64,linux/arm64 -IMG ?= mmontes11/mariadb-operator:latest +IMG ?= ghcr.io/mariadb-operator/mariadb-operator:latest BUILD ?= docker buildx build --platform $(PLATFORM) -t $(IMG) BUILDER ?= mariadb-operator @@ -154,7 +154,7 @@ install-samples: cluster-ctx ## Install sample configuration. ##@ Examples -GITHUB_USER := mmontes11 +GITHUB_USER := mariadb-operator GITHUB_REPOSITORY := mariadb-operator GITHUB_BRANCH ?= main diff --git a/pkg/builder/backup_builder.go b/pkg/builder/backup_builder.go index 4cf921a9c3..37240763de 100644 --- a/pkg/builder/backup_builder.go +++ b/pkg/builder/backup_builder.go @@ -3,8 +3,8 @@ package builder import ( "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - labels "github.com/mmontes11/mariadb-operator/pkg/builder/labels" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + labels "github.com/mariadb-operator/mariadb-operator/pkg/builder/labels" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/builder/batch_builder.go b/pkg/builder/batch_builder.go index b40cfc679d..f4eb1a17aa 100644 --- a/pkg/builder/batch_builder.go +++ b/pkg/builder/batch_builder.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - labels "github.com/mmontes11/mariadb-operator/pkg/builder/labels" - cmd "github.com/mmontes11/mariadb-operator/pkg/command" - backupcmd "github.com/mmontes11/mariadb-operator/pkg/command/backup" - sqlcmd "github.com/mmontes11/mariadb-operator/pkg/command/sql" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + labels "github.com/mariadb-operator/mariadb-operator/pkg/builder/labels" + cmd "github.com/mariadb-operator/mariadb-operator/pkg/command" + backupcmd "github.com/mariadb-operator/mariadb-operator/pkg/command/backup" + sqlcmd "github.com/mariadb-operator/mariadb-operator/pkg/command/sql" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/builder/connection_builder.go b/pkg/builder/connection_builder.go index 6e95f628bd..539db8eab1 100644 --- a/pkg/builder/connection_builder.go +++ b/pkg/builder/connection_builder.go @@ -3,7 +3,7 @@ package builder import ( "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/builder/database_builder.go b/pkg/builder/database_builder.go index 8159537411..f3f590ecc8 100644 --- a/pkg/builder/database_builder.go +++ b/pkg/builder/database_builder.go @@ -3,8 +3,8 @@ package builder import ( "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - labels "github.com/mmontes11/mariadb-operator/pkg/builder/labels" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + labels "github.com/mariadb-operator/mariadb-operator/pkg/builder/labels" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/builder/labels/labels.go b/pkg/builder/labels/labels.go index dc480c14b6..fee15be076 100644 --- a/pkg/builder/labels/labels.go +++ b/pkg/builder/labels/labels.go @@ -1,7 +1,7 @@ package builder import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" ) const ( diff --git a/pkg/builder/persistentvolumeclaim_builder.go b/pkg/builder/persistentvolumeclaim_builder.go index 4676852fd5..2dcadaba7b 100644 --- a/pkg/builder/persistentvolumeclaim_builder.go +++ b/pkg/builder/persistentvolumeclaim_builder.go @@ -1,7 +1,7 @@ package builder import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/builder/service_builder.go b/pkg/builder/service_builder.go index 2df3973e25..b89e6c6947 100644 --- a/pkg/builder/service_builder.go +++ b/pkg/builder/service_builder.go @@ -3,8 +3,8 @@ package builder import ( "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - labels "github.com/mmontes11/mariadb-operator/pkg/builder/labels" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + labels "github.com/mariadb-operator/mariadb-operator/pkg/builder/labels" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/builder/servicemonitor_builder.go b/pkg/builder/servicemonitor_builder.go index 75a2a66102..cc7bcc84ef 100644 --- a/pkg/builder/servicemonitor_builder.go +++ b/pkg/builder/servicemonitor_builder.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - labels "github.com/mmontes11/mariadb-operator/pkg/builder/labels" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + labels "github.com/mariadb-operator/mariadb-operator/pkg/builder/labels" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/builder/statefulset_builder.go b/pkg/builder/statefulset_builder.go index 710f98e7ee..da404ecb50 100644 --- a/pkg/builder/statefulset_builder.go +++ b/pkg/builder/statefulset_builder.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - labels "github.com/mmontes11/mariadb-operator/pkg/builder/labels" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + labels "github.com/mariadb-operator/mariadb-operator/pkg/builder/labels" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/command/backup/backup.go b/pkg/command/backup/backup.go index df73f2fd73..9e2a4485e2 100644 --- a/pkg/command/backup/backup.go +++ b/pkg/command/backup/backup.go @@ -3,8 +3,8 @@ package backup import ( "errors" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/command" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/command" ) type Commander interface { diff --git a/pkg/command/backup/logical.go b/pkg/command/backup/logical.go index 122c9f2c98..84335cc4f6 100644 --- a/pkg/command/backup/logical.go +++ b/pkg/command/backup/logical.go @@ -3,8 +3,8 @@ package backup import ( "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/command" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/command" ) type logicalBackup struct { diff --git a/pkg/command/backup/physical.go b/pkg/command/backup/physical.go index 42d0af419c..b66dff4d29 100644 --- a/pkg/command/backup/physical.go +++ b/pkg/command/backup/physical.go @@ -3,8 +3,8 @@ package backup import ( "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/command" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/command" ) type physicalBackup struct { diff --git a/pkg/command/command.go b/pkg/command/command.go index b7279fc128..cf625137cc 100644 --- a/pkg/command/command.go +++ b/pkg/command/command.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" ) type Command struct { diff --git a/pkg/command/sql/sql.go b/pkg/command/sql/sql.go index 9e27d82f65..42c14ffdac 100644 --- a/pkg/command/sql/sql.go +++ b/pkg/command/sql/sql.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/command" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/command" ) type SqlOpts struct { diff --git a/pkg/conditions/conditions.go b/pkg/conditions/conditions.go index 8413dd18ef..a21ca9c593 100644 --- a/pkg/conditions/conditions.go +++ b/pkg/conditions/conditions.go @@ -1,7 +1,7 @@ package conditions import ( - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/batch/controller.go b/pkg/controller/batch/controller.go index 99c6ec629f..87ea083de2 100644 --- a/pkg/controller/batch/controller.go +++ b/pkg/controller/batch/controller.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/builder" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/configmap/controller.go b/pkg/controller/configmap/controller.go index b4ba4247af..1394fbae1e 100644 --- a/pkg/controller/configmap/controller.go +++ b/pkg/controller/configmap/controller.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mmontes11/mariadb-operator/pkg/builder" + "github.com/mariadb-operator/mariadb-operator/pkg/builder" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/sql/controller.go b/pkg/controller/sql/controller.go index 04d89df485..ffeeb04642 100644 --- a/pkg/controller/sql/controller.go +++ b/pkg/controller/sql/controller.go @@ -6,9 +6,9 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" ctrl "sigs.k8s.io/controller-runtime" ) @@ -59,7 +59,7 @@ func (tr *SqlReconciler) Reconcile(ctx context.Context, resource Resource) (ctrl return ctrl.Result{RequeueAfter: 3 * time.Second}, nil } - // TODO: connection pooling. See https://github.com/mmontes11/mariadb-operator/issues/7. + // TODO: connection pooling. See https://github.com/mariadb-operator/mariadb-operator/issues/7. var connErr *multierror.Error mdbClient, err := mariadbclient.NewRootClientWithCrd(ctx, mariaDb, tr.RefResolver) if err != nil { diff --git a/pkg/controller/sql/finalizer.go b/pkg/controller/sql/finalizer.go index ee4db7c796..9fe63ebf82 100644 --- a/pkg/controller/sql/finalizer.go +++ b/pkg/controller/sql/finalizer.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" apierrors "k8s.io/apimachinery/pkg/api/errors" ) @@ -48,7 +48,7 @@ func (tf *SqlFinalizer) Finalize(ctx context.Context, resource Resource) error { return fmt.Errorf("error getting MariaDB: %v", err) } - // TODO: connection pooling. See https://github.com/mmontes11/mariadb-operator/issues/7. + // TODO: connection pooling. See https://github.com/mariadb-operator/mariadb-operator/issues/7. mdbClient, err := mariadbclient.NewRootClientWithCrd(ctx, mariaDb, tf.RefResolver) if err != nil { return fmt.Errorf("error connecting to MariaDB: %v", err) diff --git a/pkg/controller/sql/types.go b/pkg/controller/sql/types.go index 0dedc985cc..c5acdc5a95 100644 --- a/pkg/controller/sql/types.go +++ b/pkg/controller/sql/types.go @@ -3,9 +3,9 @@ package sql import ( "context" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/conditions" - mariadbclient "github.com/mmontes11/mariadb-operator/pkg/mariadb" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/conditions" + mariadbclient "github.com/mariadb-operator/mariadb-operator/pkg/mariadb" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/pkg/mariadb/crd.go b/pkg/mariadb/crd.go index 19814cf08b..8669e7a356 100644 --- a/pkg/mariadb/crd.go +++ b/pkg/mariadb/crd.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/refresolver" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/refresolver" ) func NewRootClientWithCrd(ctx context.Context, crd *mariadbv1alpha1.MariaDB, refResolver *refresolver.RefResolver) (*Client, error) { diff --git a/pkg/refresolver/refresolver.go b/pkg/refresolver/refresolver.go index d297361be6..cd2039bb07 100644 --- a/pkg/refresolver/refresolver.go +++ b/pkg/refresolver/refresolver.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/webhook/inmutable_webhook_test.go b/pkg/webhook/inmutable_webhook_test.go index 9483c9869d..67e8a68502 100644 --- a/pkg/webhook/inmutable_webhook_test.go +++ b/pkg/webhook/inmutable_webhook_test.go @@ -3,8 +3,8 @@ package webhook_test import ( "testing" - mariadbv1alpha1 "github.com/mmontes11/mariadb-operator/api/v1alpha1" - "github.com/mmontes11/mariadb-operator/pkg/webhook" + mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1" + "github.com/mariadb-operator/mariadb-operator/pkg/webhook" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client"