Skip to content

Commit

Permalink
feat(RHTAPREL-804): update internal service refrence for migration
Browse files Browse the repository at this point in the history
 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 <hbhati@redhat.com>
  • Loading branch information
happybhati committed Apr 17, 2024
1 parent 7edcb7e commit d9ad301
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 38 deletions.
6 changes: 3 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ $ kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeli
```
### Clone and run the operator
```
$ git clone git@github.com:redhat-appstudio/internal-services.git
$ git clone git@github.com:konflux-ci/internal-services.git
Cloning into 'internal-services'...
```
#### Installing the internal-services CR
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/internalrequest_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
6 changes: 3 additions & 3 deletions controllers/internalrequest/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/internalrequest/adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions controllers/internalrequest/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/internalrequest/internalrequest_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path/filepath"
"testing"

appstudiov1alpha1 "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"

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/redhat-appstudio/internal-services
module github.com/konflux-ci/internal-services

go 1.18

Expand Down
4 changes: 2 additions & 2 deletions loader/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion loader/loader_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion loader/loader_mock_test.go
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion loader/loader_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path/filepath"
"testing"

appstudiov1alpha1 "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"

Expand Down
4 changes: 2 additions & 2 deletions loader/loader_test.go
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ 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"
Expand All @@ -35,7 +35,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.
Expand All @@ -47,7 +47,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"
appstudiov1alpha1 "github.com/konflux-cis/internal-services/api/v1alpha1"

Check failure on line 50 in main.go

View check run for this annotation

Red Hat Konflux / Red Hat Konflux / internal-services-on-pull-request

main.go#L50

no required module provides package github.com/konflux-cis/internal-services/api/v1alpha1; to add it:
//+kubebuilder:scaffold:imports
)

Expand Down
9 changes: 5 additions & 4 deletions tekton/pipeline_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
7 changes: 4 additions & 3 deletions tekton/pipeline_run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
7 changes: 4 additions & 3 deletions tekton/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d9ad301

Please sign in to comment.