feat(RHTAPREL-804): update internal service refrence for migration

This commit updates the `internal-service` refrence as result of migration to `konflux-ci` from `redhat-appstudio` more details parent EPIC: https://issues.redhat.com/browse/RHTAPREL-800 Signed-off-by: Happy Bhati <[email protected]>
johnbieren · Apr 18, 2024 · 1c3ecc7 · 1c3ecc7
1 parent b8c8b72
commit 1c3ecc7
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 42 deletions.
diff --git a/PROJECT b/PROJECT
@@ -5,7 +5,7 @@ plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: internal-services
-repo: github.com/redhat-appstudio/internal-services
+repo: github.com/konflux-ci/internal-services
 resources:
 - api:
     crdVersion: v1
@@ -14,14 +14,14 @@ resources:
   domain: redhat.com
   group: appstudio
   kind: InternalRequest
-  path: github.com/redhat-appstudio/internal-services/api/v1alpha1
+  path: github.com/konflux-ci/internal-services/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: redhat.com
   group: appstudio
   kind: InternalServicesConfig
-  path: github.com/redhat-appstudio/internal-services/api/v1alpha1
+  path: github.com/konflux-ci/internal-services/api/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/README.md b/README.md
@@ -131,7 +131,7 @@ $ kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeli
 ```
 ### Clone and run the operator
 ```
-$ git clone [email protected]:redhat-appstudio/internal-services.git
+$ git clone [email protected]:konflux-ci/internal-services.git
 Cloning into 'internal-services'...
 ```
 #### Installing the internal-services CR

diff --git a/api/v1alpha1/internalrequest_types.go b/api/v1alpha1/internalrequest_types.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/konflux-ci/operator-toolkit/conditions"
 
-	"github.com/redhat-appstudio/internal-services/metrics"
+	"github.com/konflux-ci/internal-services/metrics"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/controllers/controllers.go b/controllers/controllers.go
@@ -17,8 +17,8 @@ limitations under the License.
 package controllers
 
 import (
+	"github.com/konflux-ci/internal-services/controllers/internalrequest"
 	"github.com/konflux-ci/operator-toolkit/controller"
-	"github.com/redhat-appstudio/internal-services/controllers/internalrequest"
 )
 
 var EnabledControllers = []controller.Controller{

diff --git a/controllers/internalrequest/adapter.go b/controllers/internalrequest/adapter.go
@@ -22,10 +22,10 @@ import (
 	"os"
 
 	"github.com/go-logr/logr"
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
+	"github.com/konflux-ci/internal-services/loader"
+	"github.com/konflux-ci/internal-services/tekton"
 	"github.com/konflux-ci/operator-toolkit/controller"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
-	"github.com/redhat-appstudio/internal-services/loader"
-	"github.com/redhat-appstudio/internal-services/tekton"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/controllers/internalrequest/adapter_test.go b/controllers/internalrequest/adapter_test.go
@@ -19,15 +19,15 @@ package internalrequest
 import (
 	"fmt"
 
+	"github.com/konflux-ci/internal-services/loader"
 	toolkit "github.com/konflux-ci/operator-toolkit/loader"
-	"github.com/redhat-appstudio/internal-services/loader"
 
 	"reflect"
 
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	libhandler "github.com/operator-framework/operator-lib/handler"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"

diff --git a/controllers/internalrequest/controller.go b/controllers/internalrequest/controller.go
@@ -20,12 +20,12 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
+	"github.com/konflux-ci/internal-services/loader"
+	"github.com/konflux-ci/internal-services/tekton"
 	"github.com/konflux-ci/operator-toolkit/controller"
 	"github.com/konflux-ci/operator-toolkit/predicates"
 	libhandler "github.com/operator-framework/operator-lib/handler"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
-	"github.com/redhat-appstudio/internal-services/loader"
-	"github.com/redhat-appstudio/internal-services/tekton"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/controllers/internalrequest/internalrequest_suite_test.go b/controllers/internalrequest/internalrequest_suite_test.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	konfluxciv1alpha1 "github.com/konflux-ci/internal-services/api/v1alpha1"
 	"github.com/konflux-ci/operator-toolkit/test"
-	appstudiov1alpha1 "github.com/redhat-appstudio/internal-services/api/v1alpha1"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 
@@ -76,7 +76,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
-	Expect(appstudiov1alpha1.AddToScheme(scheme.Scheme)).To(Succeed())
+	Expect(konfluxciv1alpha1.AddToScheme(scheme.Scheme)).To(Succeed())
 	Expect(tektonv1beta1.AddToScheme(scheme.Scheme)).To(Succeed())
 
 	//+kubebuilder:scaffold:scheme

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/redhat-appstudio/internal-services
+module github.com/konflux-ci/internal-services
 
 go 1.18
 

diff --git a/loader/loader.go b/loader/loader.go
@@ -3,9 +3,9 @@ package loader
 import (
 	"context"
 
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
+	"github.com/konflux-ci/internal-services/tekton"
 	toolkit "github.com/konflux-ci/operator-toolkit/loader"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
-	"github.com/redhat-appstudio/internal-services/tekton"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/loader/loader_mock.go b/loader/loader_mock.go
@@ -3,8 +3,8 @@ package loader
 import (
 	"context"
 
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
 	toolkit "github.com/konflux-ci/operator-toolkit/loader"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/loader/loader_mock_test.go b/loader/loader_mock_test.go
@@ -1,10 +1,10 @@
 package loader
 
 import (
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
 	toolkit "github.com/konflux-ci/operator-toolkit/loader"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 )
 

diff --git a/loader/loader_suite_test.go b/loader/loader_suite_test.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	konfluxciv1alpha1 "github.com/konflux-ci/internal-services/api/v1alpha1"
 	"github.com/konflux-ci/operator-toolkit/test"
-	appstudiov1alpha1 "github.com/redhat-appstudio/internal-services/api/v1alpha1"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 
@@ -76,7 +76,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
-	Expect(appstudiov1alpha1.AddToScheme(scheme.Scheme)).To(Succeed())
+	Expect(konfluxciv1alpha1.AddToScheme(scheme.Scheme)).To(Succeed())
 	Expect(tektonv1beta1.AddToScheme(scheme.Scheme)).To(Succeed())
 
 	//+kubebuilder:scaffold:scheme

diff --git a/loader/loader_test.go b/loader/loader_test.go
@@ -1,10 +1,10 @@
 package loader
 
 import (
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
+	"github.com/konflux-ci/internal-services/tekton"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
-	"github.com/redhat-appstudio/internal-services/tekton"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/main.go b/main.go
@@ -20,13 +20,12 @@ import (
 	"flag"
 	"os"
 
-	"github.com/redhat-appstudio/internal-services/metadata"
-	"github.com/redhat-appstudio/internal-services/tekton"
-
+	"github.com/konflux-ci/internal-services/metadata"
+	"github.com/konflux-ci/internal-services/tekton"
 	"github.com/konflux-ci/operator-toolkit/controller"
+	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"go.uber.org/zap/zapcore"
 
-	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"k8s.io/apimachinery/pkg/labels"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
@@ -35,7 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/redhat-appstudio/internal-services/controllers"
+	"github.com/konflux-ci/internal-services/controllers"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
@@ -47,7 +46,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	appstudiov1alpha1 "github.com/redhat-appstudio/internal-services/api/v1alpha1"
+	konfluxciv1alpha1 "github.com/konflux-ci/internal-services/api/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -59,7 +58,7 @@ var (
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(tektonv1beta1.AddToScheme(scheme))
-	utilruntime.Must(appstudiov1alpha1.AddToScheme(scheme))
+	utilruntime.Must(konfluxciv1alpha1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

diff --git a/tekton/pipeline_run.go b/tekton/pipeline_run.go
@@ -18,15 +18,16 @@ package tekton
 
 import (
 	"fmt"
+	"reflect"
+	"strings"
+
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
+	"github.com/konflux-ci/internal-services/metadata"
 	libhandler "github.com/operator-framework/operator-lib/handler"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
-	"github.com/redhat-appstudio/internal-services/metadata"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"reflect"
-	"strings"
 )
 
 const (

diff --git a/tekton/pipeline_run_test.go b/tekton/pipeline_run_test.go
@@ -16,14 +16,15 @@ limitations under the License.
 package tekton
 
 import (
+	"reflect"
+	"strings"
+
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/operator-framework/operator-lib/handler"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"reflect"
-	"strings"
 )
 
 var _ = Describe("PipelineRun", Ordered, func() {

diff --git a/tekton/utils.go b/tekton/utils.go
@@ -17,12 +17,13 @@ limitations under the License.
 package tekton
 
 import (
+	"reflect"
+	"strings"
+
+	"github.com/konflux-ci/internal-services/api/v1alpha1"
 	libhandler "github.com/operator-framework/operator-lib/handler"
-	"github.com/redhat-appstudio/internal-services/api/v1alpha1"
 	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
-	"reflect"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 )
 
 // GetResultsFromPipelineRun returns a map with all the results emitted by the given PipelineRun. Only string results