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

sync upstream main branch to downstream #25

Merged
merged 11 commits into from
Feb 3, 2022

Conversation

nixpanic
Copy link
Member

@nixpanic nixpanic commented Feb 3, 2022

Sync the upstream changes from csi-addons/kubernetes-csi-addons:main into the
main branch. The most important recent changes that we want included are:

  • 113628d reclaimspace: do not report Unimplemented as an error
  • rebases of some vendored dependencies
  • generation of yaml files and inclusion in the repo (not used for deployment by operator)

yati1998 and others added 11 commits February 3, 2022 15:13
this commit adds raw yaml generated using kustomize
in deploy/controller/ which can be used by others to
directly deploy the controller

Fixes: csi-addons#105

Signed-off-by: yati1998 <[email protected]>
(cherry picked from commit e515dd5)
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.43.0 to 1.44.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.43.0...v1.44.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit 0aa69e4)
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.18.0...v1.18.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit 5060dc9)
` cd config/manager && $(KUSTOMIZE) edit set image
 controller=${CONTROLLER_IMG} $(KUSTOMIZE_RBAC_PROXY)`
The above command did not set rbax-proxy image since this
image variable was part of config/default/kustomization.yaml.
This commit fixes this issue and does some cleanup in the Makefile
and config/default/kustomization.yaml(running the cmd moved
/removed some default parameters).

Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit 383733b)
When a tag is pushed into the repository, a release is now automatically
made from the tag. The release includes generated YAML files that can be
applied with `kubectl` to install the controller and CRDs.

Fixes: csi-addons#107
See-also: https://github.com/ncipollo/release-action/
Signed-off-by: Niels de Vos <[email protected]>
(cherry picked from commit 57ed4f6)
When a CSI-driver does not implement NodeReclaimSpace and/or
ControllerReclaimSpace, it should not reported as an error.

Signed-off-by: Niels de Vos <[email protected]>
(cherry picked from commit 113628d)
Generate separate file containing only crds.

Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit efd47cb)
Moving namespace and namePrefix to respective kustomize files
of config/rbac and config/manager from config/default allows
us to generate them independently.

Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit eb14271)
This commit moves namespace from manager.yaml
to separate file under config/rbac and adds cmd
to create separate rbac.yaml. This allows us to
create a separate rbac.yaml file containing
namespace and rbac yamls.

Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit 9cf0159)
This commit adds capability to generate setup-controller.yaml
containing only configmap and controller deployment.
it moves manager_auth_proxy patch to config/manager and
performs other required changes.

Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit e707f76)
Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit a0ce7a9)
@openshift-ci openshift-ci bot added the approved label Feb 3, 2022
@Madhu-1
Copy link
Member

Madhu-1 commented Feb 3, 2022

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Feb 3, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Madhu-1, nixpanic

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-merge-robot openshift-merge-robot merged commit 029c2df into red-hat-storage:main Feb 3, 2022
@nixpanic nixpanic deleted the ds/sync/20220203 branch February 3, 2022 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants