-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Run UBI-minimal FVs in Typha #9710
Run UBI-minimal FVs in Typha #9710
Conversation
- ../.semaphore/run-and-monitor make-fv-ubi.log make clean image fv | ||
env_vars: | ||
- name: CALICO_BASE | ||
value: registry.access.redhat.com/ubi8/ubi-minimal |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you make this is a special "use ubi" value and do the switch to the exact image in the makefile? Just thinking that we already have registry.access.redhat.com/ubi8/ubi-minimal
in metadata.mk
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@@ -262,7 +262,11 @@ REPO_ROOT := $(shell git rev-parse --show-toplevel) | |||
CERTS_PATH := $(REPO_ROOT)/hack/test/certs | |||
|
|||
# The image to use for building calico/base-dependent modules (e.g. apiserver, typha). | |||
ifdef USE_UBI_AS_CALICO_BASE | |||
CALICO_BASE ?= $(UBI_IMAGE) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will this be the -minimal
version that you were using before?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes we seem to use ubi-minimal
in all these areas
b1bbb26
to
ffbcc86
Compare
ffbcc86
to
b3d13bb
Compare
- name: "Typha: UT and FV tests on UBI-minimal" | ||
commands: | ||
- ../.semaphore/run-and-monitor make-fv-ubi.log make clean image fv | ||
env_vars: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can set the CALICO_BASE
variable directly in the new pipeline rather than introducing a new USE_UBI_AS_CALICO_BASE
flag. You can add additional checks before typha UT/FVs to make sure that the base is indeed switched.
env_vars:
- name: CALICO_BASE
value: registry.access.redhat.com/ubi8/ubi-minimal:latest
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's what I had, but I re-did it to satisfy: #9710 (comment)
* run UBI-minimal FVs in Typha
Description
Related issues/PRs
Todos
Release Note
Reminder for the reviewer
Make sure that this PR has the correct labels and milestone set.
Every PR needs one
docs-*
label.docs-pr-required
: This change requires a change to the documentation that has not been completed yet.docs-completed
: This change has all necessary documentation completed.docs-not-required
: This change has no user-facing impact and requires no docs.Every PR needs one
release-note-*
label.release-note-required
: This PR has user-facing changes. Most PRs should have this label.release-note-not-required
: This PR has no user-facing changes.Other optional labels:
cherry-pick-candidate
: This PR should be cherry-picked to an earlier release. For bug fixes only.needs-operator-pr
: This PR is related to install and requires a corresponding change to the operator.