Skip to content

Commit

Permalink
Merge pull request #723 from MartinBasti/migration-integration-service
Browse files Browse the repository at this point in the history
chore(STONEINTG-836): migrate to konflux-ci org
  • Loading branch information
MartinBasti committed May 13, 2024
2 parents 51e066b + 18b0ccc commit 6c76e6e
Show file tree
Hide file tree
Showing 81 changed files with 192 additions and 192 deletions.
2 changes: 1 addition & 1 deletion .tekton/integration-service-pull-request.yaml
Expand Up @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: https://github.com/redhat-appstudio/integration-service?rev={{revision}}
build.appstudio.openshift.io/repo: https://github.com/konflux-ci/integration-service?rev={{revision}}
build.appstudio.redhat.com/commit_sha: '{{revision}}'
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
Expand Down
2 changes: 1 addition & 1 deletion .tekton/integration-service-push.yaml
Expand Up @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: https://github.com/redhat-appstudio/integration-service?rev={{revision}}
build.appstudio.openshift.io/repo: https://github.com/konflux-ci/integration-service?rev={{revision}}
build.appstudio.redhat.com/commit_sha: '{{revision}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
Expand Down
8 changes: 4 additions & 4 deletions PROJECT
Expand Up @@ -9,15 +9,15 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: integration-service
repo: github.com/redhat-appstudio/integration-service
repo: github.com/konflux-ci/integration-service
resources:
- api:
crdVersion: v1
namespaced: true
domain: redhat.com
group: appstudio
kind: IntegrationTestScenario
path: github.com/redhat-appstudio/integration-service/api/v1alpha1
path: github.com/konflux-ci/integration-service/api/v1alpha1
version: v1alpha1
- controller: true
domain: redhat.com
Expand All @@ -30,15 +30,15 @@ resources:
domain: redhat.com
group: appstudio
kind: IntegrationTestScenario
path: github.com/redhat-appstudio/integration-service/api/v1beta1
path: github.com/konflux-ci/integration-service/api/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
domain: redhat.com
group: appstudio
kind: IntegrationTestScenario
path: github.com/redhat-appstudio/integration-service/api/v1beta2
path: github.com/konflux-ci/integration-service/api/v1beta2
version: v1beta2
webhooks:
conversion: true
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/integrationtestscenario_conversion.go
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1alpha1

import (
"github.com/redhat-appstudio/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/api/v1beta2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/conversion"
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/integrationtestscenario_conversion.go
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1beta1

import (
"github.com/redhat-appstudio/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/api/v1beta2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/conversion"
Expand Down
2 changes: 1 addition & 1 deletion cache/cache.go
Expand Up @@ -19,8 +19,8 @@ package cache
import (
"context"

"github.com/konflux-ci/integration-service/api/v1beta2"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/api/v1beta2"

releasev1alpha1 "github.com/redhat-appstudio/release-service/api/v1alpha1"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
8 changes: 4 additions & 4 deletions cmd/main.go
Expand Up @@ -21,7 +21,7 @@ import (
"flag"
"os"

"github.com/redhat-appstudio/integration-service/internal/controller"
"github.com/konflux-ci/integration-service/internal/controller"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

Expand All @@ -38,11 +38,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

integrationv1alpha1 "github.com/konflux-ci/integration-service/api/v1alpha1"
integrationv1beta1 "github.com/konflux-ci/integration-service/api/v1beta1"
integrationv1beta2 "github.com/konflux-ci/integration-service/api/v1beta2"
pacv1alpha1 "github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
integrationv1alpha1 "github.com/redhat-appstudio/integration-service/api/v1alpha1"
integrationv1beta1 "github.com/redhat-appstudio/integration-service/api/v1beta1"
integrationv1beta2 "github.com/redhat-appstudio/integration-service/api/v1beta2"
releasev1alpha1 "github.com/redhat-appstudio/release-service/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
//+kubebuilder:scaffold:imports
Expand Down
8 changes: 4 additions & 4 deletions docs/README.md
@@ -1,9 +1,9 @@

## Current Diagrams
- [scenario-controller](https://github.com/redhat-appstudio/integration-service/blob/main/docs/scenario-controller.md)
- [snapshot-controller](https://github.com/redhat-appstudio/integration-service/blob/main/docs/snapshot-controller.md)
- [build-pipeline-controller](https://github.com/redhat-appstudio/integration-service/blob/main/docs/build_pipeline_controller.md)
- [integration-pipeline-controller](https://github.com/redhat-appstudio/integration-service/blob/main/docs/integration_pipeline_controller.md)
- [scenario-controller](https://github.com/konflux-ci/integration-service/blob/main/docs/scenario-controller.md)
- [snapshot-controller](https://github.com/konflux-ci/integration-service/blob/main/docs/snapshot-controller.md)
- [build-pipeline-controller](https://github.com/konflux-ci/integration-service/blob/main/docs/build_pipeline_controller.md)
- [integration-pipeline-controller](https://github.com/konflux-ci/integration-service/blob/main/docs/integration_pipeline_controller.md)

## Creating or editing Mermaid diagrams

Expand Down
2 changes: 1 addition & 1 deletion docs/pull_request_template.md
Expand Up @@ -2,4 +2,4 @@

- [ ] Commit messages are descriptive enough ([hints](https://www.freecodecamp.org/news/how-to-write-better-git-commit-messages/))
- [ ] Code coverage from testing does not decrease and new code is covered ([check the PR coverage on codecov](https://app.codecov.io/gh/redhat-appstudio/integration-service/pulls))
- [ ] [Controllers diagrams](https://github.com/redhat-appstudio/integration-service/tree/main/docs) are updated when PR changes controllers code (if applicable)
- [ ] [Controllers diagrams](https://github.com/konflux-ci/integration-service/tree/main/docs) are updated when PR changes controllers code (if applicable)
2 changes: 1 addition & 1 deletion git/github/github_test.go
Expand Up @@ -22,9 +22,9 @@ import (

"github.com/go-logr/logr"
ghapi "github.com/google/go-github/v45/github"
"github.com/konflux-ci/integration-service/git/github"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/integration-service/git/github"
)

const samplePrivateKey = `-----BEGIN RSA PRIVATE KEY-----
Expand Down
4 changes: 2 additions & 2 deletions gitops/gitops_suite_test.go
Expand Up @@ -24,8 +24,8 @@ import (

"sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/redhat-appstudio/integration-service/api/v1beta2"
"github.com/redhat-appstudio/integration-service/cache"
"github.com/konflux-ci/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/cache"
toolkit "github.com/redhat-appstudio/operator-toolkit/test"

"k8s.io/client-go/rest"
Expand Down
6 changes: 3 additions & 3 deletions gitops/snapshot.go
Expand Up @@ -25,10 +25,10 @@ import (
"time"

"github.com/google/go-containerregistry/pkg/name"
"github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/metrics"
"github.com/konflux-ci/integration-service/tekton"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/helpers"
"github.com/redhat-appstudio/integration-service/metrics"
"github.com/redhat-appstudio/integration-service/tekton"
"github.com/redhat-appstudio/operator-toolkit/metadata"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot_integration_tests_status.go
Expand Up @@ -21,8 +21,8 @@ import (
"encoding/json"
"fmt"

intgteststat "github.com/konflux-ci/integration-service/pkg/integrationteststatus"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
intgteststat "github.com/redhat-appstudio/integration-service/pkg/integrationteststatus"
"github.com/redhat-appstudio/operator-toolkit/metadata"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
4 changes: 2 additions & 2 deletions gitops/snapshot_integration_tests_status_test.go
Expand Up @@ -27,10 +27,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

intgteststat "github.com/konflux-ci/integration-service/pkg/integrationteststatus"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
intgteststat "github.com/redhat-appstudio/integration-service/pkg/integrationteststatus"

"github.com/redhat-appstudio/integration-service/gitops"
"github.com/konflux-ci/integration-service/gitops"
"github.com/redhat-appstudio/operator-toolkit/metadata"
)

Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot_predicate_test.go
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package gitops_test

import (
"github.com/redhat-appstudio/integration-service/gitops"
"github.com/konflux-ci/integration-service/gitops"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot_test.go
Expand Up @@ -23,8 +23,8 @@ import (

"time"

"github.com/konflux-ci/integration-service/gitops"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/gitops"
"github.com/redhat-appstudio/operator-toolkit/metadata"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
@@ -1,4 +1,4 @@
module github.com/redhat-appstudio/integration-service
module github.com/konflux-ci/integration-service

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion helpers/errorhandlers_test.go
Expand Up @@ -20,9 +20,9 @@ import (
"bytes"
"fmt"

"github.com/konflux-ci/integration-service/helpers"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/integration-service/helpers"
"github.com/tonglil/buflogr"
"k8s.io/apimachinery/pkg/api/errors"

Expand Down
4 changes: 2 additions & 2 deletions helpers/helpers_suite_test.go
Expand Up @@ -24,8 +24,8 @@ import (

"sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/redhat-appstudio/integration-service/api/v1beta2"
"github.com/redhat-appstudio/integration-service/cache"
"github.com/konflux-ci/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/cache"
toolkit "github.com/redhat-appstudio/operator-toolkit/test"

"k8s.io/client-go/rest"
Expand Down
2 changes: 1 addition & 1 deletion helpers/integration.go
Expand Up @@ -24,7 +24,7 @@ import (
"sort"
"time"

"github.com/redhat-appstudio/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/api/v1beta2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"k8s.io/apimachinery/pkg/types"
Expand Down
6 changes: 3 additions & 3 deletions helpers/integration_test.go
Expand Up @@ -21,14 +21,14 @@ import (
"fmt"
"time"

"github.com/konflux-ci/integration-service/api/v1beta2"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/integration-service/api/v1beta2"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"

"github.com/konflux-ci/integration-service/gitops"
"github.com/konflux-ci/integration-service/helpers"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/gitops"
"github.com/redhat-appstudio/integration-service/helpers"
"github.com/tonglil/buflogr"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion helpers/logs_test.go
Expand Up @@ -20,9 +20,9 @@ import (
"bytes"
"fmt"

"github.com/konflux-ci/integration-service/helpers"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/integration-service/helpers"

"github.com/tonglil/buflogr"

Expand Down
2 changes: 1 addition & 1 deletion helpers/scenario.go
Expand Up @@ -20,7 +20,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/redhat-appstudio/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/api/v1beta2"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions helpers/scenario_test.go
Expand Up @@ -23,8 +23,8 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/redhat-appstudio/integration-service/api/v1beta2"
"github.com/redhat-appstudio/integration-service/helpers"
"github.com/konflux-ci/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/helpers"
)

var _ = Describe("Gitops functions for managing Snapshots", Ordered, func() {
Expand Down
10 changes: 5 additions & 5 deletions internal/controller/buildpipeline/buildpipeline_adapter.go
Expand Up @@ -25,12 +25,12 @@ import (

"k8s.io/client-go/util/retry"

"github.com/konflux-ci/integration-service/gitops"
h "github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/integration-service/metrics"
"github.com/konflux-ci/integration-service/tekton"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/gitops"
h "github.com/redhat-appstudio/integration-service/helpers"
"github.com/redhat-appstudio/integration-service/loader"
"github.com/redhat-appstudio/integration-service/metrics"
"github.com/redhat-appstudio/integration-service/tekton"
"github.com/redhat-appstudio/operator-toolkit/controller"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
Expand Up @@ -25,10 +25,10 @@ import (

"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"github.com/redhat-appstudio/integration-service/gitops"
"github.com/redhat-appstudio/integration-service/helpers"
"github.com/redhat-appstudio/integration-service/loader"
"github.com/redhat-appstudio/integration-service/tekton"
"github.com/konflux-ci/integration-service/gitops"
"github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/integration-service/tekton"
"knative.dev/pkg/apis"
v1 "knative.dev/pkg/apis/duck/v1"

Expand Down
8 changes: 4 additions & 4 deletions internal/controller/buildpipeline/buildpipeline_controller.go
Expand Up @@ -19,14 +19,14 @@ package buildpipeline
import (
"context"

"github.com/redhat-appstudio/integration-service/cache"
"github.com/konflux-ci/integration-service/cache"
"k8s.io/client-go/util/retry"

"github.com/go-logr/logr"
"github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/integration-service/tekton"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/helpers"
"github.com/redhat-appstudio/integration-service/loader"
"github.com/redhat-appstudio/integration-service/tekton"
"github.com/redhat-appstudio/operator-toolkit/controller"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package buildpipeline

import (
"github.com/redhat-appstudio/integration-service/helpers"
"github.com/konflux-ci/integration-service/helpers"
"reflect"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
Expand Down
Expand Up @@ -33,8 +33,8 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

"github.com/konflux-ci/integration-service/api/v1beta2"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/api/v1beta2"

toolkit "github.com/redhat-appstudio/operator-toolkit/test"
releasev1alpha1 "github.com/redhat-appstudio/release-service/api/v1alpha1"
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/component/component_adapter.go
Expand Up @@ -21,11 +21,11 @@ import (

"fmt"

"github.com/konflux-ci/integration-service/gitops"
h "github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/integration-service/metrics"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/gitops"
h "github.com/redhat-appstudio/integration-service/helpers"
"github.com/redhat-appstudio/integration-service/loader"
"github.com/redhat-appstudio/integration-service/metrics"
"github.com/redhat-appstudio/operator-toolkit/controller"
"k8s.io/apimachinery/pkg/api/errors"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/component/component_adapter_test.go
Expand Up @@ -10,13 +10,13 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/konflux-ci/integration-service/loader"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/integration-service/loader"
toolkit "github.com/redhat-appstudio/operator-toolkit/loader"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/redhat-appstudio/integration-service/helpers"
"github.com/konflux-ci/integration-service/helpers"
"k8s.io/apimachinery/pkg/api/errors"

"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down

0 comments on commit 6c76e6e

Please sign in to comment.