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

Manual sync of upstream to downstream #806

Merged
merged 65 commits into from
Jan 27, 2025

Conversation

Nikhil-Ladha
Copy link
Member

This PR is manual sync of upstream to downstream due to merge conflicts in images/ceph/Makefile and tests/scripts/validate_modified_file.sh files.

parth-gr and others added 30 commits January 8, 2025 19:46
Currently, the sc name is hardcoded,
in future if we support multiple rados
namespace per tenant we need a variable name
updating sc names to contain rados-namespace name
ocs pr: red-hat-storage/ocs-operator#2955

Signed-off-by: parth-gr <[email protected]>
This change continues an effort started earlier to make some
make targets and ci workflows more consistent and systematic.
see rook#14922

it adds a  make target gen.helm-docs as an alias to helm-docs.
Additionally, gen.docs is added as alias to docs.
targets check.docs and check.helm-docs are removed because it was agreed
that targets using git are of little value to developers.
Their functionality is moved back into the corresponding docs workflow.

xiFinally, the  redundant "Check helm-docs" check is removed from the
docs-check workflow

Signed-off-by: Michael Adam <[email protected]>
ci : rework docs-related workflows and  Makefile targets  a bit to be more systematic and consistent
Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).


Updates `sigs.k8s.io/controller-runtime` from 0.19.3 to 0.19.4
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.19.3...v0.19.4)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
The operator namespace is where the csi driver resources
are being created. The prefix is expected to match the
namespace where the driver is being created.
It was an incorrect change from 15245 where it
had been assumed that the cluster prefix name was
required instead.

Signed-off-by: Travis Nielsen <[email protected]>
Signed-off-by: licheng <[email protected]>
csi: Set driver name to same as the operator namespace
…-docs

doc: add basic obc bucketPolicy description
For the upcoming 4.17 release, we reset the pending release
notes so we can add new features to the list.

Signed-off-by: Travis Nielsen <[email protected]>
docs: Reset pending release notes
For the upcoming 1.17 release, update the high level features
that are targeted.

Signed-off-by: Travis Nielsen <[email protected]>
The Kubernetes CSI sidecars have had several releases that were not
included in deployments by Rook yet, update them to the versions that
are available today:

- csi-node-driver-registrar:v2.13.0
- csi-provisioner:v5.1.0
- csi-attacher:v4.8.0
- csi-resizer:v1.13.1

Signed-off-by: Niels de Vos <[email protected]>
…0250115

Update Kubernetes CSI sidecar images to current versions
in the image building Makefile, a comment explaining the construction
of the operator-sdk download URL was in a wrong place.

Now it is moved to the lines that it actually explains.

Signed-off-by: Michael Adam <[email protected]>
In image building, when building on arm based systems,
the s5cmd tool was added with the wrong architecture
(amd64 instead of arm64).

This change fixes the architecture of the s5cmd to match the
architecture of the image built.

Fixes: rook#15262

Signed-off-by: Michael Adam <[email protected]>
docs: Update roadmap for release 1.17
No need for adopters to send mail to the steering committee,
maintainers can manage the adopters just fine.

Signed-off-by: Travis Nielsen <[email protected]>
docs: Simplify adopters instructions
…endencies-1fd157afd7

build(deps): bump sigs.k8s.io/controller-runtime from 0.19.3 to 0.19.4 in the k8s-dependencies group
This PR addresses an issue where the CrashCollector Pruner
CronJob pods were stuck in a Pending state due to missing
tolerations in their PodTemplateSpec.
These tolerations were not being propagated from the
cephClusterSpec.placement.all field.
Added tolerations to the PodTemplateSpec of the
CrashCollector Pruner CronJob.

Signed-off-by: Oded Viner <[email protected]>
Co-authored-by: Travis Nielsen <[email protected]>
Signed-off-by: Artem Torubarov <[email protected]>
core: add tolerations to crashcollector pruner cronJob pod
operator: omit values from mon db config logs
The rgw multisite testing job is consistently failing
and blocking the backport of PRs that are passing all
other CI. Until issue 15177 is fixed let's disable
this check.

Signed-off-by: Travis Nielsen <[email protected]>
build: Auto merge backports without blocking on multisite test
subhamkrai and others added 25 commits January 21, 2025 11:59
…m/chart-testing-action-2.7.0

build(deps): bump helm/chart-testing-action from 2.6.1 to 2.7.0
…dependencies-7737c7a5fe

build(deps): bump github.com/aws/aws-sdk-go from 1.55.5 to 1.55.6 in the github-dependencies group
…ions/upload-artifact-4.6.0

build(deps): bump actions/upload-artifact from 4.4.3 to 4.6.0
The experimental functions in `golang.org/x/exp/slices` are now
available in the standard library in Go 1.21.

Reference: https://go.dev/doc/go1.21#slices
Signed-off-by: Eng Zer Jun <[email protected]>
build: replace `golang.org/x/exp/slices` with stdlib `slices`
this commits updates the k8s pkg to v0.32.1 and
controller runtime to v0.20.0

Signed-off-by: subhamkrai <[email protected]>
build: update k8s and cntrl runtime pkg
Get will return a non-nil pointer even in the error case.

Signed-off-by: Steven Fackler <[email protected]>
Signed-off-by: Joshua Hoblitt <[email protected]>
This extracts two functionalities from
the linters ci workflow into make targets for
convenient local execution: yamllint and pylint

Signed-off-by: Michael Adam <[email protected]>
ci: extract make targets from linters workflow
rgw: fix error handling for secret lookup
log applied mon store config values with trace lvl for debug purpose

Signed-off-by: Artem Torubarov <[email protected]>
operator: log mon db config values with trace lvl
operator: improve operator error logging for ok-to-stop failures
The lint make target is not used anywhere in the codebase and is particular not run in the CI.
It was recently discovered that `make lint` does not even work at all.
It was subsequently suggested to remove the broken and unused target altogether.

This change settles that issue by removing the lint target and the preparatory
 golint installation target.

Fixes: rook#15317

Signed-off-by: Michael Adam <[email protected]>
build: remove broken make target lint
This is to allow developers to conveniently run the same check locally
as run in the CI.

Signed-off-by: Michael Adam <[email protected]>
Ci: refactor  a shellcheck make target out of the github ci  workflow
add generated csv, configmap changes

Signed-off-by: Nikhil-Ladha <[email protected]>
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2025
Copy link

openshift-ci bot commented Jan 27, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Nikhil-Ladha, subhamkrai

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

@subhamkrai subhamkrai merged commit 3573d45 into red-hat-storage:master Jan 27, 2025
52 of 54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.