Skip to content

Commit

Permalink
Move repo to konflux-ci org (#289)
Browse files Browse the repository at this point in the history
STONEBLD-2336

Signed-off-by: Adam Cmiel <[email protected]>
  • Loading branch information
chmeliik authored May 3, 2024
1 parent b19e3a3 commit 8a79949
Show file tree
Hide file tree
Showing 39 changed files with 107 additions and 107 deletions.
4 changes: 2 additions & 2 deletions .tekton/build-service-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ spec:
value: 'quay.io/redhat-appstudio/build-service:{{revision}}'
- name: infra-deployment-update-script
value: |
sed -i -e 's|\(https://github.com/redhat-appstudio/build-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/build-service/development/kustomization.yaml
sed -i -e 's|\(https://github.com/redhat-appstudio/build-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/build-service/staging/base/kustomization.yaml
sed -i -e 's|\(https://github.com/konflux-ci/build-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/build-service/development/kustomization.yaml
sed -i -e 's|\(https://github.com/konflux-ci/build-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/build-service/staging/base/kustomization.yaml
- name: slack-webhook-notification-team
value: build
pipelineRef:
Expand Down
4 changes: 2 additions & 2 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: build-service
repo: github.com/redhat-appstudio/build-service
repo: github.com/konflux-ci/build-service
resources:
- api:
crdVersion: v1
Expand All @@ -14,6 +14,6 @@ resources:
domain: redhat.com
group: appstudio.redhat.com
kind: BuildPipelineSelector
path: github.com/redhat-appstudio/build-service/api/v1alpha1
path: github.com/konflux-ci/build-service/api/v1alpha1
version: v1alpha1
version: "3"
10 changes: 5 additions & 5 deletions controllers/component_build_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ import (

appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

"github.com/redhat-appstudio/build-service/pkg/boerrors"
"github.com/redhat-appstudio/build-service/pkg/bometrics"
"github.com/redhat-appstudio/build-service/pkg/k8s"
l "github.com/redhat-appstudio/build-service/pkg/logs"
"github.com/redhat-appstudio/build-service/pkg/webhook"
"github.com/konflux-ci/build-service/pkg/boerrors"
"github.com/konflux-ci/build-service/pkg/bometrics"
"github.com/konflux-ci/build-service/pkg/k8s"
l "github.com/konflux-ci/build-service/pkg/logs"
"github.com/konflux-ci/build-service/pkg/webhook"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions controllers/component_build_controller_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"sort"
"strings"

buildappstudiov1alpha1 "github.com/konflux-ci/build-service/api/v1alpha1"
"github.com/konflux-ci/build-service/pkg/boerrors"
. "github.com/konflux-ci/build-service/pkg/common"
l "github.com/konflux-ci/build-service/pkg/logs"
pipelineselector "github.com/konflux-ci/build-service/pkg/pipeline-selector"
appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg"
buildappstudiov1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1"
"github.com/redhat-appstudio/build-service/pkg/boerrors"
. "github.com/redhat-appstudio/build-service/pkg/common"
l "github.com/redhat-appstudio/build-service/pkg/logs"
pipelineselector "github.com/redhat-appstudio/build-service/pkg/pipeline-selector"
tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
12 changes: 6 additions & 6 deletions controllers/component_build_controller_pac.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ import (

"github.com/go-logr/logr"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/konflux-ci/build-service/pkg/boerrors"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
"github.com/konflux-ci/build-service/pkg/git/gitproviderfactory"
l "github.com/konflux-ci/build-service/pkg/logs"
pacv1alpha1 "github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
routev1 "github.com/openshift/api/route/v1"
appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg"
"github.com/redhat-appstudio/build-service/pkg/boerrors"
. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git"
gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
"github.com/redhat-appstudio/build-service/pkg/git/gitproviderfactory"
l "github.com/redhat-appstudio/build-service/pkg/logs"
tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
tektonapi_v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
oci "github.com/tektoncd/pipeline/pkg/remote/oci"
Expand Down
8 changes: 4 additions & 4 deletions controllers/component_build_controller_simple_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/redhat-appstudio/build-service/pkg/boerrors"
. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git/gitproviderfactory"
l "github.com/redhat-appstudio/build-service/pkg/logs"
"github.com/konflux-ci/build-service/pkg/boerrors"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git/gitproviderfactory"
l "github.com/konflux-ci/build-service/pkg/logs"
)

// SubmitNewBuild creates a new PipelineRun to build a new image for the given component.
Expand Down
12 changes: 6 additions & 6 deletions controllers/component_build_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ import (
"k8s.io/apimachinery/pkg/types"

"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
buildappstudiov1alpha1 "github.com/konflux-ci/build-service/api/v1alpha1"
"github.com/konflux-ci/build-service/pkg/boerrors"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git/github"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
gpf "github.com/konflux-ci/build-service/pkg/git/gitproviderfactory"
appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg"
buildappstudiov1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1"
"github.com/redhat-appstudio/build-service/pkg/boerrors"
. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git/github"
gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
gpf "github.com/redhat-appstudio/build-service/pkg/git/gitproviderfactory"
tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
//+kubebuilder:scaffold:imports
)
Expand Down
8 changes: 4 additions & 4 deletions controllers/component_build_controller_unit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

"github.com/redhat-appstudio/build-service/pkg/boerrors"
"github.com/redhat-appstudio/build-service/pkg/bometrics"
. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/slices"
"github.com/konflux-ci/build-service/pkg/boerrors"
"github.com/konflux-ci/build-service/pkg/bometrics"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/slices"

"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg"
Expand Down
2 changes: 1 addition & 1 deletion controllers/component_dependency_update_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"text/template"
"time"

l "github.com/konflux-ci/build-service/pkg/logs"
applicationapi "github.com/redhat-appstudio/application-api/api/v1alpha1"
l "github.com/redhat-appstudio/build-service/pkg/logs"
releaseapi "github.com/redhat-appstudio/release-service/api/v1alpha1"
tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
"golang.org/x/exp/slices"
Expand Down
2 changes: 1 addition & 1 deletion controllers/component_dependency_update_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package controllers

import (
"fmt"
l "github.com/redhat-appstudio/build-service/pkg/logs"
l "github.com/konflux-ci/build-service/pkg/logs"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
12 changes: 6 additions & 6 deletions controllers/git_tekton_resources_renovater.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (

appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

buildappstudiov1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1"
. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git"
"github.com/redhat-appstudio/build-service/pkg/k8s"
l "github.com/redhat-appstudio/build-service/pkg/logs"
"github.com/redhat-appstudio/build-service/pkg/renovate"
buildappstudiov1alpha1 "github.com/konflux-ci/build-service/api/v1alpha1"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git"
"github.com/konflux-ci/build-service/pkg/k8s"
l "github.com/konflux-ci/build-service/pkg/logs"
"github.com/konflux-ci/build-service/pkg/renovate"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions controllers/git_tekton_resources_renovater_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (

"k8s.io/apimachinery/pkg/types"

. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git/github"
"github.com/redhat-appstudio/build-service/pkg/renovate"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git/github"
"github.com/konflux-ci/build-service/pkg/renovate"
)

var _ = Describe("Git tekton resources renovater", func() {
Expand Down
2 changes: 1 addition & 1 deletion controllers/pac_pipelinerun_pruner_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/predicate"

l "github.com/konflux-ci/build-service/pkg/logs"
appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
l "github.com/redhat-appstudio/build-service/pkg/logs"
tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
)

Expand Down
10 changes: 5 additions & 5 deletions controllers/renovate_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
logger "sigs.k8s.io/controller-runtime/pkg/log"

. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git"
"github.com/redhat-appstudio/build-service/pkg/git/github"
"github.com/redhat-appstudio/build-service/pkg/logs"
"github.com/redhat-appstudio/build-service/pkg/renovate"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git"
"github.com/konflux-ci/build-service/pkg/git/github"
"github.com/konflux-ci/build-service/pkg/logs"
"github.com/konflux-ci/build-service/pkg/renovate"
)

type installationStruct struct {
Expand Down
6 changes: 3 additions & 3 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

appstudioredhatcomv1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1"
"github.com/redhat-appstudio/build-service/pkg/k8s"
"github.com/redhat-appstudio/build-service/pkg/webhook"
appstudioredhatcomv1alpha1 "github.com/konflux-ci/build-service/api/v1alpha1"
"github.com/konflux-ci/build-service/pkg/k8s"
"github.com/konflux-ci/build-service/pkg/webhook"
//+kubebuilder:scaffold:imports
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/suite_util_gitprovider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package controllers

import (
gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
gpf "github.com/redhat-appstudio/build-service/pkg/git/gitproviderfactory"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
gpf "github.com/konflux-ci/build-service/pkg/git/gitproviderfactory"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions controllers/suite_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ import (
gh "github.com/google/go-github/v45/github"
appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

buildappstudiov1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1"
. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git/github"
buildappstudiov1alpha1 "github.com/konflux-ci/build-service/api/v1alpha1"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git/github"
)

const (
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/build-service
module github.com/konflux-ci/build-service

go 1.20

Expand Down
12 changes: 6 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ import (
releaseapi "github.com/redhat-appstudio/release-service/api/v1alpha1"
tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"

appstudioredhatcomv1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1"
"github.com/redhat-appstudio/build-service/controllers"
"github.com/redhat-appstudio/build-service/pkg/bometrics"
"github.com/redhat-appstudio/build-service/pkg/k8s"
l "github.com/redhat-appstudio/build-service/pkg/logs"
"github.com/redhat-appstudio/build-service/pkg/webhook"
appstudioredhatcomv1alpha1 "github.com/konflux-ci/build-service/api/v1alpha1"
"github.com/konflux-ci/build-service/controllers"
"github.com/konflux-ci/build-service/pkg/bometrics"
"github.com/konflux-ci/build-service/pkg/k8s"
l "github.com/konflux-ci/build-service/pkg/logs"
"github.com/konflux-ci/build-service/pkg/webhook"
//+kubebuilder:scaffold:imports
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/bometrics/githubapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/bradleyfalzon/ghinstallation/v2"
"github.com/google/go-github/v45/github"
"github.com/konflux-ci/build-service/pkg/boerrors"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/prometheus/client_golang/prometheus"
"github.com/redhat-appstudio/build-service/pkg/boerrors"
. "github.com/redhat-appstudio/build-service/pkg/common"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/git/credentials/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package credentials
import (
"context"

"github.com/redhat-appstudio/build-service/pkg/git"
"github.com/konflux-ci/build-service/pkg/git"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/git/github/github_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

ghinstallation "github.com/bradleyfalzon/ghinstallation/v2"
"github.com/google/go-github/v45/github"
"github.com/redhat-appstudio/build-service/pkg/boerrors"
"github.com/konflux-ci/build-service/pkg/boerrors"
)

// Allow mocking for tests
Expand Down
2 changes: 1 addition & 1 deletion pkg/git/github/github_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/google/go-github/v45/github"
"golang.org/x/oauth2"

gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
)

// Allow mocking for tests
Expand Down
4 changes: 2 additions & 2 deletions pkg/git/github/github_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"time"

"github.com/google/go-github/v45/github"
"github.com/redhat-appstudio/build-service/pkg/boerrors"
gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
"github.com/konflux-ci/build-service/pkg/boerrors"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
)

func getOwnerAndRepoFromUrl(repoUrl string) (owner string, repository string) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/git/github/github_helper_debug_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"
"testing"

gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
)

// THIS FILE IS NOT UNIT TESTS
Expand Down
2 changes: 1 addition & 1 deletion pkg/git/gitlab/gitlab_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/xanzy/go-gitlab"

gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
)

// Allow mocking for tests
Expand Down
4 changes: 2 additions & 2 deletions pkg/git/gitlab/gitlab_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/xanzy/go-gitlab"

"github.com/redhat-appstudio/build-service/pkg/boerrors"
gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
"github.com/konflux-ci/build-service/pkg/boerrors"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"

"net/url"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/git/gitlab/gitlab_helper_debug_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"
"testing"

gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
gp "github.com/konflux-ci/build-service/pkg/git/gitprovider"
)

// THIS FILE IS NOT UNIT TESTS
Expand Down
10 changes: 5 additions & 5 deletions pkg/git/gitproviderfactory/gitproviderfactory.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"fmt"
"strconv"

"github.com/redhat-appstudio/build-service/pkg/boerrors"
. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git/github"
"github.com/redhat-appstudio/build-service/pkg/git/gitlab"
"github.com/redhat-appstudio/build-service/pkg/git/gitprovider"
"github.com/konflux-ci/build-service/pkg/boerrors"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git/github"
"github.com/konflux-ci/build-service/pkg/git/gitlab"
"github.com/konflux-ci/build-service/pkg/git/gitprovider"
)

var CreateGitClient func(gitClientConfig GitClientConfig) (gitprovider.GitProviderClient, error) = createGitClient
Expand Down
6 changes: 3 additions & 3 deletions pkg/git/gitproviderfactory/gitproviderfactory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"fmt"
"testing"

. "github.com/redhat-appstudio/build-service/pkg/common"
"github.com/redhat-appstudio/build-service/pkg/git/github"
"github.com/redhat-appstudio/build-service/pkg/git/gitlab"
. "github.com/konflux-ci/build-service/pkg/common"
"github.com/konflux-ci/build-service/pkg/git/github"
"github.com/konflux-ci/build-service/pkg/git/gitlab"
)

func TestGetContainerImageRepository(t *testing.T) {
Expand Down
Loading

0 comments on commit 8a79949

Please sign in to comment.