Skip to content

UBI/FIPS: Fixup container_version when not using gitlab-base

Jason Plum requested to merge ubi-backport-mr2274-17-8 into 17-8-stable

What does this MR do?

Cherry pick / backport !2274 (merged) to 17-8-stable. Subtle change: agentk is not present in 17.8

UBI/FIPS: Fixup container_version when not using gitlab-base

Update the CONTAINER_VERSION calculations to account for base images when not using gitlab-base.

The following are built directly on UBI_MICRO_IMAGE, which has details recorded in UBI_MICRO_DIGEST

  • cfssl-self-sign
  • kubectl
  • gitlab-kas
  • gitlab-agentk

Changelog: fixed

Related issues

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Integration tests added to GitLab QA
  • The impact any change in container size has should be evaluated
  • New dependencies are managed with GitLab forked renovatebot
Edited by Jon Doveston

Merge request reports