diff --git a/etcd/go.mod b/etcd/go.mod index 882e262201..410edb6511 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -72,7 +72,6 @@ require ( github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/mailru/easyjson v0.7.6 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect - github.com/mitchellh/go-homedir v1.1.0 // indirect; microshift github.com/mitchellh/go-wordwrap v1.0.0 // indirect github.com/moby/spdystream v0.2.0 // indirect github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect diff --git a/etcd/go.sum b/etcd/go.sum index 41285c67d1..558a05aaeb 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -327,7 +327,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfr github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 0d24790c76..9201f2d9a0 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -163,8 +163,6 @@ github.com/mailru/easyjson/jwriter # github.com/matttproud/golang_protobuf_extensions v1.0.2 ## explicit; go 1.9 github.com/matttproud/golang_protobuf_extensions/pbutil -# github.com/mitchellh/go-homedir v1.1.0 -## explicit # github.com/mitchellh/go-wordwrap v1.0.0 ## explicit github.com/mitchellh/go-wordwrap diff --git a/go.mod b/go.mod index f7e5cd8f67..28a8eaa17d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/apparentlymart/go-cidr v1.1.0 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // openshift-controller-manager github.com/miekg/dns v1.1.35 // microshift - github.com/mitchellh/go-homedir v1.1.0 // microshift github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 diff --git a/go.sum b/go.sum index e9bc6396fe..206ed807fc 100644 --- a/go.sum +++ b/go.sum @@ -532,7 +532,6 @@ github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 727c4f45a4..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,14 +0,0 @@ -- oc image-arm64 bb3e40f7518e6955e9f7e77d86990bdbe6b117cb to c6df0e998fd1fd1c54586e5b6e9e366a91916f20 - - 03056a3 2023-03-22T20:12:51-04:00 IR-301: generates ImageStreamTags with import-mode when using oc new-build - - cace2b4 2023-03-22T20:12:51-04:00 IR-300: enhances oc new-app with ImageRegistry ImportMode - - ddf90d3 2023-03-13T15:16:21+00:00 Updating ose-tools images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7ce51feaf65258715109cad8d18b1bd0db0fbb2e/images/ose-tools.yml - - 323f313 2023-03-06T07:59:59-08:00 append: expose keep-manifest-list option and preserve manifestlist when appending to specific arch images - - a2a49c1 2023-02-28T13:11:08-08:00 pkg/cli/admin/upgrade: Client-side checks for --to-multi-arch - -- coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb to 5af9cd2d70adaf8f4a7346879dbd593934ad3cc0 - - 20fb775 2023-03-09T20:06:18+00:00 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml - -- kubernetes image-arm64 54b552033300ab1f94ddf8a9d16032e6619556da to ff8ecbc24c150ec5bd0669ce6644d1c7046f636e - - f27d453cb 2023-04-03T13:56:19+02:00 UPSTREAM: : bump: apiserver-lib-go for fixed SCC admission - - c25f8d98c 2023-04-03T13:56:05+02:00 UPSTREAM: : SCC pod extractor: assume default SA if SA is empty - diff --git a/vendor/modules.txt b/vendor/modules.txt index 3c7046f9f4..b57da45db8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -477,8 +477,6 @@ github.com/mindprince/gonvml # github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible ## explicit github.com/mistifyio/go-zfs -# github.com/mitchellh/go-homedir v1.1.0 -## explicit # github.com/mitchellh/go-wordwrap v1.0.0 ## explicit github.com/mitchellh/go-wordwrap