Skip to content

Commit

Permalink
feat(RELEASE-230): update release service ref to konflux ci org
Browse files Browse the repository at this point in the history
 This commit updates the `release-service` reference
 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]>
  • Loading branch information
happybhati committed May 7, 2024
1 parent 0837126 commit 7030a6b
Show file tree
Hide file tree
Showing 55 changed files with 125 additions and 117 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @redhat-appstudio/konflux-release-team will be requested for
# @konflux-ci/release-service-maintainers will be requested for
# review when someone opens a pull request.
* @redhat-appstudio/konflux-release-team
* @konflux-ci/release-service-maintainers
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Tests are written using the *[Ginkgo](https://onsi.github.io/ginkgo/)* framework
* Start the descriptions of `It` blocks in lowercase and try to be as descriptive as possible
* Avoid ignoring errors. In other words, make sure all of them are caught and tested
* Files ending with `_suite_test.go` are meant to store the code that is common for tests in the same directory and that will be executed before them. Use these files only if your test setup is big enough to justify it (ie. the suite file has more than the test suite name and the teardown)
* When required, remember to add the `CRD`'s during the `envtest` setup, for instance: [release-service/release_suite_test.go at main · redhat-appstudio/release-service · GitHub](https://github.com/redhat-appstudio/release-service/blob/main/controllers/release/release_suite_test.go#L65) - remembering this saves a lot of time
* When required, remember to add the `CRD`'s during the `envtest` setup, for instance: [release-service/release_suite_test.go at main · redhat-appstudio/release-service · GitHub](https://github.com/konflux-ci/release-service/blob/main/controllers/release/release_suite_test.go#L65) - remembering this saves a lot of time
* After `Create()` or `Update()` objects, use `Get()` before making assurances as the object might be outdated. It is useful after `Delete()` to check if the client returns `errors.IsNotFound`
* Some assurances are likely to require usage of `Eventually` blocks instead of or in addition to `Expect` blocks

Expand Down
10 changes: 5 additions & 5 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: release-service
repo: github.com/redhat-appstudio/release-service
repo: github.com/konflux-ci/release-service
resources:
- api:
crdVersion: v1
Expand All @@ -14,7 +14,7 @@ resources:
domain: redhat.com
group: appstudio
kind: Release
path: github.com/redhat-appstudio/release-service/api/v1alpha1
path: github.com/konflux-ci/release-service/api/v1alpha1
version: v1alpha1
webhooks:
validation: true
Expand All @@ -31,7 +31,7 @@ resources:
domain: redhat.com
group: appstudio
kind: ReleasePlan
path: github.com/redhat-appstudio/release-service/api/v1alpha1
path: github.com/konflux-ci/release-service/api/v1alpha1
version: v1alpha1
webhooks:
defaulting: true
Expand All @@ -44,7 +44,7 @@ resources:
domain: redhat.com
group: appstudio
kind: ReleasePlanAdmission
path: github.com/redhat-appstudio/release-service/api/v1alpha1
path: github.com/konflux-ci/release-service/api/v1alpha1
version: v1alpha1
webhooks:
defaulting: true
Expand All @@ -56,6 +56,6 @@ resources:
domain: redhat.com
group: appstudio
kind: ReleaseServiceConfig
path: github.com/redhat-appstudio/release-service/api/v1alpha1
path: github.com/konflux-ci/release-service/api/v1alpha1
version: v1alpha1
version: "3"
2 changes: 1 addition & 1 deletion api/v1alpha1/release_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/release-service/metrics"
"github.com/konflux-ci/release-service/metrics"
"k8s.io/apimachinery/pkg/runtime"

"k8s.io/apimachinery/pkg/api/meta"
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/releaseplan_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"

"github.com/konflux-ci/operator-toolkit/conditions"
"github.com/redhat-appstudio/release-service/metadata"
tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
"github.com/konflux-ci/release-service/metadata"
tektonutils "github.com/konflux-ci/release-service/tekton/utils"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/releaseplan_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package v1alpha1
import (
"time"

"github.com/konflux-ci/release-service/metadata"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/release-service/metadata"

"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/releaseplanadmission_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"sort"

"github.com/konflux-ci/operator-toolkit/conditions"
"github.com/redhat-appstudio/release-service/metadata"
tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
"github.com/konflux-ci/release-service/metadata"
tektonutils "github.com/konflux-ci/release-service/tekton/utils"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/releaseplanadmission_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package v1alpha1

import (
"github.com/konflux-ci/release-service/metadata"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/release-service/metadata"

"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
7 changes: 4 additions & 3 deletions api/v1alpha1/webhooks/author/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ import (
"context"
"crypto/tls"
"fmt"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"net"
"path/filepath"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
"testing"
"time"

"github.com/konflux-ci/release-service/api/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

Expand Down
7 changes: 4 additions & 3 deletions api/v1alpha1/webhooks/author/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"net/http"
"strings"

"github.com/konflux-ci/release-service/api/v1alpha1"
ctrl "sigs.k8s.io/controller-runtime"
ctrlWebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
"strings"

"github.com/go-logr/logr"
"github.com/konflux-ci/release-service/metadata"
"github.com/pkg/errors"
"github.com/redhat-appstudio/release-service/metadata"
admissionv1 "k8s.io/api/admission/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha1/webhooks/author/webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ package author

import (
"encoding/json"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"net/http"

"github.com/konflux-ci/release-service/api/v1alpha1"

"github.com/konflux-ci/release-service/metadata"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/release-service/metadata"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

admissionv1 "k8s.io/api/admission/v1"
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/webhooks/release/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"time"

toolkit "github.com/konflux-ci/operator-toolkit/webhook"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/api/v1alpha1/webhooks/author"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/api/v1alpha1/webhooks/author"

"sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha1/webhooks/release/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ package release
import (
"context"
"fmt"
"github.com/redhat-appstudio/release-service/loader"
"reflect"

"github.com/konflux-ci/release-service/loader"

"github.com/go-logr/logr"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/webhooks/release/webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"context"

toolkit "github.com/konflux-ci/operator-toolkit/loader"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/loader"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/loader"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime/schema"

Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/webhooks/releaseplan/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"time"

toolkit "github.com/konflux-ci/operator-toolkit/webhook"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/api/v1alpha1/webhooks/author"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/api/v1alpha1/webhooks/author"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha1/webhooks/releaseplan/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package releaseplan
import (
"context"
"fmt"

"github.com/go-logr/logr"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/metadata"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/metadata"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/webhooks/releaseplan/webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
package releaseplan

import (
"github.com/konflux-ci/release-service/api/v1alpha1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/release-service/api/v1alpha1"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

"github.com/redhat-appstudio/release-service/metadata"
"github.com/konflux-ci/release-service/metadata"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
//+kubebuilder:scaffold:imports
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/webhooks/releaseplanadmission/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"time"

toolkit "github.com/konflux-ci/operator-toolkit/webhook"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/api/v1alpha1/webhooks/author"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/api/v1alpha1/webhooks/author"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha1/webhooks/releaseplanadmission/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package releaseplanadmission
import (
"context"
"fmt"

"github.com/go-logr/logr"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/metadata"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/metadata"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
6 changes: 3 additions & 3 deletions api/v1alpha1/webhooks/releaseplanadmission/webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
package releaseplanadmission

import (
"github.com/konflux-ci/release-service/api/v1alpha1"
tektonutils "github.com/konflux-ci/release-service/tekton/utils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

"github.com/redhat-appstudio/release-service/metadata"
"github.com/konflux-ci/release-service/metadata"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
//+kubebuilder:scaffold:imports
Expand Down
8 changes: 4 additions & 4 deletions api/v1alpha1/webhooks/webhooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package webhooks

import (
"github.com/konflux-ci/operator-toolkit/webhook"
"github.com/redhat-appstudio/release-service/api/v1alpha1/webhooks/author"
"github.com/redhat-appstudio/release-service/api/v1alpha1/webhooks/release"
"github.com/redhat-appstudio/release-service/api/v1alpha1/webhooks/releaseplan"
"github.com/redhat-appstudio/release-service/api/v1alpha1/webhooks/releaseplanadmission"
"github.com/konflux-ci/release-service/api/v1alpha1/webhooks/author"
"github.com/konflux-ci/release-service/api/v1alpha1/webhooks/release"
"github.com/konflux-ci/release-service/api/v1alpha1/webhooks/releaseplan"
"github.com/konflux-ci/release-service/api/v1alpha1/webhooks/releaseplanadmission"
)

// EnabledWebhooks is a slice containing references to all the webhooks that have to be registered
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cache
import (
"context"

"github.com/konflux-ci/release-service/api/v1alpha1"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
6 changes: 3 additions & 3 deletions controllers/controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package controllers

import (
"github.com/konflux-ci/operator-toolkit/controller"
"github.com/redhat-appstudio/release-service/controllers/release"
"github.com/redhat-appstudio/release-service/controllers/releaseplan"
"github.com/redhat-appstudio/release-service/controllers/releaseplanadmission"
"github.com/konflux-ci/release-service/controllers/release"
"github.com/konflux-ci/release-service/controllers/releaseplan"
"github.com/konflux-ci/release-service/controllers/releaseplanadmission"
)

// EnabledControllers is a slice containing references to all the controllers that have to be registered
Expand Down
10 changes: 5 additions & 5 deletions controllers/release/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (

"github.com/go-logr/logr"
"github.com/konflux-ci/operator-toolkit/controller"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/loader"
"github.com/konflux-ci/release-service/metadata"
"github.com/konflux-ci/release-service/syncer"
"github.com/konflux-ci/release-service/tekton/utils"
integrationgitops "github.com/redhat-appstudio/integration-service/gitops"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/loader"
"github.com/redhat-appstudio/release-service/metadata"
"github.com/redhat-appstudio/release-service/syncer"
"github.com/redhat-appstudio/release-service/tekton/utils"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
rbac "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
8 changes: 4 additions & 4 deletions controllers/release/adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ import (
"time"
"unicode"

tektonutils "github.com/redhat-appstudio/release-service/tekton/utils"
tektonutils "github.com/konflux-ci/release-service/tekton/utils"

"github.com/konflux-ci/operator-toolkit/controller"
toolkit "github.com/konflux-ci/operator-toolkit/loader"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/loader"
"github.com/konflux-ci/release-service/metadata"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/operator-framework/operator-lib/handler"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/loader"
"github.com/redhat-appstudio/release-service/metadata"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
corev1 "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1"
Expand Down
8 changes: 4 additions & 4 deletions controllers/release/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/cluster"

"github.com/go-logr/logr"
"github.com/konflux-ci/release-service/api/v1alpha1"
"github.com/konflux-ci/release-service/cache"
"github.com/konflux-ci/release-service/loader"
"github.com/konflux-ci/release-service/tekton"
libhandler "github.com/operator-framework/operator-lib/handler"
"github.com/redhat-appstudio/release-service/api/v1alpha1"
"github.com/redhat-appstudio/release-service/cache"
"github.com/redhat-appstudio/release-service/loader"
"github.com/redhat-appstudio/release-service/tekton"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime/schema"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
Loading

0 comments on commit 7030a6b

Please sign in to comment.