Skip to content
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.

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

Separate Makefile targets for local vs containerized #3816

Merged

Conversation

SudoBrendan
Copy link
Collaborator

@SudoBrendan SudoBrendan commented Sep 3, 2024

Which issue this PR addresses:

Fixes feedback/concerns raised by the wider ARO team.

Loki is committed to enhancing our build and release process by moving local testing and validation closer to a production-like state. While we believe this approach will effectively address current issues, we respect individual preferences and will not mandate its use. Loki will continue to elevate our CI and containerized builds, ensuring top-tier local execution. Our CI/CD roadmap will continue to focus on containerized builds and validation for both PR validation and production builds, because our current architecture runs containers in production as defined in these build processes.

TL;DR - you now need to opt into the new, containerized build process locally. There is a clear distinction and naming consistency between local binary and containerized build/execution. Use whatever you feel is best locally.

What this PR does / why we need it:

Provides flexibility in local development - you can now opt into containerized build/run commands. Old commands are 100% reverted.

Test plan for issue:

Only affects local.

Is there any documentation that needs to be updated for this PR?

Yes, included in the PR.

How do you know this will function as expected in production?

N/A

tsatam
tsatam previously approved these changes Sep 3, 2024
@SudoBrendan
Copy link
Collaborator Author

/azp run ci,e2e

@SudoBrendan SudoBrendan marked this pull request as ready for review September 3, 2024 17:10
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@SudoBrendan SudoBrendan changed the title WIP: Separate Makefile targets Separate Makefile targets for local vs containerized Sep 3, 2024
@SudoBrendan SudoBrendan force-pushed the sudobrendan/hotfix-makefile-containerization-is-additive branch from bbdff5e to b976982 Compare September 3, 2024 17:15
@SudoBrendan
Copy link
Collaborator Author

/azp run ci,e2e

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

Copy link

github-actions bot commented Sep 3, 2024

Please rebase pull request.

@github-actions github-actions bot added needs-rebase branch needs a rebase and removed ready-for-review labels Sep 3, 2024
- reverts changes to runlocal-rp
- updates old run-portal to runlocal-portal since it uses local bins
- adds new targets for containerized run of RP and Portal; opt-in
- fixes docs and pipelines to use updated targets
@SudoBrendan SudoBrendan force-pushed the sudobrendan/hotfix-makefile-containerization-is-additive branch from b976982 to 05d2e0b Compare September 3, 2024 17:56
@github-actions github-actions bot removed the needs-rebase branch needs a rebase label Sep 3, 2024
@SudoBrendan
Copy link
Collaborator Author

/azp run ci,e2e

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

Copy link
Contributor

@jhoreman jhoreman left a comment

Choose a reason for hiding this comment

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

Approved, thanks for this.

@tsatam tsatam merged commit 0c5b8e6 into master Sep 4, 2024
24 checks passed
@SudoBrendan SudoBrendan deleted the sudobrendan/hotfix-makefile-containerization-is-additive branch September 4, 2024 20:14
gouthamMN pushed a commit that referenced this pull request Sep 10, 2024
update makfile to use go 1.23

update docs

bump gotestsum to 1.12.0

bump golangci-lint to 1.59.1

use the fips compliant golang image

generate a secret for the operator from workload identity

Update pkg/operator/deploy/deploy.go

Co-authored-by: Ayato Tokubi <[email protected]>

get subscription info from the subscription doc rather than env

test the operator identity secret generation code properly

Fixed  to correctly reference the local  image, preventing unauthorized Docker Hub pulls.

Align docs hierarchy

Indent bullet points

Copy fluentbit image from arointsvc ACR to your ACR

It is needed since it is compared against a default image (and digest) from const file

ARO-9570: Add a controller to the ARO operator to lay down etchosts machine config

ARO-9570: Update controller to watch MCP and ARO Cluster object

ARO-9750: Add a controller to create the etchosts machineconfigs if they dont exist

Fix linting

Add licenses

bump golangci-lint to v1.60.3 and exclude printf, SA1006 and S1009 from lint

update golangci-lint version

use non fips golang image

use go 1.22

bump go in ci

add git to dockerignore

set buildvcs to false

upgrade to go 1.22.6

update docs

fix go lint

address comments

remove commented code from onebranch pipelines file

change var to const

fix unit-tests and api cloudError

This is the new CI-RP stage for the pipline (#3768)

* This is the new CI-RP stage for the pipline (#3753)

* Ensure Podman Service is Started and PODMAN_REMOTE_ARGS is Configured Automatically

Ensure Podman Service is Started and PODMAN_REMOTE_ARGS is Configured Automatically

Ensure Podman Service is Started and PODMAN_REMOTE_ARGS is Configured Automatically

removed the tag

Add Podman service start and remote args setup for seamless operation

Add sudo to start Podman service for elevated permissions and fix permission errors

Add sudo to start Podman service for elevated permissions and fix permission errors

Refactor Makefile: Update Podman service handling with sudo and remove default PODMAN_REMOTE_ARGS to improve flexibility and ensure proper permissions.

Add sudo to start Podman service for elevated permissions and fix permission errors

* Added Podman service target and set PODMAN_REMOTE_ARGS for seamless builds.

* fix the makefile

* added the port to fix the Makefile

Add smoke test for alerts from Alertmanager (#3801)

Move ARM swagger to subfolder (#3805)

To add new HCP RP, the ARO RP is moved into the subfolder openshiftclusters.

There are no additional changes, no impact on the SDK and clients.

Add the old make runlocal-rp as an alternative to containerization (#3789)

Add smoke test documents (#3813)

Adding Ayato to CODEOWNERS

Fix make ci-clean and runlocal-rp (#3806)

* Fix make ci-clean error for running work containers by buildah that prevents prune from working
* Fix make runlocal-rp image syntax

Upgrade to Podman 5 to fix the vuln

Install required binary for Podman 5 in ci

Switch back to OneBranch build image

Install crun

Install more OCI packages

Change home dir to /tmp for podman

see containers/podman#23818
for more details.

Use sudo for tdnf

bump golangci-lint version in dockerfile ci-rp

add go flags

update go ver in ci.yml

update test

Correct testing/time issues in pkg/deploy (#3808)

- Percolate up the time to wait for LB healthcheck probes, test @ 0 sec
- Correct a context timeout test case, test @ 0 sec timeout

Fix slow tests in /pkg/backend (#3809)

Fix slow tests in /pkg/frontend (#3810)

* Clarifying etcd cert renew test

- Updated the test to make it clear it is passing because timeout is being reached
- Updated the timeout from 10s -> 0s to pass faster

* Fix slow changefeed tests

Generate smaller OIDC keys for unit tests (#3811)

- significantly increases unit test performance by moving from 4096 -> 256 bit keys
- preserves 4096 bit keys for all non-testing scenarios

Make CI-RP Improvements (#3791)

- Remove linting from ci-rp
- Remove generate from ci-rp

Set CGO_ENABLED

update test command in ci-rp dockerfile

Separate Makefile targets for local vs containers (#3816)

- reverts changes to runlocal-rp
- updates old run-portal to runlocal-portal since it uses local bins
- adds new targets for containerized run of RP and Portal; opt-in
- fixes docs and pipelines to use updated targets

Drop some unneccessary dependencies by moving to `bingo` for tooling (#3719)

* Move to using bingo for tools
* go mod vendor

[MIMO] Move cluster certificate functionality to ClientHelper (#3736)

* move over TLS applying, as well as some clienthelper work

bump go in bingo

merge makefile changes from Master

more Makefile updates

add GO var in toplevel Makefile
edisonLcardenas pushed a commit that referenced this pull request Sep 16, 2024
- reverts changes to runlocal-rp
- updates old run-portal to runlocal-portal since it uses local bins
- adds new targets for containerized run of RP and Portal; opt-in
- fixes docs and pipelines to use updated targets
edisonLcardenas pushed a commit that referenced this pull request Sep 17, 2024
- reverts changes to runlocal-rp
- updates old run-portal to runlocal-portal since it uses local bins
- adds new targets for containerized run of RP and Portal; opt-in
- fixes docs and pipelines to use updated targets
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants