Skip to content

Commit

Permalink
Remove openshift/installer vendored dependency script (#3301)
Browse files Browse the repository at this point in the history
  • Loading branch information
bennerv authored Dec 4, 2023
1 parent 232d3bc commit 14d5b29
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ linters-settings:
alias: openapi_v2
- pkg: github.com/openshift/console-operator/pkg/api
alias: consoleapi
- pkg: github.com/openshift/installer/pkg/asset/installconfig/azure
alias: icazure
- pkg: github.com/openshift/installer/pkg/rhcos
alias: rhcospkg
- pkg: github.com/openshift/installer/pkg/types/azure
alias: azuretypes
- pkg: github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1
alias: machinev1beta1
- pkg: github.com/openshift/machine-api-operator/pkg/generated/clientset/versioned
Expand Down
6 changes: 0 additions & 6 deletions hack/update-go-module-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ for x in vendor/github.com/openshift/*; do
vendor/github.com/openshift/hive)
;;

# Replace the installer with our own fork below in this script.
vendor/github.com/openshift/installer)
;;

# Inconsistent imports: some of our dependencies import it as github.com/metal3-io/cluster-api-provider-baremetal
# but in some places directly from the openshift fork.
# Replace github.com/metal3-io/cluster-api-provider-baremetal with an openshift fork in go.mod
Expand Down Expand Up @@ -64,8 +60,6 @@ for x in aws azure openstack; do
go mod edit -replace sigs.k8s.io/cluster-api-provider-$x=$(go list -mod=mod -m github.com/openshift/cluster-api-provider-$x@release-4.10 | sed -e 's/ /@/')
done

go mod edit -replace github.com/openshift/installer=$(go list -mod=mod -m github.com/jewzaam/[email protected] | sed -e 's/ /@/')

go get -u ./...

go mod tidy -compat=1.18
Expand Down

0 comments on commit 14d5b29

Please sign in to comment.