Skip to content

Commit

Permalink
Move Konflux Image Controller to konflux-ci org (#111)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmorhun authored May 17, 2024
1 parent 103df04 commit 4f18f64
Show file tree
Hide file tree
Showing 18 changed files with 34 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .tekton/image-controller-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: https://github.com/redhat-appstudio/image-controller?rev={{revision}}
build.appstudio.openshift.io/repo: https://github.com/konflux-ci/image-controller?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/image-controller-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: https://github.com/redhat-appstudio/image-controller?rev={{revision}}
build.appstudio.openshift.io/repo: https://github.com/konflux-ci/image-controller?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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
#
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
# appstudio.redhat.com/image-controller-bundle:$VERSION and appstudio.redhat.com/image-controller-catalog:$VERSION.
IMAGE_TAG_BASE ?= quay.io/redhat-appstudio/image-controller
IMAGE_TAG_BASE ?= quay.io/konflux-ci/image-controller

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
Expand All @@ -47,7 +47,7 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
endif

# Image URL to use all building/pushing image targets
IMG ?= quay.io/redhat-appstudio/image-controller
IMG ?= quay.io/konflux-ci/image-controller
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.24.2

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: image-controller
repo: github.com/redhat-appstudio/image-controller
repo: github.com/konflux-ci/image-controller
resources:
- api:
crdVersion: v1
Expand All @@ -14,6 +14,6 @@ resources:
domain: appstudio.redhat.com
group: appstudio.redhat.com
kind: ImageRepository
path: github.com/redhat-appstudio/image-controller/api/v1alpha1
path: github.com/konflux-ci/image-controller/api/v1alpha1
version: v1alpha1
version: "3"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![codecov](https://codecov.io/gh/redhat-appstudio/image-controller/branch/main/graph/badge.svg)](https://codecov.io/gh/redhat-appstudio/image-controller)
[![codecov](https://codecov.io/gh/konflux-ci/image-controller/branch/main/graph/badge.svg)](https://codecov.io/gh/konflux-ci/image-controller)
# The Image Controller for AppStudio
The Image Controller operator helps set up container image repositories on Quay.io for AppStudio.

Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/redhat-appstudio/image-controller
newName: quay.io/konflux-ci/image-controller
newTag: next
6 changes: 3 additions & 3 deletions controllers/component_image_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ import (
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/go-logr/logr"
l "github.com/konflux-ci/image-controller/pkg/logs"
"github.com/konflux-ci/image-controller/pkg/metrics"
"github.com/konflux-ci/image-controller/pkg/quay"
appstudioredhatcomv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
l "github.com/redhat-appstudio/image-controller/pkg/logs"
"github.com/redhat-appstudio/image-controller/pkg/metrics"
"github.com/redhat-appstudio/image-controller/pkg/quay"
remotesecretv1beta1 "github.com/redhat-appstudio/remote-secret/api/v1beta1"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/component_image_controller_remote_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/go-logr/logr"
"github.com/h2non/gock"
"github.com/konflux-ci/image-controller/pkg/quay"
appstudioredhatcomv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/redhat-appstudio/image-controller/pkg/quay"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/component_image_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

"github.com/redhat-appstudio/image-controller/pkg/quay"
"github.com/konflux-ci/image-controller/pkg/quay"
)

var _ = Describe("Component image controller", func() {
Expand Down
8 changes: 4 additions & 4 deletions controllers/imagerepository_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (
"crypto/rand"
"encoding/hex"
"fmt"
"github.com/redhat-appstudio/image-controller/pkg/metrics"
"strings"
"time"

"github.com/go-logr/logr"
imagerepositoryv1alpha1 "github.com/konflux-ci/image-controller/api/v1alpha1"
l "github.com/konflux-ci/image-controller/pkg/logs"
"github.com/konflux-ci/image-controller/pkg/metrics"
"github.com/konflux-ci/image-controller/pkg/quay"
appstudioredhatcomv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
imagerepositoryv1alpha1 "github.com/redhat-appstudio/image-controller/api/v1alpha1"
l "github.com/redhat-appstudio/image-controller/pkg/logs"
"github.com/redhat-appstudio/image-controller/pkg/quay"
remotesecretv1beta1 "github.com/redhat-appstudio/remote-secret/api/v1beta1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
4 changes: 2 additions & 2 deletions controllers/imagerepository_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (
"strings"
"time"

"github.com/konflux-ci/image-controller/pkg/quay"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-appstudio/image-controller/pkg/quay"
remotesecretv1beta1 "github.com/redhat-appstudio/remote-secret/api/v1beta1"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"

imagerepositoryv1alpha1 "github.com/redhat-appstudio/image-controller/api/v1alpha1"
imagerepositoryv1alpha1 "github.com/konflux-ci/image-controller/api/v1alpha1"
)

var _ = Describe("Image repository controller", func() {
Expand Down
2 changes: 1 addition & 1 deletion controllers/imagerepository_controller_unit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"testing"

imagerepositoryv1alpha1 "github.com/redhat-appstudio/image-controller/api/v1alpha1"
imagerepositoryv1alpha1 "github.com/konflux-ci/image-controller/api/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (

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

imagerepositoryv1alpha1 "github.com/konflux-ci/image-controller/api/v1alpha1"
"github.com/konflux-ci/image-controller/pkg/quay"
appstudioredhatcomv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
imagerepositoryv1alpha1 "github.com/redhat-appstudio/image-controller/api/v1alpha1"
"github.com/redhat-appstudio/image-controller/pkg/quay"
remotesecretv1beta1 "github.com/redhat-appstudio/remote-secret/api/v1beta1"
//+kubebuilder:scaffold:imports
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/types"

imagerepositoryv1alpha1 "github.com/konflux-ci/image-controller/api/v1alpha1"
appstudioapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
imagerepositoryv1alpha1 "github.com/redhat-appstudio/image-controller/api/v1alpha1"
remotesecretv1beta1 "github.com/redhat-appstudio/remote-secret/api/v1beta1"
)

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/image-controller
module github.com/konflux-ci/image-controller

go 1.20

Expand Down
10 changes: 5 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ package main
import (
"flag"
"fmt"
"github.com/redhat-appstudio/image-controller/pkg/metrics"
"net/http"
"os"
cmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
"strings"

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
Expand All @@ -43,12 +41,14 @@ import (
"sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/go-logr/logr"
"github.com/konflux-ci/image-controller/pkg/metrics"
appstudioredhatcomv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
remotesecretv1beta1 "github.com/redhat-appstudio/remote-secret/api/v1beta1"
cmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"

imagerepositoryv1alpha1 "github.com/redhat-appstudio/image-controller/api/v1alpha1"
"github.com/redhat-appstudio/image-controller/controllers"
"github.com/redhat-appstudio/image-controller/pkg/quay"
imagerepositoryv1alpha1 "github.com/konflux-ci/image-controller/api/v1alpha1"
"github.com/konflux-ci/image-controller/controllers"
"github.com/konflux-ci/image-controller/pkg/quay"
//+kubebuilder:scaffold:imports
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/metrics/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package metrics

import (
"context"
"testing"

"github.com/go-logr/logr"
"github.com/konflux-ci/image-controller/pkg/quay"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/redhat-appstudio/image-controller/pkg/quay"
"testing"
)

func TestRegisterMetrics(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/metrics/quay.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package metrics
import (
"context"
"fmt"

"github.com/go-logr/logr"
"github.com/konflux-ci/image-controller/pkg/quay"
"github.com/prometheus/client_golang/prometheus"
"github.com/redhat-appstudio/image-controller/pkg/quay"
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
)

Expand Down

0 comments on commit 4f18f64

Please sign in to comment.