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.

Sign up for GitHub

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

Jump to bottom

Synch repo cluster-api-provider-powervs with machine-api-provider-powervs #1

Merged
merged 74 commits into from Jan 28, 2022
Merged

Synch repo cluster-api-provider-powervs with machine-api-provider-powervs #1

merged 74 commits into from Jan 28, 2022

Conversation

Karthik-K-N
Copy link
Member

Steps followed to merge the repositories

  1. Cloned forked machine-api-provider-powervs repo
  2. git remote add old git@github.com:openshift/cluster-api-provider-powervs.git
  3. git fetch old
  4. git checkout -b mergebranch
  5. git merge --allow-unrelated-histories old/master
  6. Commit the changes and push

jthiatt and others added 30 commits June 1, 2021 11:53
@jthiatt
Initial commit
f091abb
@mkumatag
Create OWNERS
e6fef06
@mkumatag
Initial commit
3554fa4
@mkumatag
update owners
5126db7
@openshift-merge-robot
Merge pull request openshift#1 from mkumatag/main
7c771d4 
Initial commit
@mkumatag
Add .gitignore file
66ed9b6
@openshift-merge-robot
Merge pull request openshift#2 from mkumatag/git_ignore
e938593 
Add .gitignore file
@mkumatag
Fix dockerfile
aecd477
@openshift-merge-robot
Merge pull request openshift#3 from mkumatag/fix_dockerfile
5c2c14f 
Fix dockerfile
@Karthik-K-N
PowerVSMachineProviderConfig variable name changes and go mod vendor …
5024919 
…changes
@openshift-merge-robot
Merge pull request openshift#4 from Karthik-K-N/variable_name_changes
a5ccc9c 
PowerVSMachineProviderConfig variable name changes and go mod vendor …
@mkumatag
build_root configuration
9a5cdcf
@openshift-merge-robot
Merge pull request openshift#5 from mkumatag/build_root
9352384 
build_root configuration
@Karthik-K-N
Fix for golint errors
026967b
@openshift-merge-robot
Merge pull request openshift#7 from Karthik-K-N/fix-go-lint
18c1270 
Fix for golint errors
@mkumatag
Fix lint and fmt issues
5329599
@openshift-merge-robot
Merge pull request openshift#8 from mkumatag/fix_lint
9eee608 
Fix lint and fmt issues
@Karthik-K-N
Changes for making debug mode optional while creating Power VS client
2a5ab0c
@openshift-merge-robot
Merge pull request openshift#11 from Karthik-K-N/debug-feature
e384387 
Changes for making debug mode optional while creating Power VS client
@Karthik-K-N
Added unit test cases for Power VS provider
7342a8d
@openshift-merge-robot
Merge pull request openshift#9 from Karthik-K-N/unit-test-cases
086dba1 
Unit test cases
@mkumatag
Update power-go-client to v1.0.72 version
9ca378c
@openshift-merge-robot
Merge pull request openshift#13 from mkumatag/update_power_client
56a9503 
Update power-go-client to v1.0.72 version
@mkumatag
Rename IBMCLOUD_API_KEY to ibmcloud_api_key
9e3f06d
@openshift-merge-robot
Merge pull request openshift#14 from mkumatag/change_key_name
0b67886 
Rename IBMCLOUD_API_KEY to ibmcloud_api_key
@mkumatag
Update the base and builder to the latest level
95e4ae8
@openshift-merge-robot
Merge pull request openshift#15 from mkumatag/update_dockerfile
9642138 
Update the base and builder to the latest level
@mkumatag
Remove termination-handler
3e1125c
@openshift-merge-robot
Merge pull request openshift#16 from mkumatag/remove-termination-handler
8113bf3 
Remove termination-handler
@mkumatag
Upgrade to v1 crds
1b27a66
mkumatag and others added 23 commits November 9, 2021 15:05
@mkumatag
update the imports
de18624
@mkumatag
autogenerate the mock clients
26e7bec
@mkumatag
workaround the mocks with AnyTimes()
bc8a5c9
@openshift-merge-robot
Merge pull request openshift#33 from mkumatag/deps_cleanup
7c48308 
Dependency cleanup
Updating ose-powervs-machine-controllers images to be consistent with…
68a13a1 
… ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/d78e07522b3c9a920b0e2f5f44dd574d1e7f5091/images/ose-powervs-machine-controllers.yml
@openshift-merge-robot
Merge pull request openshift#35 from openshift-bot/art-consistency-op…
ea7610e 
…enshift-4.10-ose-powervs-machine-controllers

Updating ose-powervs-machine-controllers images to be consistent with ART
@mkumatag
Bump golang version to 1.17
d4be89b
@openshift-merge-robot
Merge pull request openshift#36 from mkumatag/bump_go_version
f3b2d0a 
Bump golang version to 1.17
@mkumatag
Use podman or docker
5ff20c6
@openshift-merge-robot
Merge pull request openshift#37 from mkumatag/podman
58f8170 
Use podman or docker
@Karthik-K-N
Add support for customendpoints
1064d35
@Karthik-K-N
Update client minimal to read custom service endpoints
7a02983
@openshift-merge-robot
Merge pull request openshift#31 from Karthik-K-N/custom-service-endpoint
dbb96b3 
Add support for ServiceEndpoints
@mkumatag
Update MAO and openshift/api dependency
dc84795
@openshift-merge-robot
Merge pull request openshift#39 from mkumatag/update_dep
a05198d 
Update MAO and openshift/api dependency
@Karthik-K-N
Updated README file
2e8e817
@openshift-merge-robot
Merge pull request openshift#40 from Karthik-K-N/updateReadME
4be1f7f 
Updated README file
@Karthik-K-N
Updated power go client
7b874ae
@openshift-merge-robot
Merge pull request openshift#41 from Karthik-K-N/update-power-goclient
51109fb 
Updated power go client to v1.0.87
@Karthik-K-N
Updated kubernetes version to 1.23
8d60a9b
@openshift-merge-robot
Merge pull request openshift#42 from Karthik-K-N/update-k8-version
1b59284 
Updated kubernetes version to 1.23
@Karthik-K-N
Merge cluster-api-powervs to machine-api-powervs
8372695
@Karthik-K-N
Updated README file
71ef740
@Karthik-K-N
Copy link
Member Author

/cc @mkumatag

@openshift-ci openshift-ci bot requested a review from mkumatag January 28, 2022 12:33
mkumatag
mkumatag approved these changes Jan 28, 2022
View reviewed changes
Copy link
Member

@mkumatag mkumatag left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2022
@mkumatag mkumatag merged commit 59d0a8a into openshift:main Jan 28, 2022
@Karthik-K-N Karthik-K-N deleted the synch-repo branch March 1, 2022 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkumatag mkumatag mkumatag approved these changes

Assignees

@mkumatag mkumatag

Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Karthik-K-N @mkumatag @jthiatt @openshift-merge-robot