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

CORS-3250: images/altinfra: add etcd/kas binaries from containers #8309

Merged
merged 2 commits into from Apr 26, 2024

Conversation

r4f4
Copy link
Contributor

@r4f4 r4f4 commented Apr 24, 2024

When building the altinfra image for inclusion in the release payload, we cannot download any binaries as it is currently done for etcd/kas. Instead let's copy those binaries from their existing container images.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 24, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 24, 2024

@r4f4: This pull request references CORS-3250 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.16.0" version, but no target version was set.

In response to this:

When building the altinfra image for inclusion in the release payload, we cannot download any binaries as it is currently done for etcd/kas. Instead let's copy those binaries from their existing container images.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@r4f4
Copy link
Contributor Author

r4f4 commented Apr 24, 2024

Depends on #8196

@r4f4
Copy link
Contributor Author

r4f4 commented Apr 24, 2024

With this we'll only support native installs, that is, it won't be possible yet to deploy an arm64 cluster from an amd64 one.
Cross-arch installs are currently blocked by openshift-eng/ocp-build-data#4644

@r4f4
Copy link
Contributor Author

r4f4 commented Apr 24, 2024

In the build log for the installer-altinfra image:

2024-04-24T11:48:00.600210991Z [3/4] STEP 7/12: COPY --from=etcd /usr/bin/etcd /usr/bin/etcd
2024-04-24T11:48:01.185792907Z [3/4] STEP 8/12: COPY --from=kas /usr/bin/kube-apiserver /usr/bin/kube-apiserver
2024-04-24T11:48:02.051976133Z [3/4] STEP 9/12: COPY . .
2024-04-24T11:48:39.297155275Z [3/4] STEP 10/12: RUN mkdir -p cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH) && 	mv /usr/bin/etcd /usr/bin/kube-apiserver -t cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH)/
[...]
2024-04-24T11:55:38.942848425Z + sync_envtest
2024-04-24T11:55:38.942910659Z + '[' -f /go/src/github.com/openshift/installer/cluster-api/bin/linux_amd64/kube-apiserver ']'
2024-04-24T11:55:38.943712021Z ++ /go/src/github.com/openshift/installer/cluster-api/bin/linux_amd64/kube-apiserver --version
2024-04-24T11:55:38.943931675Z ++ sed 's/Kubernetes //'
2024-04-24T11:55:39.059477607Z + version=v1.29.0-rc.1.3931+d9d45306df052a-dirty
2024-04-24T11:55:39.059524820Z + echo 'Found envtest binaries with version: v1.29.0-rc.1.3931+d9d45306df052a-dirty'
2024-04-24T11:55:39.059524820Z Found envtest binaries with version: v1.29.0-rc.1.3931+d9d45306df052a-dirty
2024-04-24T11:55:39.060029524Z + printf '%s\n%s' v1.28.0 v1.29.0-rc.1.3931+d9d45306df052a-dirty
2024-04-24T11:55:39.060111817Z + sort -V -C
2024-04-24T11:55:39.062207416Z + return
[...]
2024-04-24T11:55:51.671599292Z   adding: etcd (deflated 50%)
2024-04-24T11:55:52.551685950Z   adding: kube-apiserver (deflated 69%)

So the binaries are there. Let's see if they are working:

/test altinfra-e2e-aws-ovn

@r4f4
Copy link
Contributor Author

r4f4 commented Apr 24, 2024

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 24, 2024
Only download the binaries if the existing binaries' version is lower
than the minimum version (currently 1.28.0). This change will be needed
when we copy etcd/kas binaries from existing container images which
build them from source.
When building the altinfra image for inclusion in the release payload,
we cannot download any binaries as it is currently done for etcd/kas.
Instead let's copy those binaries from their existing container images.
@r4f4
Copy link
Contributor Author

r4f4 commented Apr 24, 2024

shellcheck fixed.

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 24, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented Apr 24, 2024

Actually let's wait to sync this with ART.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 24, 2024
@patrickdillon
Copy link
Contributor

/approve
/lgtm

for when we sync with ART.

Along with this, I think we may want to always build CAPI providers #8273?

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2024
Copy link
Contributor

openshift-ci bot commented Apr 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented Apr 24, 2024

Along with this, I think we may want to always build CAPI providers #8273?

I can set OPENSHIFT_INSTALL_CLUSTER_API=y in this PR to always build the capi providers in the altinfra image, but I think we should wait with 8273 because it's adding capi to the regular installer image and that one needs to move to rhel9 first which is blocked on #8196

Copy link
Contributor

openshift-ci bot commented Apr 24, 2024

@r4f4: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-e2e-aws-ovn-upgrade 1f814cd link false /test okd-e2e-aws-ovn-upgrade

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@r4f4
Copy link
Contributor Author

r4f4 commented Apr 26, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 26, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 523f573 into openshift:master Apr 26, 2024
22 of 23 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-installer-altinfra-container-v4.16.0-202404261114.p0.g523f573.assembly.stream.el9 for distgit ose-installer-altinfra.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants