USHIFT-913: fix vendoring microshift in etcd/

etcd/cmd/microshift-etcd/run.go

@@ -22,8 +22,8 @@ func NewRunEtcdCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "run",
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			if err := cfg.ReadAndValidate(config.GetConfigFile(), cmd.Flags()); err != nil {
-				klog.Fatalf("Error in reading and validating flags", err)
+			if err := cfg.ReadAndValidate(config.GetConfigFile()); err != nil {
+				klog.Fatalf("Error in reading and validating MicroShift config: %v", err)
 			}
 
 			e := NewEtcd(cfg)

etcd/go.mod

@@ -2,10 +2,10 @@ module github.com/openshift/microshift/etcd
 
 go 1.18
 
-require github.com/openshift/microshift v0.0.0-20221121140706-b79e07fef323
+require github.com/openshift/microshift v0.0.0
 
 replace (
-	github.com/openshift/microshift/ => ../
+	github.com/openshift/microshift => ../
 	github.com/openshift/microshift/pkg/config => ../pkg/config
 	github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial
 )
@@ -15,21 +15,51 @@ require (
 	github.com/spf13/cobra v1.6.0
 	go.etcd.io/etcd/server/v3 v3.5.5
 	k8s.io/apimachinery v0.26.1
-	k8s.io/cli-runtime v0.25.2
+	k8s.io/cli-runtime v0.26.1
 	k8s.io/component-base v0.26.1
 	k8s.io/klog/v2 v2.80.1
-	k8s.io/kubectl v0.25.2
+	k8s.io/kubectl v0.26.1
 	sigs.k8s.io/yaml v1.3.0
 )
 
 require (
+	github.com/NYTimes/gziphandler v1.1.1 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/coreos/go-oidc v2.1.0+incompatible // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/cel-go v0.12.6 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+	github.com/moby/sys/mountinfo v0.6.2 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/selinux v1.10.0 // indirect
+	github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a // indirect
+	github.com/pquerna/cachecontrol v0.1.0 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/stretchr/objx v0.4.0 // indirect
+	github.com/stoewer/go-strcase v1.2.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
+	go.opentelemetry.io/otel/metric v0.31.0 // indirect
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+	golang.org/x/tools v0.2.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.2.2 // indirect
+	k8s.io/apiserver v0.26.1 // indirect
+	k8s.io/cloud-provider v0.0.0 // indirect
+	k8s.io/cluster-bootstrap v0.0.0 // indirect
+	k8s.io/component-helpers v0.26.1 // indirect
+	k8s.io/kms v0.26.1 // indirect
+	k8s.io/kubelet v0.0.0 // indirect
+	k8s.io/kubernetes v1.26.1 // indirect
+	k8s.io/mount-utils v0.0.0 // indirect
+	k8s.io/pod-security-admission v0.25.0 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
 )
 
 require (
@@ -70,7 +100,6 @@ require (
 	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kelseyhightower/envconfig v1.4.0 // indirect; microshift
 	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