зеркало из https://github.com/Azure/ARO-RP.git
Vendor installer release 4.9
This also forces the RP from Go 1.14 to Go 1.16. Aside from requiring OCP 4.9 / Kubernetes 1.22 modules, the other go.mod changes are all manual workarounds from failed "make vendor" runs.
This commit is contained in:
Matthew Barnes
Родитель
c2ca901abe
Коммит
5e13c68a5b
174
go.mod
174
go.mod
|
|
@ -1,6 +1,6 @@
|
|||
module github.com/Azure/ARO-RP
|
||||
|
||||
go 1.14
|
||||
go 1.16
|
||||
|
||||
require (
|
||||
cloud.google.com/go v0.94.1 // indirect
|
||||
|
|
@ -74,17 +74,14 @@ require (
|
|||
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
|
||||
github.com/onsi/ginkgo v1.16.4
|
||||
github.com/onsi/gomega v1.16.0
|
||||
github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
|
||||
github.com/openshift/client-go v3.9.0+incompatible
|
||||
github.com/openshift/cloud-credential-operator v0.0.0-20210906074537-c3316bb35a5a // indirect
|
||||
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210823144712-1c81cab6cc3a // indirect
|
||||
github.com/openshift/cluster-api-provider-kubevirt v0.0.0-20210719100556-9b8bc3666720 // indirect
|
||||
github.com/openshift/api v0.0.0-20210622200201-7740bfb97397
|
||||
github.com/openshift/client-go v0.0.0-20210409155308-a8e62c60e930
|
||||
github.com/openshift/console-operator v0.0.0-20210905022429-b8058325fabe
|
||||
github.com/openshift/custom-resource-status v1.1.0 // indirect
|
||||
github.com/openshift/installer v0.16.1
|
||||
github.com/openshift/library-go v0.0.0-20210906100234-6754cfd64cb5
|
||||
github.com/openshift/machine-api-operator v0.2.1-0.20210820103535-d50698c302f5
|
||||
github.com/openshift/machine-config-operator v4.2.0-alpha.0.0.20190917115525-033375cbe820+incompatible
|
||||
github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8
|
||||
github.com/pborman/uuid v1.2.1 // indirect
|
||||
github.com/pires/go-proxyproto v0.6.0
|
||||
github.com/pkg/errors v0.9.1
|
||||
|
|
@ -95,6 +92,7 @@ require (
|
|||
github.com/russross/blackfriday v1.6.0 // indirect
|
||||
github.com/sirupsen/logrus v1.8.1
|
||||
github.com/spf13/cobra v1.2.1 // indirect
|
||||
github.com/stretchr/testify v1.7.0
|
||||
github.com/ugorji/go/codec v1.2.6
|
||||
github.com/vmware/govmomi v0.26.1 // indirect
|
||||
github.com/xlab/treeprint v1.1.0 // indirect
|
||||
|
|
@ -115,31 +113,30 @@ require (
|
|||
gopkg.in/ini.v1 v1.62.1 // indirect
|
||||
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
|
||||
gotest.tools/gotestsum v1.6.4
|
||||
k8s.io/api v0.22.1
|
||||
k8s.io/apiextensions-apiserver v0.22.1
|
||||
k8s.io/apimachinery v0.22.1
|
||||
k8s.io/cli-runtime v0.22.1 // indirect
|
||||
k8s.io/client-go v12.0.0+incompatible
|
||||
k8s.io/code-generator v0.21.4
|
||||
k8s.io/component-base v0.22.1 // indirect
|
||||
k8s.io/klog/v2 v2.20.0 // indirect
|
||||
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 // indirect
|
||||
k8s.io/kubectl v0.22.1
|
||||
k8s.io/kubernetes v1.21.4
|
||||
k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e // indirect
|
||||
kubevirt.io/client-go v0.44.1 // indirect
|
||||
kubevirt.io/containerized-data-importer v1.39.0 // indirect
|
||||
kubevirt.io/controller-lifecycle-operator-sdk v0.2.1 // indirect
|
||||
k8s.io/api v0.22.0
|
||||
k8s.io/apiextensions-apiserver v0.22.0
|
||||
k8s.io/apimachinery v0.22.0
|
||||
k8s.io/client-go v0.22.0
|
||||
k8s.io/code-generator v0.22.0
|
||||
k8s.io/klog/v2 v2.9.0 // indirect
|
||||
k8s.io/kubectl v0.22.0
|
||||
k8s.io/kubernetes v1.22.0
|
||||
sigs.k8s.io/cluster-api-provider-aws v0.7.0 // indirect
|
||||
sigs.k8s.io/cluster-api-provider-azure v0.5.2
|
||||
sigs.k8s.io/cluster-api-provider-openstack v0.4.0 // indirect
|
||||
sigs.k8s.io/controller-runtime v0.10.0
|
||||
sigs.k8s.io/controller-tools v0.6.2
|
||||
sigs.k8s.io/kustomize/api v0.9.0 // indirect
|
||||
sigs.k8s.io/kustomize/kyaml v0.11.1 // indirect
|
||||
)
|
||||
|
||||
exclude (
|
||||
// force use of go.etcd.io/bbolt
|
||||
github.com/coreos/bbolt v1.3.0
|
||||
github.com/coreos/bbolt v1.3.2
|
||||
github.com/coreos/bbolt v1.3.3
|
||||
github.com/etcd-io/bbolt v1.3.3
|
||||
github.com/etcd-io/bbolt v1.3.6
|
||||
// force use of golang.org/x/lint
|
||||
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7
|
||||
// exclude github.com/golang/protobuf < 1.3.2 https://nvd.nist.gov/vuln/detail/CVE-2021-3121
|
||||
github.com/golang/protobuf v1.0.0
|
||||
github.com/golang/protobuf v1.1.1
|
||||
|
|
@ -202,17 +199,25 @@ exclude (
|
|||
github.com/hashicorp/vault v1.5.0-beta1
|
||||
github.com/hashicorp/vault v1.5.0-beta2
|
||||
github.com/hashicorp/vault v1.5.0-rc1
|
||||
// force use of github.com/envoyproxy/protoc-gen-validate
|
||||
github.com/lyft/protoc-gen-validate v0.0.13
|
||||
// https://www.whitesourcesoftware.com/vulnerability-database/WS-2018-0594
|
||||
github.com/satori/go.uuid v0.0.0
|
||||
github.com/satori/uuid v0.0.0
|
||||
// force use of cloud.google.com/go
|
||||
google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8
|
||||
)
|
||||
|
||||
replace (
|
||||
bitbucket.org/ww/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d // 404 on bitbucket.org/ww/goautoneg
|
||||
github.com/Unknwon/com => github.com/unknwon/com v1.0.1
|
||||
github.com/clarketm/json => github.com/clarketm/json v1.15.7 // Later versions not compatible with Go 1.16
|
||||
github.com/cockroachdb/sentry-go => github.com/getsentry/sentry-go v0.11.0
|
||||
github.com/docker/spdystream => github.com/docker/spdystream v0.1.0
|
||||
github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.8
|
||||
// Replace old GoGo Protobuf versions https://nvd.nist.gov/vuln/detail/CVE-2021-3121
|
||||
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
|
||||
github.com/mrnold/go-libnbd => github.com/mrnold/go-libnbd v1.4.1-cdi // v1.10.0 uses an invalid module path
|
||||
github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.19.4
|
||||
// https://www.whitesourcesoftware.com/vulnerability-database/WS-2018-0594
|
||||
github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
|
||||
|
|
@ -221,67 +226,100 @@ replace (
|
|||
github.com/terraform-providers/terraform-provider-aws => github.com/openshift/terraform-provider-aws v1.60.1-0.20200630224953-76d1fb4e5699
|
||||
github.com/terraform-providers/terraform-provider-azurerm => github.com/openshift/terraform-provider-azurerm v1.40.1-0.20200707062554-97ea089cc12a
|
||||
github.com/terraform-providers/terraform-provider-ignition/v2 => github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0
|
||||
golang.org/x/tools => golang.org/x/tools v0.1.0 // We are still using Go 1.14, but >=v0.1.1 depends on standard library from Go 1.16
|
||||
k8s.io/api => k8s.io/api v0.21.4
|
||||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.21.4
|
||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
|
||||
k8s.io/client-go => k8s.io/client-go v0.21.4
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.4
|
||||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.4
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.21.4
|
||||
k8s.io/component-base => k8s.io/component-base v0.21.4
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.21.4
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.21.4
|
||||
k8s.io/cri-api => k8s.io/cri-api v0.21.4
|
||||
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.4
|
||||
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.4
|
||||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.4
|
||||
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
|
||||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.4
|
||||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.4
|
||||
k8s.io/kubectl => k8s.io/kubectl v0.21.4
|
||||
k8s.io/kubelet => k8s.io/kubelet v0.21.4
|
||||
k8s.io/kubernetes => k8s.io/kubernetes v1.21.4
|
||||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.4
|
||||
k8s.io/metrics => k8s.io/metrics v0.21.4
|
||||
k8s.io/mount-utils => k8s.io/mount-utils v0.21.4
|
||||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.4
|
||||
k8s.io/api => k8s.io/api v0.22.0
|
||||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.22.0
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.22.0
|
||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.0
|
||||
k8s.io/client-go => k8s.io/client-go v0.22.0
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.0
|
||||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.22.0
|
||||
k8s.io/component-base => k8s.io/component-base v0.22.0
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.22.0
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.22.0
|
||||
k8s.io/cri-api => k8s.io/cri-api v0.22.0
|
||||
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.0
|
||||
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.0
|
||||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.0
|
||||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.0
|
||||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.0
|
||||
k8s.io/kubectl => k8s.io/kubectl v0.22.0
|
||||
k8s.io/kubelet => k8s.io/kubelet v0.22.0
|
||||
k8s.io/kubernetes => k8s.io/kubernetes v1.22.0
|
||||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.0
|
||||
k8s.io/metrics => k8s.io/metrics v0.22.0
|
||||
k8s.io/mount-utils => k8s.io/mount-utils v0.22.0
|
||||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.0
|
||||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0
|
||||
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.1
|
||||
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.5.0
|
||||
)
|
||||
|
||||
// Installer dependencies. Some of them are being used directly in the RP.
|
||||
replace (
|
||||
git.apache.org/thrift.git => github.com/apache/thrift v0.15.0
|
||||
github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.14
|
||||
github.com/BurntSushi/toml => github.com/BurntSushi/toml v0.3.1
|
||||
github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2
|
||||
github.com/c-bata/go-prompt => github.com/c-bata/go-prompt v0.2.5
|
||||
github.com/circonus-labs/circonusllhist => github.com/openhistogram/circonusllhist v0.3.0
|
||||
github.com/cockroachdb/errors => github.com/cockroachdb/errors v1.8.5
|
||||
github.com/codahale/hdrhistogram => github.com/HdrHistogram/hdrhistogram-go v1.1.2
|
||||
github.com/containernetworking/plugins => github.com/containernetworking/plugins v1.0.0
|
||||
github.com/containers/image => github.com/containers/image v3.0.2+incompatible
|
||||
github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.6
|
||||
github.com/coreos/fcct => github.com/coreos/butane v0.13.1
|
||||
github.com/coreos/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.48.1
|
||||
github.com/coreos/stream-metadata-go => github.com/coreos/stream-metadata-go v0.0.0-20210225230131-70edb9eb47b3
|
||||
github.com/cortexproject/cortex => github.com/cortexproject/cortex v1.10.0
|
||||
github.com/deislabs/oras => github.com/oras-project/oras v0.12.0
|
||||
github.com/etcd-io/bbolt => go.etcd.io/bbolt v1.3.6
|
||||
github.com/go-check/check => gopkg.in/check.v1 v0.0.0-20201130134442-10cb98267c6c
|
||||
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
|
||||
github.com/kubevirt/terraform-provider-kubevirt => github.com/nirarg/terraform-provider-kubevirt v0.0.0-20201222125919-101cee051ed3
|
||||
github.com/golang/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
|
||||
github.com/google/tcpproxy => inet.af/tcpproxy v0.0.0-20210824174053-2e577fef49e2
|
||||
github.com/googleapis/gnostic => github.com/google/gnostic v0.5.5
|
||||
github.com/h2non/filetype => github.com/h2non/filetype v1.1.1
|
||||
github.com/hashicorp/vault => github.com/hasicorp/vault v1.8.7
|
||||
github.com/influxdata/flux => github.com/influxdata/flux v0.132.0
|
||||
github.com/knq/sysutil => github.com/chromedp/sysutil v1.0.0
|
||||
github.com/kshvakov/clickhouse => github.com/ClickHouse/clickhouse-go v1.4.9
|
||||
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20210706141527-5240e42f012a // Use OpenShift fork
|
||||
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20210706141527-5240e42f012a // Use OpenShift fork
|
||||
github.com/metal3-io/cluster-api-provider-baremetal => github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210721192732-726d97e15db7 // Pin OpenShift fork
|
||||
github.com/openshift/api => github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
|
||||
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
|
||||
github.com/metal3-io/cluster-api-provider-baremetal => github.com/openshift/cluster-api-provider-baremetal v0.0.0-20190821174549-a2a477909c1d // Pin OpenShift fork
|
||||
github.com/mholt/certmagic => github.com/caddyserver/certmagic v0.15.0
|
||||
github.com/openshift/api => github.com/openshift/api v0.0.0-20211028023115-7224b732cc14
|
||||
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210831095141-e19a065e79f7
|
||||
github.com/openshift/cloud-credential-operator => github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e
|
||||
github.com/openshift/cluster-api-provider-gcp => github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20210513231632-34db56ebf7a8
|
||||
github.com/openshift/cluster-api-provider-kubevirt => github.com/openshift/cluster-api-provider-kubevirt v0.0.0-20210515110917-b0e15d7907de
|
||||
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/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
|
||||
github.com/openshift/cluster-api-provider-gcp => github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20211001174514-d92b08844a2b
|
||||
github.com/openshift/cluster-api-provider-ibmcloud => github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20210806145144-04491027caa8
|
||||
github.com/openshift/cluster-api-provider-kubevirt => github.com/openshift/cluster-api-provider-kubevirt v0.0.0-20210719100556-9b8bc3666720
|
||||
github.com/openshift/cluster-api-provider-libvirt => github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20210623230745-59ae2edf8875
|
||||
github.com/openshift/cluster-api-provider-ovirt => github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220120123528-15a6add2ff5b
|
||||
github.com/openshift/console-operator => github.com/openshift/console-operator v0.0.0-20220124105820-fdcb82f487fb
|
||||
github.com/openshift/installer => github.com/mbarnes/installer v0.9.0-master.0.20220124150240-ee05ee430992
|
||||
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20220119132903-b5557aacc264
|
||||
github.com/openshift/machine-api-operator => github.com/openshift/machine-api-operator v0.2.1-0.20211203013047-383c9b959b69
|
||||
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20211215135312-23d93af42378
|
||||
github.com/oras-project/oras-go => oras.land/oras-go v0.4.0
|
||||
github.com/ovirt/go-ovirt => github.com/ovirt/go-ovirt v0.0.0-20210112072624-e4d3b104de71
|
||||
github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20210421143221-52df5ef7a3be
|
||||
github.com/terraform-providers/terraform-provider-azuread => github.com/hashicorp/terraform-provider-azuread v1.6.0
|
||||
github.com/thanos-io/thanos => github.com/thanos-io/thanos v0.23.0
|
||||
github.com/uber-go/atomic => go.uber.org/atomic v1.9.0
|
||||
github.com/uber/athenadriver => github.com/uber/athenadriver v1.1.10
|
||||
github.com/willf/bitset => github.com/bits-and-blooms/bitset v1.2.1
|
||||
google.golang.org/cloud => cloud.google.com/go v0.97.0
|
||||
google.golang.org/grpc => google.golang.org/grpc v1.40.0
|
||||
k8s.io/klog/v2 => k8s.io/klog/v2 v2.8.0
|
||||
kubevirt.io/client-go => kubevirt.io/client-go v0.29.0
|
||||
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.9.7
|
||||
mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20211002133954-f839ab2b2b11
|
||||
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210819142746-9f0a34faa04c
|
||||
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210611192943-830107632bf8
|
||||
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20210903123455-eb8656e9dfb4
|
||||
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.8.8
|
||||
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.10.17
|
||||
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20210302164104-8498241fa4bd
|
||||
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.0
|
||||
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
|
||||
sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.5.1
|
||||
vbom.ml/util => github.com/fvbommel/util v0.0.3
|
||||
)
|
||||
|
|
|
|||
|
|
@ -51,16 +51,16 @@ for x in vendor/github.com/openshift/*; do
|
|||
;;
|
||||
|
||||
*)
|
||||
go mod edit -replace ${x##vendor/}=$(go list -mod=mod -m ${x##vendor/}@release-4.8 | sed -e 's/ /@/')
|
||||
go mod edit -replace ${x##vendor/}=$(go list -mod=mod -m ${x##vendor/}@release-4.9 | sed -e 's/ /@/')
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
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/ /@/')
|
||||
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.9 | sed -e 's/ /@/')
|
||||
done
|
||||
|
||||
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 mod edit -replace github.com/openshift/installer=$(go list -mod=mod -m github.com/jewzaam/installer-aro@release-4.9-azure | sed -e 's/ /@/')
|
||||
|
||||
go get -u ./...
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,6 @@ func (m *manager) generateInstallConfig(ctx context.Context) (*installconfig.Ins
|
|||
CloudName: azuretypes.CloudEnvironment(m.env.Environment().Name),
|
||||
OutboundType: azuretypes.LoadbalancerOutboundType,
|
||||
ResourceGroupName: resourceGroup,
|
||||
ARO: true,
|
||||
},
|
||||
},
|
||||
PullSecret: pullSecret,
|
||||
|
|
@ -204,12 +203,16 @@ func (m *manager) generateInstallConfig(ctx context.Context) (*installconfig.Ins
|
|||
},
|
||||
Publish: types.ExternalPublishingStrategy,
|
||||
},
|
||||
Azure: icazure.NewMetadata(azuretypes.CloudEnvironment(m.env.Environment().Name), &icazure.Credentials{
|
||||
TenantID: m.subscriptionDoc.Subscription.Properties.TenantID,
|
||||
ClientID: m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientID,
|
||||
ClientSecret: string(m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientSecret),
|
||||
SubscriptionID: r.SubscriptionID,
|
||||
}),
|
||||
Azure: icazure.NewMetadataWithCredentials(
|
||||
azuretypes.CloudEnvironment(m.env.Environment().Name),
|
||||
m.env.Environment().ResourceManagerEndpoint,
|
||||
&icazure.Credentials{
|
||||
TenantID: m.subscriptionDoc.Subscription.Properties.TenantID,
|
||||
ClientID: m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientID,
|
||||
ClientSecret: string(m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile.ClientSecret),
|
||||
SubscriptionID: r.SubscriptionID,
|
||||
},
|
||||
),
|
||||
}
|
||||
|
||||
if m.doc.OpenShiftCluster.Properties.IngressProfiles[0].Visibility == api.VisibilityPrivate {
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ func TestMachineReconciler(t *testing.T) {
|
|||
wantConditions: []operatorv1.OperatorCondition{{
|
||||
Type: arov1alpha1.MachineValid,
|
||||
Status: operatorv1.ConditionFalse,
|
||||
Message: "machine foo-hx8z7-worker-1: invalid image '{bananas aro4 }'",
|
||||
Message: "machine foo-hx8z7-worker-1: invalid image '{bananas aro4 }'",
|
||||
Reason: "CheckFailed",
|
||||
}},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import (
|
|||
)
|
||||
|
||||
func TestMerge(t *testing.T) {
|
||||
serviceInternalTrafficPolicy := corev1.ServiceInternalTrafficPolicyCluster
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
old kruntime.Object
|
||||
|
|
@ -166,17 +167,19 @@ func TestMerge(t *testing.T) {
|
|||
name: "Service no changes",
|
||||
old: &corev1.Service{
|
||||
Spec: corev1.ServiceSpec{
|
||||
ClusterIP: "1.2.3.4",
|
||||
Type: corev1.ServiceTypeClusterIP,
|
||||
SessionAffinity: corev1.ServiceAffinityNone,
|
||||
ClusterIP: "1.2.3.4",
|
||||
Type: corev1.ServiceTypeClusterIP,
|
||||
SessionAffinity: corev1.ServiceAffinityNone,
|
||||
InternalTrafficPolicy: &serviceInternalTrafficPolicy,
|
||||
},
|
||||
},
|
||||
new: &corev1.Service{},
|
||||
want: &corev1.Service{
|
||||
Spec: corev1.ServiceSpec{
|
||||
ClusterIP: "1.2.3.4",
|
||||
Type: corev1.ServiceTypeClusterIP,
|
||||
SessionAffinity: corev1.ServiceAffinityNone,
|
||||
ClusterIP: "1.2.3.4",
|
||||
Type: corev1.ServiceTypeClusterIP,
|
||||
SessionAffinity: corev1.ServiceAffinityNone,
|
||||
InternalTrafficPolicy: &serviceInternalTrafficPolicy,
|
||||
},
|
||||
},
|
||||
wantEmptyDiff: true,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче