diff --git a/.github/workflows/next-container-build.yaml b/.github/workflows/next-container-build.yaml index f52d9db6..5c142a67 100644 --- a/.github/workflows/next-container-build.yaml +++ b/.github/workflows/next-container-build.yaml @@ -107,8 +107,8 @@ jobs: # now copy images from local cache to quay, using 0.0.1-next-f00cafe, 0.0.1-next, and next tags for image in operator operator-bundle operator-catalog; do - podman push quay.io/rhdh/${image}:${VERSION} -q - skopeo --insecure-policy copy --all docker://quay.io/rhdh/${image}:${VERSION} docker://quay.io/rhdh/${image}:${VERSION} - skopeo --insecure-policy copy --all docker://quay.io/rhdh/${image}:${VERSION} docker://quay.io/rhdh/${image}:${VERSION%-*} - skopeo --insecure-policy copy --all docker://quay.io/rhdh/${image}:${VERSION} docker://quay.io/rhdh/${image}:${latestNext} + podman push quay.io/janus-idp/${image}:${VERSION} -q + skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${VERSION} + skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${VERSION%-*} + skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${latestNext} done diff --git a/.github/workflows/pr-container-build.yaml b/.github/workflows/pr-container-build.yaml index 95c9d654..b95eabe6 100644 --- a/.github/workflows/pr-container-build.yaml +++ b/.github/workflows/pr-container-build.yaml @@ -125,9 +125,9 @@ jobs: # now copy images from local cache to quay, using 0.0.1-pr-123-f00cafe and 0.0.1-pr-123 tags for image in operator operator-bundle operator-catalog; do - podman push quay.io/rhdh/${image}:${VERSION} -q - skopeo --insecure-policy copy --all docker://quay.io/rhdh/${image}:${VERSION} docker://quay.io/rhdh/${image}:${VERSION} - skopeo --insecure-policy copy --all docker://quay.io/rhdh/${image}:${VERSION} docker://quay.io/rhdh/${image}:${VERSION%-*} + podman push quay.io/janus-idp/${image}:${VERSION} -q + skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${VERSION} + skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${VERSION%-*} done - name: Comment image links in PR # run this stage only if there are changes that match the includes and not the excludes @@ -139,5 +139,5 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: 'PR images are available:
  1. https://quay.io/rhdh/operator:${{ env.BASE_VERSION }}-pr-${{ github.event.number }}-${{ env.SHORT_SHA }}
  2. https://quay.io/rhdh/operator-bundle:${{ env.BASE_VERSION }}-pr-${{ github.event.number }}-${{ env.SHORT_SHA }}
  3. https://quay.io/rhdh/operator-catalog:${{ env.BASE_VERSION }}-pr-${{ github.event.number }}-${{ env.SHORT_SHA }}
' + body: 'PR images are available:
  1. https://quay.io/janus-idp/operator:${{ env.BASE_VERSION }}-pr-${{ github.event.number }}-${{ env.SHORT_SHA }}
  2. https://quay.io/janus-idp/operator-bundle:${{ env.BASE_VERSION }}-pr-${{ github.event.number }}-${{ env.SHORT_SHA }}
  3. https://quay.io/janus-idp/operator-catalog:${{ env.BASE_VERSION }}-pr-${{ github.event.number }}-${{ env.SHORT_SHA }}
' }) diff --git a/Makefile b/Makefile index 305bf4f4..656cb4a8 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) # This variable is used to construct full image tags for bundle and catalog images. # # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both -# redhat-developer/backstage-operator-bundle:$VERSION and redhat-developer/backstage-operator-catalog:$VERSION. +# quay.io/janus-idp/operator-bundle:$VERSION and quay.io/janus-idp/operator-catalog:$VERSION. IMAGE_TAG_BASE ?= quay.io/janus-idp/operator # BUNDLE_IMG defines the image:tag used for the bundle. diff --git a/PROJECT b/PROJECT index f962eabb..b119bbc8 100644 --- a/PROJECT +++ b/PROJECT @@ -5,7 +5,7 @@ plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} projectName: backstage-operator -repo: redhat-developer/backstage-operator +repo: redhat-developer/red-hat-developer-hub-operator resources: - api: crdVersion: v1 @@ -13,6 +13,6 @@ resources: controller: true domain: rhdh.redhat.com kind: Backstage - path: redhat-developer/backstage-operator/api/v1alpha1 + path: redhat-developer/red-hat-developer-hub-operator/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/controllers/backstage_app_config.go b/controllers/backstage_app_config.go index 741f5c2c..d96d3a50 100644 --- a/controllers/backstage_app_config.go +++ b/controllers/backstage_app_config.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/backstage_backend_auth.go b/controllers/backstage_backend_auth.go index 82abb3ac..6157a8d8 100644 --- a/controllers/backstage_backend_auth.go +++ b/controllers/backstage_backend_auth.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/backstage_controller.go b/controllers/backstage_controller.go index 536fdb25..2f05a96a 100644 --- a/controllers/backstage_controller.go +++ b/controllers/backstage_controller.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" diff --git a/controllers/backstage_controller_test.go b/controllers/backstage_controller_test.go index ba25e79b..e99c8f6e 100644 --- a/controllers/backstage_controller_test.go +++ b/controllers/backstage_controller_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/reconcile" - bsv1alpha1 "redhat-developer/backstage-operator/api/v1alpha1" + bsv1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" ) const ( diff --git a/controllers/backstage_deployment.go b/controllers/backstage_deployment.go index 85df8fd0..6a02d382 100644 --- a/controllers/backstage_deployment.go +++ b/controllers/backstage_deployment.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" ) const ( diff --git a/controllers/backstage_dynamic_plugins.go b/controllers/backstage_dynamic_plugins.go index 7ee4e6b5..defa3d5f 100644 --- a/controllers/backstage_dynamic_plugins.go +++ b/controllers/backstage_dynamic_plugins.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/backstage_extra_envs.go b/controllers/backstage_extra_envs.go index 6d86ec3b..c3c3eae5 100644 --- a/controllers/backstage_extra_envs.go +++ b/controllers/backstage_extra_envs.go @@ -15,7 +15,7 @@ package controller import ( - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/backstage_extra_files.go b/controllers/backstage_extra_files.go index 7cfd0949..74fc582d 100644 --- a/controllers/backstage_extra_files.go +++ b/controllers/backstage_extra_files.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/backstage_route.go b/controllers/backstage_route.go index 70fe53a9..617586c6 100644 --- a/controllers/backstage_route.go +++ b/controllers/backstage_route.go @@ -21,7 +21,7 @@ import ( "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" openshift "github.com/openshift/api/route/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/backstage_service.go b/controllers/backstage_service.go index af533526..4d917c5f 100644 --- a/controllers/backstage_service.go +++ b/controllers/backstage_service.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/local_db_secret.go b/controllers/local_db_secret.go index 2b4c4d3e..acc14e6b 100644 --- a/controllers/local_db_secret.go +++ b/controllers/local_db_secret.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" ) const ( diff --git a/controllers/local_db_services.go b/controllers/local_db_services.go index 44909e02..0b5fd63f 100644 --- a/controllers/local_db_services.go +++ b/controllers/local_db_services.go @@ -19,7 +19,7 @@ import ( "context" "fmt" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/local_db_statefulset.go b/controllers/local_db_statefulset.go index 27e2e177..afb47afc 100644 --- a/controllers/local_db_statefulset.go +++ b/controllers/local_db_statefulset.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" ) const ( diff --git a/controllers/local_db_storage.go b/controllers/local_db_storage.go index 497cc967..2825e60e 100644 --- a/controllers/local_db_storage.go +++ b/controllers/local_db_storage.go @@ -19,7 +19,7 @@ import ( "context" "fmt" - bs "redhat-developer/backstage-operator/api/v1alpha1" + bs "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/suite_test.go b/controllers/suite_test.go index d076b98b..3c4e4039 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -30,7 +30,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - backstageiov1alpha1 "redhat-developer/backstage-operator/api/v1alpha1" + backstageiov1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/go.mod b/go.mod index 45157f11..2335bfda 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module redhat-developer/backstage-operator +module redhat-developer/red-hat-developer-hub-operator go 1.20 diff --git a/main.go b/main.go index 91087622..c1bc1ebb 100644 --- a/main.go +++ b/main.go @@ -32,8 +32,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - backstageiov1alpha1 "redhat-developer/backstage-operator/api/v1alpha1" - controller "redhat-developer/backstage-operator/controllers" + backstageiov1alpha1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha1" + controller "redhat-developer/red-hat-developer-hub-operator/controllers" openshift "github.com/openshift/api/route/v1" //+kubebuilder:scaffold:imports