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

vendor: bump installer to latest #1272

Merged

Conversation

abhinavdahiya
Copy link
Contributor

bumps the installer vendor to latest, also updates the code to work with new vendor

xref: https://issues.redhat.com/browse/HIVE-1354

/assign @dgoodwin
/cc @suhanime

go.mod Outdated
Comment on lines 85 to 101
// from installer
// Prevent the following modules from upgrading version as result of terraform-provider-kubernetes module
// The following modules need to be locked to compile correctly with terraform-provider-azure and terraform-provider-google
replace (
github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.8.2
github.com/Azure/go-autorest/autorest/azure/cli => github.com/Azure/go-autorest/autorest/azure/cli v0.3.1
github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.2.0
github.com/Azure/go-autorest/autorest/validation => github.com/Azure/go-autorest/autorest/validation v0.2.1-0.20191028180845-3492b2aff503
github.com/apparentlymart/go-cidr => github.com/apparentlymart/go-cidr v1.0.1
github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.0
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
github.com/hashicorp/go-plugin => github.com/hashicorp/go-plugin v1.2.2
github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.7
google.golang.org/api => google.golang.org/api v0.25.0
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
google.golang.org/grpc => google.golang.org/grpc v1.29.1
)
Copy link
Contributor

Choose a reason for hiding this comment

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

This is way better - I wonder if this warranties some changes here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is one off change we need to replace because of openshift/installer#4350 , i think this should be removed when installer bumps to set of dependencies that don't need this specifically.

the doc provides general guidelines of how to add or update the dependencies in most/usual case, like the cluster-api vendor bumps for aws etc included here too in the original replace block

@suhanime
Copy link
Contributor

suhanime commented Feb 2, 2021

I wonder if master should use a forked version of installer as well

installer changed its machine api v1beta1 import paths in [1].
Also openstack updated it's platform to deprecate the machine flavorName (keeping the marshalled api the
same), and also removed an options from MachineSet generator function

[1]: openshift/installer@b0b9646
@abhinavdahiya
Copy link
Contributor Author

I wonder if master should use a forked version of installer as well

previously in the installer repo we used always tried to use upstream directly as much as possible and use the forks when we need some changeset which not in any supported tips(branches). So personally i would not recommend using the fork unless required.

@suhanime
Copy link
Contributor

suhanime commented Feb 3, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, suhanime

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 3, 2021
@openshift-merge-robot openshift-merge-robot merged commit 505f72b into openshift:master Feb 3, 2021
@abhinavdahiya abhinavdahiya deleted the installer-bump-latest branch February 3, 2021 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants