OSSM-742 Improve Maistra container images build by bmangoen · Pull Request #534 · maistra/istio

bmangoen · 2022-06-10T14:14:27Z

Please provide a description of this PR:

With this change, it will be possible to build and push the Maistra container images with make targets.

Example: make HUB=quay.io/my_example_repository push.maistra-image.pilot will build and push the Maistra Pilot container image to quay.io/my_example_repository

Each component has now its specific Dockerfile which uses a CentOS base image (instead of other linux distribution)
Container images get labels at build time

To help us figure out who should review this PR, please put an X in all the areas that this PR affects.

Please check any characteristics that apply to this pull request.

Does not have any user-facing changes. This may include CLI changes, API changes, behavior changes, performance improvements, etc.

jwendell

Can we make this simpler by having all labels and stuff directly in the dockerfiles?

Also, can we have all dockerfiles in the same dir (e.g., under maistra dir)?

maistra.mk

jwendell · 2022-06-27T14:53:38Z

maistra.mk

+	$(MAISTRA_IMAGE_RULE)
+
+.PHONY: maistra-image.proxy
+maistra-image.proxy: BUILD_PRE=&& chmod 644 envoy_bootstrap.json gcp_envoy_bootstrap.json


we should perhaps add something like

maistra-image.proxy: VERSION=${MAISTRA_VERSION}

on the very beginning of these dependencies so that we get the right version in the output of <binary> version subcommand. Example:

Before:

docker run --rm -it quay.io/jwendell/proxy:2.2.0 version version.BuildInfo{Version:"1.12-dev", GitRevision:"c30e9344bb503d749f9936e82b39706ed9d54730", GolangVersion:"go1.17.9", BuildStatus:"Clean", GitTag:"1.12.6-113-gc30e9344bb"}

After:

$ docker run --rm -it quay.io/jwendell/proxy:2.2.0 version version.BuildInfo{Version:"2.2.0", GitRevision:"c30e9344bb503d749f9936e82b39706ed9d54730-dirty", GolangVersion:"go1.17.9", BuildStatus:"Modified", GitTag:"1.12.6-113-gc30e9344bb"}

Same to pilot and cni.

$ docker run --rm -it quay.io/bmangoen/pilot-ubi8:2.2.0 version version.BuildInfo{Version:"2.2.0", GitRevision:"69a592bccfa1bb3c620286a8840db4c51dcdf2ab-dirty", GolangVersion:"go1.17.9", BuildStatus:"Modified", GitTag:"1.7.0-alpha.0-4267-g69a592bccf"} $ docker run --rm -it quay.io/bmangoen/istio-cni-ubi8:2.2.0 install-cni version version.BuildInfo{Version:"2.2.0", GitRevision:"69a592bccfa1bb3c620286a8840db4c51dcdf2ab-dirty", GolangVersion:"go1.17.9", BuildStatus:"Modified", GitTag:"1.7.0-alpha.0-4267-g69a592bccf"} $ docker run --rm -it quay.io/bmangoen/proxyv2-ubi8:2.2.0 version version.BuildInfo{Version:"2.2.0", GitRevision:"69a592bccfa1bb3c620286a8840db4c51dcdf2ab-dirty", GolangVersion:"go1.17.9", BuildStatus:"Modified", GitTag:"1.7.0-alpha.0-4267-g69a592bccf"}

maistra.mk

bmangoen · 2022-07-05T07:50:18Z

/retest

dgn · 2022-07-05T09:37:47Z

/retest

maistra-bot · 2022-08-04T16:32:09Z

In response to a cherrypick label: #534 failed to apply on top of branch "maistra-2.3":

Applying: OSSM-742 Improve Maistra container images build
.git/rebase-apply/patch:46: trailing whitespace.
# This target will set BUILD_LABELS variable 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	maistra.mk
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): maistra.mk deleted in HEAD and modified in OSSM-742 Improve Maistra container images build. Version OSSM-742 Improve Maistra container images build of maistra.mk left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSSM-742 Improve Maistra container images build
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

maistra-bot · 2022-08-25T09:37:08Z

In response to a cherrypick label: #534 failed to apply on top of branch "maistra-2.3":

Applying: OSSM-742 Improve Maistra container images build
.git/rebase-apply/patch:46: trailing whitespace.
# This target will set BUILD_LABELS variable 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	maistra.mk
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): maistra.mk deleted in HEAD and modified in OSSM-742 Improve Maistra container images build. Version OSSM-742 Improve Maistra container images build of maistra.mk left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSSM-742 Improve Maistra container images build
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

* OSSM-742 Improve Maistra container images build * Simplify make rules and Dockerfiles * Fix dockerfiles lint issues * Reorganize files and apply image naming convention * Update MAISTRA_VERSION and ISTIO_VERSION

* OSSM-742 Improve Maistra container images build (#534) * OSSM-742 Improve Maistra container images build * Simplify make rules and Dockerfiles * Fix dockerfiles lint issues * Reorganize files and apply image naming convention * Update MAISTRA_VERSION and ISTIO_VERSION * Adapt images builds relying on upstream build tool * Add copyright and license into scripts

* OSSM-742 Improve Maistra container images build (for maistra-2.3) (#606) * OSSM-742 Improve Maistra container images build (#534) * OSSM-742 Improve Maistra container images build * Simplify make rules and Dockerfiles * Fix dockerfiles lint issues * Reorganize files and apply image naming convention * Update MAISTRA_VERSION and ISTIO_VERSION * Adapt images builds relying on upstream build tool * Add copyright and license into scripts * chore: updates image labels to reflect actual targeted versions * chore: removes vendor left-overs Co-authored-by: bmangoen <bmangoen@gmail.com>

* OSSM-742 Improve Maistra container images build (for maistra-2.3) (maistra#606) * OSSM-742 Improve Maistra container images build (maistra#534) * OSSM-742 Improve Maistra container images build * Simplify make rules and Dockerfiles * Fix dockerfiles lint issues * Reorganize files and apply image naming convention * Update MAISTRA_VERSION and ISTIO_VERSION * Adapt images builds relying on upstream build tool * Add copyright and license into scripts * chore: updates image labels to reflect actual targeted versions * chore: removes vendor left-overs Co-authored-by: bmangoen <bmangoen@gmail.com>

* OSSM-742 Improve Maistra container images build (for maistra-2.3) (#606) * OSSM-742 Improve Maistra container images build (#534) * OSSM-742 Improve Maistra container images build * Simplify make rules and Dockerfiles * Fix dockerfiles lint issues * Reorganize files and apply image naming convention * Update MAISTRA_VERSION and ISTIO_VERSION * Adapt images builds relying on upstream build tool * Add copyright and license into scripts * chore: updates image labels to reflect actual targeted versions * chore: removes vendor left-overs Co-authored-by: bmangoen <bmangoen@gmail.com>

* OSSM-742 Improve Maistra container images build (for maistra-2.3) (maistra#606) * OSSM-742 Improve Maistra container images build (maistra#534) * OSSM-742 Improve Maistra container images build * Simplify make rules and Dockerfiles * Fix dockerfiles lint issues * Reorganize files and apply image naming convention * Update MAISTRA_VERSION and ISTIO_VERSION * Adapt images builds relying on upstream build tool * Add copyright and license into scripts * chore: updates image labels to reflect actual targeted versions * chore: removes vendor left-overs Co-authored-by: bmangoen <bmangoen@gmail.com>

* OSSM-742 Improve Maistra container images build (for maistra-2.3) (#606) * OSSM-742 Improve Maistra container images build (#534) * OSSM-742 Improve Maistra container images build * Simplify make rules and Dockerfiles * Fix dockerfiles lint issues * Reorganize files and apply image naming convention * Update MAISTRA_VERSION and ISTIO_VERSION * Adapt images builds relying on upstream build tool * Add copyright and license into scripts * chore: updates image labels to reflect actual targeted versions * chore: removes vendor left-overs Co-authored-by: bmangoen <bmangoen@gmail.com>

OSSM-742 Improve Maistra container images build

c660944

maistra-bot added the size/L label Jun 10, 2022

jwendell added the do-not-merge/hold label Jun 10, 2022

jwendell reviewed Jun 14, 2022

View reviewed changes

bmangoen added 2 commits June 22, 2022 15:10

Simplify make rules and Dockerfiles

453763d

Fix dockerfiles lint issues

69a592b

jwendell reviewed Jun 27, 2022

View reviewed changes

maistra.mk Show resolved Hide resolved

jwendell reviewed Jun 27, 2022

View reviewed changes

Reorganize files and apply image naming convention

7c21a53

dgn approved these changes Jul 1, 2022

View reviewed changes

jwendell approved these changes Jul 1, 2022

View reviewed changes

bmangoen added okay to merge and removed do-not-merge/hold labels Jul 4, 2022

maistra-bot merged commit 55ecb02 into maistra:maistra-2.2 Jul 5, 2022

bmangoen deleted the OSSM-742 branch July 5, 2022 12:44

jwendell added the cherrypick/maistra-2.3 label Aug 4, 2022

bmangoen added cherrypick/maistra-2.3 and removed cherrypick/maistra-2.3 labels Aug 25, 2022

bmangoen mentioned this pull request Aug 25, 2022

OSSM-742 Improve Maistra container images build (manual cherry-pick) #600

Closed

11 tasks

bartoszmajsak mentioned this pull request Nov 22, 2022

[build] OSSM-2297 Improve Maistra container images build #694

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OSSM-742 Improve Maistra container images build#534

OSSM-742 Improve Maistra container images build#534
maistra-bot merged 4 commits intomaistra:maistra-2.2from
bmangoen:OSSM-742

bmangoen commented Jun 10, 2022

Uh oh!

jwendell left a comment

Uh oh!

Uh oh!

jwendell Jun 27, 2022

Uh oh!

bmangoen Jul 1, 2022

Uh oh!

Uh oh!

bmangoen commented Jul 5, 2022

Uh oh!

dgn commented Jul 5, 2022

Uh oh!

maistra-bot commented Aug 4, 2022

Uh oh!

maistra-bot commented Aug 25, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

bmangoen commented Jun 10, 2022

Uh oh!

jwendell left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jwendell Jun 27, 2022

Choose a reason for hiding this comment

Uh oh!

bmangoen Jul 1, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bmangoen commented Jul 5, 2022

Uh oh!

dgn commented Jul 5, 2022

Uh oh!

maistra-bot commented Aug 4, 2022

Uh oh!

maistra-bot commented Aug 25, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants