Skip to content

[WIP] NO-JIRA | ci: remove "kubev2v" registry, use "redhat-user-workloads/assisted-migration-tenant" instead #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nirarg wants to merge 1 commit into from
Closed

[WIP] NO-JIRA | ci: remove "kubev2v" registry, use "redhat-user-workloads/assisted-migration-tenant" instead #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions .github/workflows/build-push-images.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

@coderabbitai coderabbitai bot Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Registry org change: confirm repo and creds exist in new namespace

Switching to redhat-user-workloads/assisted-migration-tenant looks fine. Please verify:

  • The repositories for migration-planner-agent and migration-planner-api exist under this org and you have push rights.
  • Any docs/automation that referenced kubev2v are updated accordingly (since the build/push workflow was removed).

Run to spot leftovers:

🏁 Script executed:

#!/bin/bash
# Find old registry/org references and deleted workflow remnants
rg -nPI 'kubev2v|quay\.io/kubev2v' -g '!*vendor*'
rg -nPI '\.github/workflows/build-push-images\.yml|Build and push images'

Length of output: 26888

🏁 Script executed:

#!/bin/bash
# Locate file paths for hardcoded quay.io/kubev2v references
rg -nH 'defaultAgentImage' || true
rg -nH 'skopeo copy.*quay\.io/kubev2v' || true

Length of output: 634

Registry org change: update remaining quay.io/kubev2v references

We’ve confirmed that two hard-coded quay.io/kubev2v paths remain and must be updated to use the new $(REGISTRY_ORG) (i.e. redhat-user-workloads/assisted-migration-tenant):

  • internal/image/builder.go:
    • Line 35: defaultAgentImage = "quay.io/kubev2v/migration-planner-agent"
      → should be $(REGISTRY_ORG)/migration-planner-agent instead of the quay.io path.
  • data/ignition.template:
    • Lines 122 & 125: skopeo copy commands targeting
      containers-storage:quay.io/kubev2v/migration-planner-agent:latest (and the forklift-validation image)
      → these should reference $(REGISTRY_ORG)/migration-planner-agent:latest (and, if applicable, the new org for forklift-validation).

Next steps:

  • Update those constants/templates to use $(REGISTRY_ORG)
  • Ensure the migration-planner-agent and migration-planner-api repos exist under redhat-user-workloads/assisted-migration-tenant and that you have push rights.
  • Scan docs and automation for any other quay.io/kubev2v references and update accordingly.
🤖 Prompt for AI Agents 
In Makefile line 10 and related files: internal/image/builder.go line 35 and
data/ignition.template lines 122 and 125, there are remaining hard-coded
quay.io/kubev2v paths that must be replaced with the new REGISTRY_ORG variable;
update internal/image/builder.go to construct defaultAgentImage as
"$(REGISTRY_ORG)/migration-planner-agent" (or use the existing Go build-time var
pattern), and update the skopeo copy lines in data/ignition.template to
reference "$(REGISTRY_ORG)/migration-planner-agent:latest" (and the equivalent
for forklift-validation) instead of containers-storage:quay.io/..., then verify
the migration-planner-agent and migration-planner-api repos exist under
redhat-user-workloads/assisted-migration-tenant and you have push rights, and
finally scan docs/automation for any other quay.io/kubev2v occurrences and
replace them with $(REGISTRY_ORG).

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
Expand Down
2 changes: 1 addition & 1 deletion data/ignition.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/cli.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
```
```
8 changes: 4 additions & 4 deletions doc/deployment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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=<api_image_source> # Default: quay.io/kubev2v/migration-planner-api
export MIGRATION_PLANNER_AGENT_IMAGE=<agent_image_source> # Default: quay.io/kubev2v/migration-planner-agent
export MIGRATION_PLANNER_API_IMAGE=<api_image_source> # Default: quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-api
export MIGRATION_PLANNER_AGENT_IMAGE=<agent_image_source> # Default: quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-agent
export MIGRATION_PLANNER_IMAGE_TAG=<agent_and_api_image_tag> # Default: latest
export MIGRATION_PLANNER_UI_IMAGE=<ui_image_source> # Default: quay.io/kubev2v/migration-planner-ui
export MIGRATION_PLANNER_UI_IMAGE=<ui_image_source> # Default: quay.io/redhat-user-workloads/assisted-migration-tenant/migration-planner-ui
export MIGRATION_PLANNER_UI_IMAGE_TAG=<ui_image_tag> # Default: latest
export MIGRATION_PLANNER_REPLICAS=<replica_count> # Default: 1
```
Expand Down
10 changes: 5 additions & 5 deletions doc/githubworkflows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/<YOUR-QUAY-USERNAME>/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/<YOUR-QUAY-USERNAME>/migration-planner-api`

2. Create a Quay Bot Account
Expand All @@ -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`
Comment on lines +65 to +66
Copy link

@coderabbitai coderabbitai bot Sep 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Section likely stale: workflow was removed in this PR.

This whole “build-push-images.yml” section documents a workflow that no longer exists. Either mark it as deprecated with the removal date (Aug 27, 2025) and point to the new process, or remove the section.

If keeping the section for historical context, prepend a banner:

+# Note: The `build-push-images.yml` workflow was removed on 2025-08-27.
+# The instructions below are deprecated; see current release/publish docs or .github/workflows.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
`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`
# Note: The `build-push-images.yml` workflow was removed on 2025-08-27.
# The instructions below are deprecated; see current release/publish docs or .github/workflows.
`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`
🤖 Prompt for AI Agents 
In doc/githubworkflows.md around lines 65-66, the "build-push-images.yml"
workflow section is stale because the workflow was removed in this PR; either
remove the entire section referencing MIGRATION_PLANNER_AGENT_IMAGE and
MIGRATION_PLANNER_API_IMAGE, or mark it explicitly as deprecated by prepending a
short banner that states "Deprecated (removed Aug 27, 2025)" and add one
sentence pointing readers to the new build/push process (include the new
workflow file or docs link and any changed variables), and update or remove the
two image variable lines accordingly so the doc no longer advertises an obsolete
workflow.


After modification, update the repository destination to your custom Quay repositories:

Expand Down Expand Up @@ -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.

---
---
2 changes: 1 addition & 1 deletion doc/troubleshooting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
}

Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion internal/image/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down