Skip to content

Commit

Permalink
Fix deps to allow machine-config-operator to be removed
Browse files Browse the repository at this point in the history
  • Loading branch information
@fahlmant
fahlmant committed Feb 10, 2025
1 parent 6a5db67 commit f0c852e
Show file tree
Hide file tree
Showing 2,025 changed files with 188,703 additions and 45,385 deletions.
2 changes: 0 additions & 2 deletions cmd/aro/operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ func operator(ctx context.Context, log *logrus.Entry) error {

mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
HealthProbeBindAddress: ":8080",
MetricsBindAddress: "0", // disabled
Port: 8443,
})
if err != nil {
return err
Expand Down
77 changes: 37 additions & 40 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/containers/image/v5 v5.31.0
github.com/containers/podman/v5 v5.1.0
github.com/coreos/go-oidc/v3 v3.11.0
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-semver v0.3.1
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
github.com/coreos/ignition/v2 v2.14.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
Expand All @@ -39,7 +39,7 @@ require (
github.com/go-test/deep v1.1.0
github.com/gofrs/uuid v4.4.0+incompatible
github.com/golang-jwt/jwt/v4 v4.5.1
github.com/google/gnostic v0.5.7-v3refs
github.com/google/gnostic-models v0.6.8
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/gorilla/csrf v1.7.2
Expand All @@ -59,12 +59,11 @@ require (
github.com/onsi/gomega v1.33.1
github.com/open-policy-agent/frameworks/constraint v0.0.0-20221109005544-7de84dff5081
github.com/opencontainers/runtime-spec v1.2.0
github.com/openshift/api v0.0.0-20240103200955-7ca3a4634e46
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/openshift/api v0.0.0-20240109042830-44756aa36879
github.com/openshift/client-go v0.0.0-20240109161853-2425b4b6d3b3
github.com/openshift/cloud-credential-operator v0.0.0-20240910012137-a0245d57d1e6
github.com/openshift/hive/apis v0.0.0-20241211214914-af54e2fbd990
github.com/openshift/library-go v0.0.0-20230620084201-504ca4bd5a83
github.com/openshift/machine-config-operator v0.0.0-00010101000000-000000000000
github.com/pires/go-proxyproto v0.6.2
github.com/pkg/errors v0.9.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.50.0
Expand All @@ -86,10 +85,10 @@ require (
golang.org/x/text v0.21.0
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.27.2
k8s.io/apiextensions-apiserver v0.28.3
k8s.io/apimachinery v0.31.1
k8s.io/cli-runtime v0.25.16
k8s.io/client-go v0.27.3
k8s.io/cli-runtime v0.28.4
k8s.io/client-go v0.28.4
k8s.io/kubectl v0.24.17
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
sigs.k8s.io/controller-runtime v0.15.0
Expand All @@ -111,7 +110,7 @@ require (
github.com/Microsoft/hcsshim v0.12.3 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down Expand Up @@ -143,8 +142,9 @@ require (
github.com/docker/docker-credential-helpers v0.8.1 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
Expand All @@ -169,7 +169,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/go-containerregistry v0.19.1 // indirect
github.com/google/go-intervals v0.0.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -230,7 +230,7 @@ require (
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
github.com/sigstore/fulcio v1.4.5 // indirect
github.com/sigstore/rekor v1.3.6 // indirect
Expand All @@ -246,7 +246,7 @@ require (
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect
github.com/vbauerster/mpb/v8 v8.7.3 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
Expand All @@ -255,12 +255,12 @@ require (
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
google.golang.org/grpc v1.65.0 // indirect
Expand All @@ -269,14 +269,15 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.27.2 // indirect
k8s.io/apiserver v0.28.4 // indirect
k8s.io/component-base v0.28.4 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-aggregator v0.27.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
sigs.k8s.io/json v0.0.0-20241009153224-e386a8af8d30 // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
tags.cncf.io/container-device-interface v0.7.2 // indirect
)
Expand Down Expand Up @@ -1558,23 +1559,23 @@ exclude (

// k8s.io and sigs.k8s.io pins
replace (
k8s.io/api => k8s.io/api v0.25.16
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.16
k8s.io/apimachinery => k8s.io/apimachinery v0.25.16
k8s.io/apiserver => k8s.io/apiserver v0.25.16
k8s.io/client-go => k8s.io/client-go v0.25.16
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.16 // required for k8s.io/kubernetes
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.16 // required for k8s.io/kubernetes
k8s.io/code-generator => k8s.io/code-generator v0.25.16
k8s.io/component-base => k8s.io/component-base v0.25.16
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.16 // required for k8s.io/kubernetes
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.16
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.16
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.16
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.16
k8s.io/kubectl => k8s.io/kubectl v0.25.16
k8s.io/kubernetes => k8s.io/kubernetes v1.25.16
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.11.2
k8s.io/api => k8s.io/api v0.28.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
k8s.io/apimachinery => k8s.io/apimachinery v0.28.4
k8s.io/apiserver => k8s.io/apiserver v0.28.4
k8s.io/client-go => k8s.io/client-go v0.28.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
k8s.io/code-generator => k8s.io/code-generator v0.28.4
k8s.io/component-base => k8s.io/component-base v0.28.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
k8s.io/kubectl => k8s.io/kubectl v0.28.4
k8s.io/kubernetes => k8s.io/kubernetes v0.28.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.11.2
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.3
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
Expand All @@ -1584,11 +1585,7 @@ replace (
// OpenShift pins
replace (
github.com/googleapis/gnostic => github.com/google/gnostic v0.5.5
github.com/openshift/api => github.com/openshift/api v0.0.0-20240103200955-7ca3a4634e46
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/openshift/hive/apis => github.com/openshift/hive/apis v0.0.0-20231116161336-9dd47f8bfa1f
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20230222114049-eac44a078a6e
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20230908201248-46b93e64dea6
go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.9.4
google.golang.org/grpc => google.golang.org/grpc v1.56.3
)
Expand Down
Loading

0 comments on commit f0c852e

Please sign in to comment.