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

Syncing latest changes from upstream main for ramen #437

Merged
merged 5 commits into from
Jan 15, 2025
Merged

Conversation

df-build-team
Copy link

PR containing the latest commits from upstream main branch

nirs and others added 5 commits January 14, 2025 06:25
Add socket_vment instructions tailored for drenv, that can be copied
and pasted in the shell for easy installation.

- Recommend latest Lima version
- Recommend installing socket_vmnet from binary package instead of source
- Add copyable instructions for installing socket_vmnet binary package
- Replace the note about brew with note about installing the launchd
  service. The docs already warn about brew.

Signed-off-by: Nir Soffer <[email protected]>
Gathering typically takes less than 15 seconds, but we have seen one
case when it was stuck for 5 hours[1]. In this case the job was
terminated without archiving the logs and we have no way to debug the
issue.

Add a 3 minutes timeout to the gather job. If the command times out, we
kill it and archive what we got. This is likely to collect enough logs
to help debugging the original failure and the secondary gather failure
(using gather.log).

[1] https://github.com/RamenDR/ramen/actions/runs/12712182155/job/35437188040

Signed-off-by: Nir Soffer <[email protected]>
Generated using:

    % GOTOOLCHAIN=go1.22.9 go get github.com/csi-addons/[email protected]
    go: upgraded go 1.22.5 => 1.22.7
    go: upgraded toolchain go1.22.7 => go1.22.9
    go: upgraded github.com/csi-addons/kubernetes-csi-addons v0.10.1-0.20240924092040-c11db0b867a1 => v0.11.0
    go: upgraded google.golang.org/protobuf v1.35.1 => v1.35.2
    go: upgraded k8s.io/api v0.31.1 => v0.31.2
    go: upgraded k8s.io/apimachinery v0.31.1 => v0.31.2
    go: upgraded sigs.k8s.io/controller-runtime v0.19.0 => v0.19.1

    % go mod tidy
    go: downloading github.com/sagikazarmark/locafero v0.4.0
    go: downloading golang.org/x/tools v0.28.0
    go: downloading github.com/frankban/quicktest v1.14.6
    go: downloading github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad
    go: downloading github.com/sourcegraph/conc v0.3.0

Boris says we have now go 1.22.9 on the downstream build machines so we
can safely use it.

We need to add a GOTOOLCHAIN makefile variable later to make this
simpler for future updates.

Signed-off-by: Nir Soffer <[email protected]>
I copied the timeout_minutes which is correct for the retry action, but
the builtin timeout is timeout-minutes. The PR was merge too quickly
without waiting the CI.

Signed-off-by: Nir Soffer <[email protected]>
When using discovered apps, we check for volsync support in two places
in the ramenconfig.

- Under multiNamespace map, we look for volsyncSupported: true key value
pair
- Under volsync map, we need the key "disabled" to be set to false.

Ramenctl was configuring only the volsync map but not the multiNamespace
one.

We have to live with both the fields for now because of backward
compatibility reasons.

Signed-off-by: Raghavendra Talur <[email protected]>
@df-build-team df-build-team requested a review from a team January 15, 2025 08:06
Copy link

openshift-ci bot commented Jan 15, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: df-build-team

The full list of commands accepted by this bot can be found 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

@ShyamsundarR ShyamsundarR merged commit 48b6895 into main Jan 15, 2025
41 of 43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants