Remove all grafana-operator-experimental

.github/workflows/release-github.yaml

@@ -70,3 +70,4 @@ jobs:
             --image-label org.opencontainers.image.revision=${{ github.sha }} \
             --image-label org.opencontainers.image.version=${{ github.ref_name }} \
             --image-label org.opencontainers.image.created=${{ env.BUILD_DATE }} \
+            --insecure-registry

PROJECT

@@ -4,8 +4,8 @@ layout:
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
-projectName: grafana-operator-experimental
-repo: github.com/grafana-operator/grafana-operator-experimental
+projectName: grafana-operator
+repo: github.com/grafana-operator/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-experimental/api/v1beta1
+  path: github.com/grafana-operator/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-experimental/api/v1beta1
+  path: github.com/grafana-operator/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-experimental/api/v1beta1
+  path: github.com/grafana-operator/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-experimental/api/v1beta1
+  path: github.com/grafana-operator/grafana-operator/api/v1beta1
   version: v1beta1
 version: "3"

bundle.Dockerfile

@@ -4,7 +4,7 @@ FROM scratch
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
-LABEL operators.operatorframework.io.bundle.package.v1=grafana-operator-experimental
+LABEL operators.operatorframework.io.bundle.package.v1=grafana-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.2
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1

bundle/manifests/grafana-operator-experimental.clusterserviceversion.yaml → bundle/manifests/grafana-operator.clusterserviceversion.yaml

@@ -95,7 +95,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.22.2
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: grafana-operator-experimental.v5.0.0
+  name: grafana-operator.v5.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -408,8 +408,8 @@ spec:
   - Metrics
   - Observability
   links:
-  - name: Grafana Operator Experimental
-    url: https://grafana-operator-experimental.domain
+  - name: Grafana Operator
+    url: https://grafana-operator.domain
   maturity: alpha
   provider:
     name: Red Hat

bundle/metadata/annotations.yaml

@@ -3,7 +3,7 @@ annotations:
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
-  operators.operatorframework.io.bundle.package.v1: grafana-operator-experimental
+  operators.operatorframework.io.bundle.package.v1: grafana-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.2
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1

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

@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-  name: grafana-operator-experimental.v0.0.0
+  name: grafana-operator.v0.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -53,8 +53,8 @@ spec:
   - Metrics
   - Observability
   links:
-  - name: Grafana Operator Experimental
-    url: https://grafana-operator-experimental.domain
+  - name: Grafana Operator
+    url: https://grafana-operator.domain
   maturity: alpha
   provider:
     name: Red Hat

config/manifests/kustomization.yaml

@@ -1,11 +1,10 @@
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
-- bases/grafana-operator-experimental.clusterserviceversion.yaml
-- ../default
-- ../samples
-- ../scorecard
-
+  - bases/grafana-operator.clusterserviceversion.yaml
+  - ../default
+  - ../samples
+  - ../scorecard
 # [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
 # Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
 # These patches remove the unnecessary "cert" volume and its manager container volumeMount.

controllers/autodetect/main_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/autodetect"
+	"github.com/grafana-operator/grafana-operator/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,12 +7,12 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/metrics"
+	"github.com/grafana-operator/grafana-operator/controllers/metrics"
 	v1 "k8s.io/api/core/v1"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/config"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/model"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/controllers/config"
+	"github.com/grafana-operator/grafana-operator/controllers/model"
 	grapi "github.com/grafana/grafana-api-golang-client"
 	"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-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/model"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/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

@@ -25,13 +25,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana-operator/grafana-operator-experimental/embeds"
+	"github.com/grafana-operator/grafana-operator/embeds"
 
 	"github.com/go-logr/logr"
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
-	client2 "github.com/grafana-operator/grafana-operator-experimental/controllers/client"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/fetchers"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/metrics"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	client2 "github.com/grafana-operator/grafana-operator/controllers/client"
+	"github.com/grafana-operator/grafana-operator/controllers/fetchers"
+	"github.com/grafana-operator/grafana-operator/controllers/metrics"
 	grapi "github.com/grafana/grafana-api-golang-client"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"

controllers/dashboard_controller_test.go

@@ -19,7 +19,7 @@ package controllers
 import (
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

controllers/datasource_controller.go

@@ -24,18 +24,18 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/metrics"
+	"github.com/grafana-operator/grafana-operator/controllers/metrics"
 
 	"github.com/go-logr/logr"
-	client2 "github.com/grafana-operator/grafana-operator-experimental/controllers/client"
+	client2 "github.com/grafana-operator/grafana-operator/controllers/client"
 	gapi "github.com/grafana/grafana-api-golang-client"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"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-experimental/api/v1beta1"
+	v1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
 )
 
 // GrafanaDatasourceReconciler reconciles a GrafanaDatasource object

controllers/fetchers/jsonnet_fetcher.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/google/go-jsonnet"
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
 )
 
 // EmbedFSImporter "imports" data from an in-memory embedFS.

controllers/fetchers/jsonnet_fetcher_test.go

@@ -8,8 +8,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/embeds"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/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-experimental/api/v1beta1"
-	client2 "github.com/grafana-operator/grafana-operator-experimental/controllers/client"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/metrics"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	client2 "github.com/grafana-operator/grafana-operator/controllers/client"
+	"github.com/grafana-operator/grafana-operator/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-experimental/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/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-experimental/controllers/metrics"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/reconcilers"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/reconcilers/grafana"
+	"github.com/grafana-operator/grafana-operator/controllers/metrics"
+	"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
+	"github.com/grafana-operator/grafana-operator/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-experimental/api/v1beta1"
+	grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
 )
 
 const (

controllers/grafanafolder_controller.go

@@ -24,18 +24,18 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	client2 "github.com/grafana-operator/grafana-operator-experimental/controllers/client"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/metrics"
+	client2 "github.com/grafana-operator/grafana-operator/controllers/client"
+	"github.com/grafana-operator/grafana-operator/controllers/metrics"
 	grapi "github.com/grafana/grafana-api-golang-client"
 	"k8s.io/apimachinery/pkg/api/errors"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
 	"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"
 
-	grafanav1beta1 "github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
+	grafanav1beta1 "github.com/grafana-operator/grafana-operator/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-experimental/api/v1beta1"
+	grafanav1beta1 "github.com/grafana-operator/grafana-operator/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-experimental/api/v1beta1"
+	grafanav1beta1 "github.com/grafana-operator/grafana-operator/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-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/config"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/model"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/reconcilers"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/controllers/config"
+	"github.com/grafana-operator/grafana-operator/controllers/model"
+	"github.com/grafana-operator/grafana-operator/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-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/reconcilers"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )

controllers/reconcilers/grafana/config_reconciler.go

@@ -3,10 +3,10 @@ package grafana
 import (
 	"context"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/config"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/model"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/reconcilers"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/controllers/config"
+	"github.com/grafana-operator/grafana-operator/controllers/model"
+	"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

controllers/reconcilers/grafana/deployment_reconciler.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
-	config2 "github.com/grafana-operator/grafana-operator-experimental/controllers/config"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/model"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/reconcilers"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	config2 "github.com/grafana-operator/grafana-operator/controllers/config"
+	"github.com/grafana-operator/grafana-operator/controllers/model"
+	"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
 	v12 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

controllers/reconcilers/grafana/grafana_service_reconciler.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/config"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/model"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/reconcilers"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/controllers/config"
+	"github.com/grafana-operator/grafana-operator/controllers/model"
+	"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"

controllers/reconcilers/grafana/grafana_service_reconciler_test.go

@@ -3,8 +3,8 @@ package grafana
 import (
 	"testing"
 
-	"github.com/grafana-operator/grafana-operator-experimental/api/v1beta1"
-	"github.com/grafana-operator/grafana-operator-experimental/controllers/config"
+	"github.com/grafana-operator/grafana-operator/api/v1beta1"
+	"github.com/grafana-operator/grafana-operator/controllers/config"
 	"github.com/stretchr/testify/assert"
 )