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

GA v1.5.0 merge develop to master branch #140

Merged
merged 133 commits into from
Mar 9, 2021
Merged

GA v1.5.0 merge develop to master branch #140

merged 133 commits into from
Mar 9, 2021

Conversation

oriyarde
Copy link
Contributor

@oriyarde oriyarde commented Mar 8, 2021

Similar PR on the driver side -> IBM/ibm-block-csi-driver#297

27149chen and others added 30 commits November 15, 2019 13:17
* don't return error for csidriver
* update crds in make update
Signed-off-by: 27149chen <[email protected]>
Signed-off-by: 27149chen <[email protected]>
Code scanning for Operator were added to CI
Merge pull request #1022 from feature/CSI-1022_check_code_scanning_results
update operator version to 1.1.0
CSI-1169_ocp4_3_operator_deployment - add patch permissions to csi-attacher
require OPERATOR_IMAGE from Jenkins job, and rename build_image.sh to build_push_image.sh
CSI-1191 automated iscsi login deployment
…o_automation

Merge pull request #52 from IBM/feature/CSI-1111_move_code_scanning_to_automation
* add operator 1.1.0
Signed-off-by: 27149chen <[email protected]>
* CSI-1109_license

* CSI-1109_license
adapt UT to be cross architecture
change capability from "Seamless Upgrades" to "Basic Install"
* update readme
update OCP sidecar images for Z support
update OCP sidecar images for Z support again
change OLM operator containerImage repo to DockerHub
add OLM catalog community CSVs with local verifier
barakda and others added 18 commits February 10, 2021 14:47
* Add and Validate OLM OCP using operator-sdk
olm verification copy only olm dir, make file and build dir
add 1.5.0 CSV yamls
* CSI-2412: Place 99-ibm-attach.yaml in our operator reository

* CSI-2412: New line at the end of yaml file
add restart when running status becomes "creating"
add seamless upgrade support
resolve missing const in develop branch
add cluster roles + bindings finalizer
# Conflicts:
#	NOTICES
#	README.md
#	build/Dockerfile.operator
#	deploy/crds/csi.ibm.com_ibmblockcsis_crd.yaml
#	deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml
#	deploy/installer/generated/ibm-block-csi-operator.yaml
#	deploy/olm-catalog/ibm-block-csi-operator-community/ibm-block-csi-operator.package.yaml
#	deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.package.yaml
#	deploy/operator.yaml
#	deploy/role.yaml
#	deploy/service_account.yaml
#	pkg/config/settings.go
#	pkg/controller/ibmblockcsi/ibmblockcsi_controller.go
#	pkg/internal/ibmblockcsi/static_resource_generator.go
#	version/version.go
@oriyarde oriyarde marked this pull request as ready for review March 9, 2021 09:15
Copy link
Contributor

@ArbelNathan ArbelNathan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@oriyarde oriyarde merged commit e02610e into master Mar 9, 2021
zingero added a commit that referenced this pull request Jun 16, 2021