Remove multi target build #1259

SimonBaeumer · 2023-09-13T14:31:19Z

Description

Clean up multi-target builds.
I've never used the multi-target debug builds, proposing here to remove them to reduce Makefile and Dockerfile complexities.

This PR:

Remove multi-target capabilities
Rename Dockerfile.hybrid to Dockerfile.local
Remove debug and build-debug targets from Probe and Fleet-Manager Dockerfiles
Rename build-standard and to build
Rename Makefile targets
- image/build/multi-target/probe to image/build/probe
- image/build/multi-target/fleet-manage to image/build/fleet-manager
Remove DEBUG_PODS env var from dev scripts

Checklist (Definition of Done)

Unit and integration tests added
Added test description under Test manual
Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
CI and all relevant tests are passing
Add the ticket number to the PR title if available, i.e. ROX-12345: ...
Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.
Add secret to app-interface Vault or Secrets Manager if necessary
RDS changes were e2e tested manually
Check AWS limits are reasonable for changes provisioning new resources

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup OCM_OFFLINE_TOKEN=<ocm-offline-token> OCM_ENV=development
make verify lint binary test test/integration

vladbologa

I'm still having problems running the scripts. Can you please check that make deploy/dev works for you?

For me it times out waiting for fleet-manager to start:

2023-09-19T11:20:58,N:z Waiting for container fleet-manager within pod application=fleet-manager in namespace acsms to appear...
2023-09-19T11:23:08,N:z Timed out waiting for container fleet-manager to appear for pod application=fleet-manager in namespace acsms
make: *** [deploy/dev] Error 1

Makefile

dev/env/scripts/docker.sh

Makefile

openshift-ci · 2023-09-22T08:46:28Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kovayur, SimonBaeumer, vladbologa

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [SimonBaeumer,kovayur,vladbologa]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

* Use Openshift golang-1.20 builder image (#1275) * Add kind cluster type (#1256) * Refactor operator config to use field.Error (#1276) * fix typo causing skip of DNS creation on restore (#1277) * ROX-19718: Add flag for fleetmanager gitops (#1283) * Specify reconcile interval in workers (#1265) * Add request body to rotate-secrets endpoint (#1272) * Disable automounting for egress proxy (#1286) * ROX-19808: Remove GitOps admin handler (#1290) Remove GitOps admin handler * ROX-19692: Add a release preparation workflow. (#1284) Prepare release workflow. * ROX-19735 - add operator configs to gitops (#1278) * ROX-19692: New workflow to auto-create production merge PRs. (#1291) New workflow to auto-create production merge PRs. * ROX-19810: Bump controller-runtime and stackrox deps (#1292) * Bump controller-runtime and stackrox deps * Bump openshift/api * Call /current_account before reserving quota (#1289) * Remove multi target build (#1259) * fixed restore endpoint (#1298) * ROX-19281: Fix nil pointer dereference in E2E tests when Central is not ready (#1216) * Rename ACSMS -> ACSCS in dev scripts (#1252) * Log result of current_account call execution (#1297) * Cleanup errors.go (#1299) --------- Co-authored-by: Vlad Bologa <[email protected]> Co-authored-by: Simon Bäumer <[email protected]> Co-authored-by: Johannes Malsam <[email protected]> Co-authored-by: Ludovic Cleroux <[email protected]> Co-authored-by: Ivan Degtiarenko <[email protected]> Co-authored-by: Alex Rukletsov <[email protected]> Co-authored-by: Marcin Owsiany <[email protected]> Co-authored-by: Aleksandr Kurlov <[email protected]> Co-authored-by: Yury Kovalev <[email protected]>

SimonBaeumer temporarily deployed to development September 13, 2023 14:31 — with GitHub Actions Inactive

openshift-ci bot added the approved label Sep 13, 2023

SimonBaeumer temporarily deployed to development September 14, 2023 07:43 — with GitHub Actions Inactive

SimonBaeumer requested a review from stehessel September 14, 2023 07:43

SimonBaeumer changed the base branch from main to sb/remove-local-bui September 14, 2023 07:48

SimonBaeumer requested review from kurlov and vladbologa September 14, 2023 07:51

SimonBaeumer force-pushed the sb/remove-local-bui branch from 16cda9b to 3c63869 Compare September 14, 2023 09:21

Base automatically changed from sb/remove-local-bui to main September 14, 2023 10:21

openshift-merge-robot added the needs-rebase label Sep 14, 2023

SimonBaeumer force-pushed the sb/remove-multi-target-build branch from 88568e4 to fb7c858 Compare September 14, 2023 10:24

SimonBaeumer temporarily deployed to development September 14, 2023 10:24 — with GitHub Actions Inactive

openshift-merge-robot removed the needs-rebase label Sep 14, 2023

SimonBaeumer temporarily deployed to development September 14, 2023 10:28 — with GitHub Actions Inactive

SimonBaeumer requested a review from kovayur September 14, 2023 13:05

kovayur approved these changes Sep 18, 2023

View reviewed changes

openshift-ci bot assigned kovayur Sep 18, 2023

openshift-ci bot added lgtm and removed lgtm labels Sep 18, 2023

SimonBaeumer temporarily deployed to development September 18, 2023 09:38 — with GitHub Actions Inactive

SimonBaeumer temporarily deployed to development September 19, 2023 08:40 — with GitHub Actions Inactive

WIP

3275147

SimonBaeumer temporarily deployed to development September 19, 2023 08:41 — with GitHub Actions Inactive

SimonBaeumer requested a review from vladbologa September 19, 2023 09:24

vladbologa requested changes Sep 19, 2023

View reviewed changes

Makefile Outdated Show resolved Hide resolved

dev/env/scripts/docker.sh Outdated Show resolved Hide resolved

use local builds

7efadce

SimonBaeumer temporarily deployed to development September 19, 2023 11:59 — with GitHub Actions Inactive

vladbologa requested changes Sep 19, 2023

View reviewed changes

Makefile Show resolved Hide resolved

fix GOOS in Makefile

6aeedda

SimonBaeumer requested a review from vladbologa September 21, 2023 13:27

SimonBaeumer temporarily deployed to development September 21, 2023 13:27 — with GitHub Actions Inactive

vladbologa requested changes Sep 21, 2023

View reviewed changes

Makefile Outdated Show resolved Hide resolved

Fix

5446266

SimonBaeumer temporarily deployed to development September 22, 2023 08:09 — with GitHub Actions Inactive

SimonBaeumer requested a review from vladbologa September 22, 2023 08:09

vladbologa approved these changes Sep 22, 2023

View reviewed changes

openshift-ci bot added the lgtm label Sep 22, 2023

SimonBaeumer merged commit e10a3d7 into main Sep 22, 2023
5 checks passed

SimonBaeumer deleted the sb/remove-multi-target-build branch September 22, 2023 09:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove multi target build #1259

Remove multi target build #1259

SimonBaeumer commented Sep 13, 2023 •

edited

Loading

vladbologa left a comment

openshift-ci bot commented Sep 22, 2023

Remove multi target build #1259

Remove multi target build #1259

Conversation

SimonBaeumer commented Sep 13, 2023 • edited Loading

Description

Checklist (Definition of Done)

Test manual

vladbologa left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Sep 22, 2023

SimonBaeumer commented Sep 13, 2023 •

edited

Loading