chore: replace references to old github repository (#1339)

.github/workflows/release.yaml

@@ -49,7 +49,7 @@ jobs:
           make kustomize
           # Update image to match the new image and tag
           cd deploy/kustomize/base
-          kustomize edit set image ghcr.io/grafana-operator/grafana-operator=${{ env.GHCR_REPO }}:${{ github.ref_name }}
+          kustomize edit set image ghcr.io/${{ github.repository }}=${{ env.GHCR_REPO }}:${{ github.ref_name }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -98,11 +98,11 @@ jobs:
 
       - name: Build and push
         run: |
-          declare -a arr=("quay.io" "ghcr.io" )
+          declare -a arr=("quay.io/grafana-operator/grafana-operator" "ghcr.io/${{ github.repository }}" )
           
           for i in "${arr[@]}"
           do
-            export KO_DOCKER_REPO=${i}/grafana-operator/grafana-operator
+            export KO_DOCKER_REPO=${i}
             ko build --sbom=none --bare --platform linux/arm64,linux/arm/v7,linux/amd64 -t ${{ github.ref_name }} \
             --image-label org.opencontainers.image.title=grafana-operator \
             --image-label org.opencontainers.image.description="An operator for Grafana that installs and manages Grafana instances & Dashboards & Datasources through Kubernetes/OpenShift CRs" \

PREPARE_RELEASE.md

@@ -21,7 +21,7 @@ After that you need to run `make helm/docs` which will generate the changes to b
 ## OLM
 
 After version v5.4.1, we no longer update the image version in this repo, but only upstream in the OLM repos.
-This to support disconnected mode, for more information see [PR 1234](https://github.com/grafana-operator/grafana-operator/pull/1234).
+This to support disconnected mode, for more information see [PR 1234](https://github.com/grafana/grafana-operator/pull/1234).
 
 After cutting a new release according to the instructions above, run the below instructions in this repo and create a PR to the different upstream repos, there is no need to create a PR to this repo.
 

PROJECT

@@ -5,7 +5,7 @@ plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: grafana-operator
-repo: github.com/grafana-operator/grafana-operator
+repo: github.com/grafana/grafana-operator
 resources:
 - api:
     crdVersion: v1
@@ -14,7 +14,7 @@ resources:
   domain: integreatly.org
   group: grafana
   kind: Grafana
-  path: github.com/grafana-operator/grafana-operator/api/v1beta1
+  path: github.com/grafana/grafana-operator/api/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -23,7 +23,7 @@ resources:
   domain: integreatly.org
   group: grafana
   kind: GrafanaDashboard
-  path: github.com/grafana-operator/grafana-operator/api/v1beta1
+  path: github.com/grafana/grafana-operator/api/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -32,7 +32,7 @@ resources:
   domain: integreatly.org
   group: grafana
   kind: GrafanaDatasource
-  path: github.com/grafana-operator/grafana-operator/api/v1beta1
+  path: github.com/grafana/grafana-operator/api/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -41,6 +41,6 @@ resources:
   domain: integreatly.org
   group: grafana
   kind: GrafanaFolder
-  path: github.com/grafana-operator/grafana-operator/api/v1beta1
+  path: github.com/grafana/grafana-operator/api/v1beta1
   version: v1beta1
 version: "3"

README.md

@@ -7,7 +7,7 @@ We make it possible for you to manage and share your grafana resources through c
 easy and scalable way.
 
 Find out more on our official website:
-***[grafana-operator.github.io/grafana-operator](https://grafana-operator.github.io/grafana-operator/).***
+***[grafana.github.io/grafana-operator](https://grafana-operator.github.io/grafana-operator/).***
 
 ## Meet our users!
 
@@ -44,7 +44,7 @@ and our current high-profile users aren't enough to convince you, here's some mo
 ## Get In Touch!
 
 The best way to reach us is to file an issue on
-***[Issues Tab](https://github.com/grafana-operator/grafana-operator/issues)***
+***[Issues Tab](https://github.com/grafana/grafana-operator/issues)***
 or click on the ***[Slack Icon](https://kubernetes.slack.com/archives/C019A1KTYKC)*** below
 
 We're happy to help out in all grafana-operator issues, and if you're not sure, we'll point you in the right direction!
@@ -67,11 +67,11 @@ For more information on how to contribute to the operator look at [CONTRIBUTING.
 
 ## Version Support and Development Mindset
 
-V4 is available on the [v4 branch](https://github.com/grafana-operator/grafana-operator/tree/v4), however, this version
+V4 is available on the [v4 branch](https://github.com/grafana/grafana-operator/tree/v4), however, this version
 will only receive bug fixes and security updates.
 
 V5 is the current, actively developed and maintained version of the operator, which you can find on the
-***[Master Branch](https://github.com/grafana-operator/grafana-operator/tree/master)***.
+***[Master Branch](https://github.com/grafana/grafana-operator/tree/master)***.
 
 A more in-depth overview of v5 is available in the [intro blog](docs/blog/v5-intro.md)
 

bundle/manifests/grafana-operator.clusterserviceversion.yaml

@@ -97,7 +97,7 @@ metadata:
     createdAt: "2023-11-06T20:49:26Z"
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-    repository: https://github.com/grafana-operator/grafana-operator
+    repository: https://github.com/grafana/grafana-operator
     support: Community
   name: grafana-operator.v5.4.2
   namespace: placeholder

config/manifests/bases/grafana-operator.clusterserviceversion.yaml

@@ -7,7 +7,7 @@ metadata:
     categories: Monitoring
     containerImage: ghcr.io/grafana-operator/grafana-operator:v5.5.0
     createdAt: "2023-09-12T08:09:00.92Z"
-    repository: https://github.com/grafana-operator/grafana-operator
+    repository: https://github.com/grafana/grafana-operator
     support: Community
   name: grafana-operator.v0.0.0
   namespace: placeholder

controllers/autodetect/main_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator/v5/controllers/autodetect"
+	"github.com/grafana/grafana-operator/v5/controllers/autodetect"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

controllers/client/grafana_client.go

@@ -7,13 +7,13 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
+	"github.com/grafana/grafana-operator/v5/controllers/metrics"
 	v1 "k8s.io/api/core/v1"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/config"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/model"
 	grapi "github.com/grafana/grafana-api-golang-client"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/controllers/config"
+	"github.com/grafana/grafana-operator/v5/controllers/model"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 

controllers/controller_shared.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/model"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/controllers/model"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

controllers/dashboard_controller.go

@@ -31,14 +31,14 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/grafana-operator/grafana-operator/v5/embeds"
+	"github.com/grafana/grafana-operator/v5/embeds"
 
 	"github.com/go-logr/logr"
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/fetchers"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
 	grapi "github.com/grafana/grafana-api-golang-client"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	client2 "github.com/grafana/grafana-operator/v5/controllers/client"
+	"github.com/grafana/grafana-operator/v5/controllers/fetchers"
+	"github.com/grafana/grafana-operator/v5/controllers/metrics"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/discovery"
@@ -541,7 +541,7 @@ func (r *GrafanaDashboardReconciler) getDashboardModel(cr *v1beta1.GrafanaDashbo
 	}
 
 	// NOTE: id should never be hardcoded in a dashboard, otherwise grafana will try to update a dashboard by id instead of uid.
-	//       And, in case the id is non-existent, grafana will respond with 404. https://github.com/grafana-operator/grafana-operator/issues/1108
+	//       And, in case the id is non-existent, grafana will respond with 404. https://github.com/grafana/grafana-operator/issues/1108
 	dashboardModel["id"] = nil
 
 	uid, _ := dashboardModel["uid"].(string) //nolint:errcheck

controllers/dashboard_controller_test.go

@@ -25,7 +25,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

controllers/datasource_controller.go

@@ -27,19 +27,19 @@ import (
 	v1 "k8s.io/api/core/v1"
 
 	simplejson "github.com/bitly/go-simplejson"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
+	"github.com/grafana/grafana-operator/v5/controllers/metrics"
 
 	"github.com/go-logr/logr"
-	client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
 	gapi "github.com/grafana/grafana-api-golang-client"
+	client2 "github.com/grafana/grafana-operator/v5/controllers/client"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	v1beta1 "github.com/grafana/grafana-operator/v5/api/v1beta1"
 )
 
 // GrafanaDatasourceReconciler reconciles a GrafanaDatasource object

controllers/fetchers/configmap_fetcher.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

controllers/fetchers/grafana_com_fetcher.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	client2 "github.com/grafana/grafana-operator/v5/controllers/client"
+	"github.com/grafana/grafana-operator/v5/controllers/metrics"
 )
 
 const grafanaComDashboardApiUrlRoot = "https://grafana.com/api/dashboards"

controllers/fetchers/grafana_com_fetcher_test.go

@@ -3,7 +3,7 @@ package fetchers
 import (
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
 	"github.com/stretchr/testify/assert"
 )
 

controllers/fetchers/jsonnet_fetcher.go

@@ -17,10 +17,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana-operator/grafana-operator/v5/controllers/config"
+	"github.com/grafana/grafana-operator/v5/controllers/config"
 
 	"github.com/google/go-jsonnet"
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
 )
 
 // EmbedFSImporter "imports" data from an in-memory embedFS.

controllers/fetchers/jsonnet_fetcher_test.go

@@ -10,11 +10,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator/v5/controllers/config"
+	"github.com/grafana/grafana-operator/v5/controllers/config"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator/v5/embeds"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/embeds"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

controllers/fetchers/url_fetcher.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	client2 "github.com/grafana/grafana-operator/v5/controllers/client"
+	"github.com/grafana/grafana-operator/v5/controllers/metrics"
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

controllers/fetchers/url_fetcher_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
 	"github.com/stretchr/testify/assert"
 )
 

controllers/grafana_controller.go

@@ -22,9 +22,9 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers/grafana"
+	"github.com/grafana/grafana-operator/v5/controllers/metrics"
+	"github.com/grafana/grafana-operator/v5/controllers/reconcilers"
+	"github.com/grafana/grafana-operator/v5/controllers/reconcilers/grafana"
 	v1 "k8s.io/api/apps/v1"
 	v12 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -35,7 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	grafanav1beta1 "github.com/grafana/grafana-operator/v5/api/v1beta1"
 )
 
 const (

controllers/grafanafolder_controller.go

@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
 	grapi "github.com/grafana/grafana-api-golang-client"
+	client2 "github.com/grafana/grafana-operator/v5/controllers/client"
+	"github.com/grafana/grafana-operator/v5/controllers/metrics"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -35,7 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	grafanav1beta1 "github.com/grafana/grafana-operator/v5/api/v1beta1"
 )
 
 // GrafanaFolderReconciler reconciles a GrafanaFolder object

controllers/model/dashboard_resources.go

@@ -3,7 +3,7 @@ package model
 import (
 	"fmt"
 
-	grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	grafanav1beta1 "github.com/grafana/grafana-operator/v5/api/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

controllers/model/grafana_resources.go

@@ -3,7 +3,7 @@ package model
 import (
 	"fmt"
 
-	grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
+	grafanav1beta1 "github.com/grafana/grafana-operator/v5/api/v1beta1"
 	routev1 "github.com/openshift/api/route/v1"
 	v13 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"

controllers/reconcilers/grafana/admin_secret_reconciler.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"os"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/config"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/model"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/controllers/config"
+	"github.com/grafana/grafana-operator/v5/controllers/model"
+	"github.com/grafana/grafana-operator/v5/controllers/reconcilers"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

controllers/reconcilers/grafana/complete_reconciler.go

@@ -3,8 +3,8 @@ package grafana
 import (
 	"context"
 
-	"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
+	"github.com/grafana/grafana-operator/v5/api/v1beta1"
+	"github.com/grafana/grafana-operator/v5/controllers/reconcilers"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )