diff --git a/.github/workflows/build-push-images.yml b/.github/workflows/build-push-images.yml deleted file mode 100644 index 9bafe16c7..000000000 --- a/.github/workflows/build-push-images.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Build and push images - -on: - push: - branches: - - main - workflow_dispatch: - -jobs: - build_push: - runs-on: ubuntu-latest - env: - REGISTRY: quay.io - # Set tag to the last commit sha on main branch, otherwise tag will be the branch name - MIGRATION_PLANNER_IMAGE_TAG: ${{ (github.head_ref||github.ref_name)=='main' && github.sha || (github.head_ref||github.ref_name) }} - REGISTRY_ORG: kubev2v - steps: - - name: Checkout forklift - uses: actions/checkout@v4 - - - name: Login to quay.io with bot account - uses: docker/login-action@v3 - with: - registry: quay.io - username: ${{ secrets.QUAY_USERNAME }} - password: ${{ secrets.QUAY_TOKEN }} - - - name: Build and push images to quay.io - run: | - cd ${GITHUB_WORKSPACE} - make build-containers MIGRATION_PLANNER_IMAGE_TAG=latest - make build-containers MIGRATION_PLANNER_IMAGE_TAG=$MIGRATION_PLANNER_IMAGE_TAG LABEL="quay.expires-after=10d" - make push-containers MIGRATION_PLANNER_IMAGE_TAG=latest - make push-containers MIGRATION_PLANNER_IMAGE_TAG=$MIGRATION_PLANNER_IMAGE_TAG LABEL="quay.expires-after=10d" diff --git a/Makefile b/Makefile index 19a3a858c..7ed396057 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ GO_CACHE := -v $${HOME}/go/migration-planner-go-cache:/opt/app-root/src/go:Z -v TIMEOUT ?= 30m VERBOSE ?= false REGISTRY ?= quay.io -REGISTRY_ORG ?= kubev2v +REGISTRY_ORG ?= redhat-user-workloads/assisted-migration-tenant MIGRATION_PLANNER_IMAGE_TAG ?= latest MIGRATION_PLANNER_IMAGE_TAG := $(MIGRATION_PLANNER_IMAGE_TAG)$(if $(DEBUG_MODE),-debug) MIGRATION_PLANNER_AGENT_IMAGE ?= $(REGISTRY)/$(REGISTRY_ORG)/migration-planner-agent diff --git a/data/ignition.template b/data/ignition.template index 1b8b48875..d7d247c59 100644 --- a/data/ignition.template +++ b/data/ignition.template @@ -119,7 +119,7 @@ storage: fi if [ -f $IMAGE_STORAGE/migration-planner-agent ]; then - skopeo copy oci-archive:$IMAGE_STORAGE/migration-planner-agent containers-storage:quay.io/kubev2v/migration-planner-agent:latest + skopeo copy oci-archive:$IMAGE_STORAGE/migration-planner-agent containers-storage:quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent:latest fi if [ -f $IMAGE_STORAGE/forklift-validation ]; then skopeo copy oci-archive:$IMAGE_STORAGE/forklift-validation containers-storage:quay.io/kubev2v/forklift-validation:release-v2.6.4 diff --git a/doc/cli.md b/doc/cli.md index 10e79e8a2..d4ce566e1 100644 --- a/doc/cli.md +++ b/doc/cli.md @@ -79,7 +79,7 @@ The user must suply the source-id as required argument. The optional flags are: ```bash Flags: - --agent-image-url string Quay url of the agent's image. Defaults to quay.io/kubev2v/migration-planner-agent:latest (default "quay.io/kubev2v/migration-planner-agent:latest") + --agent-image-url string Quay url of the agent's image. Defaults to quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent:latest (default "quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent:latest") -h, --help help for generate --http-proxy string Url of HTTP_PROXY --https-proxy string Url of HTTPS_PROXY @@ -165,4 +165,4 @@ Generate a jwt to be used when local authentication is set. ```bash $ planner sso token --private-key $private_key --username admin --org admin -``` \ No newline at end of file +``` diff --git a/doc/deployment.md b/doc/deployment.md index 82afcea22..fb808d6be 100644 --- a/doc/deployment.md +++ b/doc/deployment.md @@ -2,7 +2,7 @@ This project provides YAML template files for deploying the **Assisted Migration Service** on OpenShift. This document outlines the deployment process. -By default, images are deployed from the `quay.io/kubev2v` namespace. New images are built and pushed to Quay after each PR is merged into this repository. +By default, images are deployed from the `quay.io/redhat-user-workloads/assisted-migration-tenant` namespace. New images are built and pushed to Quay after each PR is merged into this repository. ### Notice This deployment also includes the **UI** and uses the following template: @@ -24,10 +24,10 @@ oc new-project assisted-migration ### 2. Configure Deployment (Optional) You can override the default image sources by exporting the following environment variables before deployment: ```sh -export MIGRATION_PLANNER_API_IMAGE= # Default: quay.io/kubev2v/migration-planner-api -export MIGRATION_PLANNER_AGENT_IMAGE= # Default: quay.io/kubev2v/migration-planner-agent +export MIGRATION_PLANNER_API_IMAGE= # Default: quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-api +export MIGRATION_PLANNER_AGENT_IMAGE= # Default: quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent export MIGRATION_PLANNER_IMAGE_TAG= # Default: latest -export MIGRATION_PLANNER_UI_IMAGE= # Default: quay.io/kubev2v/migration-planner-ui +export MIGRATION_PLANNER_UI_IMAGE= # Default: quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-ui export MIGRATION_PLANNER_UI_IMAGE_TAG= # Default: latest export MIGRATION_PLANNER_REPLICAS= # Default: 1 ``` diff --git a/doc/githubworkflows.md b/doc/githubworkflows.md index 8e25e87c4..328c088e6 100644 --- a/doc/githubworkflows.md +++ b/doc/githubworkflows.md @@ -37,10 +37,10 @@ Customizing the repository destination for the UI image follows similar steps to First, create dedicated repositories in your Quay environment that will replace the destination for the `migration-planner-agent` and `migration-planner-api` images. The replacements will be as follows: -- **Old Destination**: `quay.io/kubev2v/migration-planner-agent` +- **Old Destination**: `quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent` **New Destination**: `quay.io//migration-planner-agent` -- **Old Destination**: `quay.io/kubev2v/migration-planner-api` +- **Old Destination**: `quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-api` **New Destination**: `quay.io//migration-planner-api` 2. Create a Quay Bot Account @@ -62,8 +62,8 @@ To ensure that the workflow pushes the images to your custom Quay repositories, Before modification, the `Makefile` contains: - `MIGRATION_PLANNER_AGENT_IMAGE ?= quay.io/kubev2v/migration-planner-agent` - `MIGRATION_PLANNER_API_IMAGE ?= quay.io/kubev2v/migration-planner-api` + `MIGRATION_PLANNER_AGENT_IMAGE ?= quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent` + `MIGRATION_PLANNER_API_IMAGE ?= quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-api` After modification, update the repository destination to your custom Quay repositories: @@ -228,4 +228,4 @@ The agent’s full journal output is printed to the Ginkgo test output (DumpLogs The system automatically calls AfterFailed() to trigger log dumping. ---- \ No newline at end of file +--- diff --git a/doc/troubleshooting.md b/doc/troubleshooting.md index 272b7ed7f..367405689 100644 --- a/doc/troubleshooting.md +++ b/doc/troubleshooting.md @@ -45,7 +45,7 @@ Expected output should be similar to: ``` | CONTAINER ID | IMAGE | COMMAND | CREATED | STATUS | PORTS | NAMES | | cc0a71a37c1b | quay.io/kubev2v/forklift-validation:release-v2.6.4 | run --server /usr... | 2 minutes ago | Up 31 minutes | | opa | -| 70ad0a7cbdc5 | quay.io/kubev2v/migration-planner-agent:latest | -config /agent/co... | 2 minutes ago | Up 31 minutes | | planner-agent | +| 70ad0a7cbdc5 | quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent:latest | -config /agent/co... | 2 minutes ago | Up 31 minutes | | planner-agent | ``` **Note:** If only the OPA is not running, you should still be able to use the agent and view the final report. However, diff --git a/internal/cli/generate.go b/internal/cli/generate.go index 36ba184ef..604c22fb8 100644 --- a/internal/cli/generate.go +++ b/internal/cli/generate.go @@ -28,7 +28,7 @@ func DefaultGenerateOptions() *GenerateOptions { return &GenerateOptions{ GlobalOptions: DefaultGlobalOptions(), ImageType: "ova", - AgentImageURL: "quay.io/kubev2v/migration-planner-agent:latest", + AgentImageURL: "quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent:latest", } } @@ -101,7 +101,7 @@ func (o *GenerateOptions) Bind(fs *pflag.FlagSet) { o.GlobalOptions.Bind(fs) fs.StringVarP(&o.ImageType, "image-type", "", "ova", "Type of the image. Only accepts ova and iso") - fs.StringVarP(&o.AgentImageURL, "agent-image-url", "", "quay.io/kubev2v/migration-planner-agent:latest", "Quay url of the agent's image. Defaults to quay.io/kubev2v/migration-planner-agent:latest") + fs.StringVarP(&o.AgentImageURL, "agent-image-url", "", "quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent:latest", "Quay url of the agent's image. Defaults to quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent:latest") fs.StringVarP(&o.OutputImageFilePath, "output-file", "", "", "Output image file path") fs.StringVarP(&o.HttpProxyUrl, "http-proxy", "", "", "Url of HTTP_PROXY") fs.StringVarP(&o.HttpsProxyUrl, "https-proxy", "", "", "Url of HTTPS_PROXY") diff --git a/internal/image/builder.go b/internal/image/builder.go index 94c8b9771..663a3b09b 100644 --- a/internal/image/builder.go +++ b/internal/image/builder.go @@ -32,7 +32,7 @@ const ( ) const ( - defaultAgentImage = "quay.io/kubev2v/migration-planner-agent" + defaultAgentImage = "quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent" defaultPlannerService = "http://127.0.0.1:7443" defaultPersistenceDiskDevice = "/dev/sda" defaultConfigServerUI = "http://localhost:3000/migrate/wizard"