Azure
/
ARO-RP
зеркало из https://github.com/Azure/ARO-RP.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move installer and go-cosmosdb to jewzaam's GitHub account (#1796) 

* Move installer and go-cosmosdb to jewzaam's GitHub account
* upstream-differences.md: Point to jewzaam's installer-aro
This commit is contained in:
Matthew Barnes 2021-10-19 03:51:08 -04:00 коммит произвёл GitHub
Родитель fef8f41aa3
Коммит 0db1e3eb6e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
32 изменённых файлов: 44 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
README.md
Просмотреть файл

@ -186,4 +186,4 @@ questions or comments.
* https://docs.microsoft.com/en-gb/rest/api/cosmos-db
* https://github.com/mjudeikis/go-cosmosdb
* https://github.com/jewzaam/go-cosmosdb

2
deps.go
Просмотреть файл

@ -12,8 +12,8 @@ import (
_ "github.com/go-bindata/go-bindata/go-bindata"
_ "github.com/golang/mock/mockgen"
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/jewzaam/go-cosmosdb/cmd/gencosmosdb"
_ "github.com/jstemmer/go-junit-report"
_ "github.com/mjudeikis/go-cosmosdb/cmd/gencosmosdb"
_ "golang.org/x/tools/cmd/goimports"
_ "gotest.tools/gotestsum"
_ "k8s.io/code-generator/cmd/client-gen"

2
docs/upstream-differences.md
Просмотреть файл

@ -5,7 +5,7 @@ upstream OCP.
## Installer carry patches
See https://github.com/openshift/installer/compare/release-4.8...mjudeikis:release-4.8-azure.
See https://github.com/openshift/installer/compare/release-4.8...jewzaam:release-4.8-azure.
## Installation differences

4
go.mod
Просмотреть файл

@ -60,6 +60,7 @@ require (
github.com/gorilla/sessions v1.2.1
github.com/h2non/filetype v1.1.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/jewzaam/go-cosmosdb v0.0.0-20211018134417-8d1494e7862f
github.com/jstemmer/go-junit-report v0.9.1
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.0 // indirect
github.com/klauspost/compress v1.13.5 // indirect
@ -70,7 +71,6 @@ require (
github.com/metal3-io/cluster-api-provider-baremetal v0.2.2 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mjudeikis/go-cosmosdb v0.0.0-20210518104404-b205b3cefd36
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.16.0
@ -263,7 +263,7 @@ replace (
github.com/openshift/cluster-api-provider-libvirt => github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20210812060947-9542e5ac08b7
github.com/openshift/cluster-api-provider-ovirt => github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20210811191557-cbf023408f4e
github.com/openshift/console-operator => github.com/openshift/console-operator v0.0.0-20210729235954-696f4645f37d
github.com/openshift/installer => github.com/mjudeikis/installer v0.9.0-master.0.20210906140350-e0dddfe94b1d
github.com/openshift/installer => github.com/jewzaam/installer-aro v0.9.0-master.0.20210906140350-e0dddfe94b1d
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210825122301-7f0bf922c345
github.com/openshift/machine-api-operator => github.com/openshift/machine-api-operator v0.2.1-0.20210811215339-a6349c0280cc
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20210826190144-a537783ea4a0

8
go.sum
Просмотреть файл

@ -1505,6 +1505,10 @@ github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0
github.com/jen20/awspolicyequivalence v1.1.0/go.mod h1:PV1fS2xyHhCLp83vbgSMFr2drM4GzG61wkz+k4pOG3E=
github.com/jessevdk/go-flags v0.0.0-20180331124232-1c38ed7ad0cc/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jewzaam/go-cosmosdb v0.0.0-20211018134417-8d1494e7862f h1:G0wto7wY9OnIuwSPiLfyefcUN4FYEdtvwQMsCQdlDas=
github.com/jewzaam/go-cosmosdb v0.0.0-20211018134417-8d1494e7862f/go.mod h1:Sxto8tJPhBRIa7jDsuTx4TZAcTYu0NH8E39iWqqMeRs=
github.com/jewzaam/installer-aro v0.9.0-master.0.20210906140350-e0dddfe94b1d h1:xZUc1D7jC2J+eduEOgCOM0nogx0aNA5WfGKPphG80Gs=
github.com/jewzaam/installer-aro v0.9.0-master.0.20210906140350-e0dddfe94b1d/go.mod h1:qLYrlT3FFII/C99fLHZ7IA1T45i1oyg0w0JdRFuJ0n4=
github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a h1:GmsqmapfzSJkm28dhRoHz2tLRbJmqhU86IPgBtN3mmk=
@ -1793,10 +1797,6 @@ github.com/mitchellh/pointerstructure v0.0.0-20190430161007-f252a8fd71c8/go.mod
github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod h1:kB1naBgV9ORnkiTVeyJOI1DavaJkG4oNIq0Af6ZVKUo=
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mjudeikis/go-cosmosdb v0.0.0-20210518104404-b205b3cefd36 h1:K0yb4fqa1rYPEbdlv3rYz0vh1aHK0Jkd+EscS1Yi5wI=
github.com/mjudeikis/go-cosmosdb v0.0.0-20210518104404-b205b3cefd36/go.mod h1:l/LMyUQzbW3Pe62a6huel6S/5ED0KrkkqSQdwiGueUI=
github.com/mjudeikis/installer v0.9.0-master.0.20210906140350-e0dddfe94b1d h1:gSqkHFglLm0hk4rmyDeFMzW8isRCw8iIAy+uxzihM9A=
github.com/mjudeikis/installer v0.9.0-master.0.20210906140350-e0dddfe94b1d/go.mod h1:qLYrlT3FFII/C99fLHZ7IA1T45i1oyg0w0JdRFuJ0n4=
github.com/moby/ipvs v1.0.1/go.mod h1:2pngiyseZbIKXNv7hsKj3O9UEz30c53MT9005gt2hxQ=
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=

2
hack/update-go-module-dependencies.sh
Просмотреть файл

@ -60,7 +60,7 @@ 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.8 | sed -e 's/ /@/')
done
go mod edit -replace github.com/openshift/installer=$(go list -mod=mod -m github.com/mjudeikis/installer@release-4.8-azure | sed -e 's/ /@/')
go mod edit -replace github.com/openshift/installer=$(go list -mod=mod -m github.com/jewzaam/installer-aro@release-4.8-azure | sed -e 's/ /@/')
go get -u ./...

2
pkg/database/cosmosdb/generate.go
Просмотреть файл

@ -3,7 +3,7 @@ package cosmosdb
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.
//go:generate go run ../../../vendor/github.com/mjudeikis/go-cosmosdb/cmd/gencosmosdb github.com/Azure/ARO-RP/pkg/api,AsyncOperationDocument github.com/Azure/ARO-RP/pkg/api,BillingDocument github.com/Azure/ARO-RP/pkg/api,GatewayDocument github.com/Azure/ARO-RP/pkg/api,MonitorDocument github.com/Azure/ARO-RP/pkg/api,OpenShiftClusterDocument github.com/Azure/ARO-RP/pkg/api,SubscriptionDocument
//go:generate go run ../../../vendor/github.com/jewzaam/go-cosmosdb/cmd/gencosmosdb github.com/Azure/ARO-RP/pkg/api,AsyncOperationDocument github.com/Azure/ARO-RP/pkg/api,BillingDocument github.com/Azure/ARO-RP/pkg/api,GatewayDocument github.com/Azure/ARO-RP/pkg/api,MonitorDocument github.com/Azure/ARO-RP/pkg/api,OpenShiftClusterDocument github.com/Azure/ARO-RP/pkg/api,SubscriptionDocument
//go:generate go run ../../../vendor/golang.org/x/tools/cmd/goimports -local=github.com/Azure/ARO-RP -e -w ./
//go:generate go run ../../../vendor/github.com/golang/mock/mockgen -destination=../../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/database/$GOPACKAGE PermissionClient
//go:generate go run ../../../vendor/golang.org/x/tools/cmd/goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/$GOPACKAGE.go

2
pkg/database/cosmosdb/zz_generated_asyncoperationdocument.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_asyncoperationdocument_fake.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_authorizer.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_billingdocument.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_billingdocument_fake.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_collection.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_cosmosdb.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_database.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_document.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_gatewaydocument.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_gatewaydocument_fake.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_monitordocument.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_monitordocument_fake.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_openshiftclusterdocument.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_openshiftclusterdocument_fake.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_permission.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_subscriptiondocument.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_subscriptiondocument_fake.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_trigger.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

2
pkg/database/cosmosdb/zz_generated_user.go
Просмотреть файл

@ -1,4 +1,4 @@
// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.
// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
package cosmosdb

0
vendor/github.com/mjudeikis/go-cosmosdb/LICENSE → vendor/github.com/jewzaam/go-cosmosdb/LICENSE сгенерированный поставляемый
Просмотреть файл

4
vendor/github.com/mjudeikis/go-cosmosdb/cmd/gencosmosdb/gencosmosdb.go → vendor/github.com/jewzaam/go-cosmosdb/cmd/gencosmosdb/gencosmosdb.go сгенерированный поставляемый
Просмотреть файл

@ -8,7 +8,7 @@ import (
"strings"
"unicode"
"github.com/mjudeikis/go-cosmosdb/pkg/gencosmosdb"
"github.com/jewzaam/go-cosmosdb/pkg/gencosmosdb"
)
var (
@ -29,7 +29,7 @@ func writeFile(filename string, data []byte) error {
}
defer f.Close()
data = packageRegexp.ReplaceAll(data, []byte("// Code generated by github.com/mjudeikis/go-cosmosdb, DO NOT EDIT.\n\npackage "+*pkg))
data = packageRegexp.ReplaceAll(data, []byte("// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.\n\npackage "+*pkg))
_, err = f.Write(data)
return err

9
vendor/github.com/mjudeikis/go-cosmosdb/pkg/gencosmosdb/bindata.go → vendor/github.com/jewzaam/go-cosmosdb/pkg/gencosmosdb/bindata.go сгенерированный поставляемый
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

0
vendor/github.com/mjudeikis/go-cosmosdb/pkg/gencosmosdb/generate.go → vendor/github.com/jewzaam/go-cosmosdb/pkg/gencosmosdb/generate.go сгенерированный поставляемый
Просмотреть файл

12
vendor/modules.txt поставляемый
Просмотреть файл

@ -585,6 +585,10 @@ github.com/hashicorp/hcl/json/token
github.com/imdario/mergo
# github.com/inconshreveable/mousetrap v1.0.0
github.com/inconshreveable/mousetrap
# github.com/jewzaam/go-cosmosdb v0.0.0-20211018134417-8d1494e7862f
## explicit
github.com/jewzaam/go-cosmosdb/cmd/gencosmosdb
github.com/jewzaam/go-cosmosdb/pkg/gencosmosdb
# github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a
github.com/jingyugao/rowserrcheck/passes/rowserr
# github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af
@ -675,10 +679,6 @@ github.com/mitchellh/go-homedir
github.com/mitchellh/go-wordwrap
# github.com/mitchellh/mapstructure v1.3.3
github.com/mitchellh/mapstructure
# github.com/mjudeikis/go-cosmosdb v0.0.0-20210518104404-b205b3cefd36
## explicit
github.com/mjudeikis/go-cosmosdb/cmd/gencosmosdb
github.com/mjudeikis/go-cosmosdb/pkg/gencosmosdb
# github.com/moby/spdystream v0.2.0
github.com/moby/spdystream
github.com/moby/spdystream/spdy
@ -837,7 +837,7 @@ github.com/openshift/console-operator/pkg/api
# github.com/openshift/custom-resource-status v1.1.0
## explicit
github.com/openshift/custom-resource-status/conditions/v1
# github.com/openshift/installer v0.16.1 => github.com/mjudeikis/installer v0.9.0-master.0.20210906140350-e0dddfe94b1d
# github.com/openshift/installer v0.16.1 => github.com/jewzaam/installer-aro v0.9.0-master.0.20210906140350-e0dddfe94b1d
## explicit
github.com/openshift/installer/data
github.com/openshift/installer/pkg/aro/dnsmasq
@ -2092,7 +2092,7 @@ sigs.k8s.io/yaml
# github.com/openshift/cluster-api-provider-libvirt => github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20210812060947-9542e5ac08b7
# github.com/openshift/cluster-api-provider-ovirt => github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20210811191557-cbf023408f4e
# github.com/openshift/console-operator => github.com/openshift/console-operator v0.0.0-20210729235954-696f4645f37d
# github.com/openshift/installer => github.com/mjudeikis/installer v0.9.0-master.0.20210906140350-e0dddfe94b1d
# github.com/openshift/installer => github.com/jewzaam/installer-aro v0.9.0-master.0.20210906140350-e0dddfe94b1d
# github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210825122301-7f0bf922c345
# github.com/openshift/machine-api-operator => github.com/openshift/machine-api-operator v0.2.1-0.20210811215339-a6349c0280cc
# github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20210826190144-a537783ea4a0