USHIFT-1053: remove user data dir

etcd/cmd/microshift-etcd/run.go

@@ -67,13 +67,12 @@ func (s *EtcdService) configure(cfg *config.Config) {
 	s.maxFragmentedPercentage = cfg.Etcd.MaxFragmentedPercentage
 	s.defragCheckFreq = cfg.Etcd.DefragCheckFreq
 
-	microshiftDataDir := config.GetDataDir()
-	certsDir := cryptomaterial.CertsDirectory(microshiftDataDir)
+	certsDir := cryptomaterial.CertsDirectory(config.DataDir)
 
 	etcdServingCertDir := cryptomaterial.EtcdServingCertDir(certsDir)
 	etcdPeerCertDir := cryptomaterial.EtcdPeerCertDir(certsDir)
 	etcdSignerCertPath := cryptomaterial.CACertPath(cryptomaterial.EtcdSignerDir(certsDir))
-	dataDir := filepath.Join(microshiftDataDir, s.Name())
+	dataDir := filepath.Join(config.DataDir, s.Name())
 
 	// based on https://github.com/openshift/cluster-etcd-operator/blob/master/bindata/bootkube/bootstrap-manifests/etcd-member-pod.yaml#L19
 	s.etcdCfg = etcd.NewConfig()

etcd/vendor/modules.txt

@@ -165,7 +165,6 @@ github.com/mailru/easyjson/jwriter
 github.com/matttproud/golang_protobuf_extensions/pbutil
 # github.com/mitchellh/go-homedir v1.1.0
 ## explicit
-github.com/mitchellh/go-homedir
 # github.com/mitchellh/go-wordwrap v1.0.0
 ## explicit
 github.com/mitchellh/go-wordwrap

pkg/cmd/init.go

@@ -35,8 +35,6 @@ import (
 	"github.com/openshift/microshift/pkg/util/cryptomaterial/certchains"
 )
 
-var microshiftDataDir = config.GetDataDir()
-
 func initCerts(cfg *config.Config) (*certchains.CertificateChains, error) {
 	certChains, err := certSetup(cfg)
 	if err != nil {
@@ -86,7 +84,7 @@ func certSetup(cfg *config.Config) (*certchains.CertificateChains, error) {
 		externalCertNames = append(externalCertNames, cfg.Node.NodeIP)
 	}
 
-	certsDir := cryptomaterial.CertsDirectory(microshiftDataDir)
+	certsDir := cryptomaterial.CertsDirectory(config.DataDir)
 
 	certChains, err := certchains.NewCertificateChains(
 		// ------------------------------
@@ -350,7 +348,7 @@ func certSetup(cfg *config.Config) (*certchains.CertificateChains, error) {
 		return nil, err
 	}
 
-	saKeyDir := filepath.Join(microshiftDataDir, "/resources/kube-apiserver/secrets/service-account-key")
+	saKeyDir := filepath.Join(config.DataDir, "/resources/kube-apiserver/secrets/service-account-key")
 	if err := util.EnsureKeyPair(
 		filepath.Join(saKeyDir, "service-account.pub"),
 		filepath.Join(saKeyDir, "service-account.key"),
@@ -370,11 +368,11 @@ func initKubeconfigs(
 	cfg *config.Config,
 	certChains *certchains.CertificateChains,
 ) error {
-	externalTrustPEM, err := os.ReadFile(cryptomaterial.CACertPath(cryptomaterial.KubeAPIServerExternalSigner(cryptomaterial.CertsDirectory(microshiftDataDir))))
+	externalTrustPEM, err := os.ReadFile(cryptomaterial.CACertPath(cryptomaterial.KubeAPIServerExternalSigner(cryptomaterial.CertsDirectory(config.DataDir))))
 	if err != nil {
 		return fmt.Errorf("failed to load the external trust signer: %v", err)
 	}
-	internalTrustPEM, err := os.ReadFile(cryptomaterial.CACertPath(cryptomaterial.KubeAPIServerLocalhostSigner(cryptomaterial.CertsDirectory(microshiftDataDir))))
+	internalTrustPEM, err := os.ReadFile(cryptomaterial.CACertPath(cryptomaterial.KubeAPIServerLocalhostSigner(cryptomaterial.CertsDirectory(config.DataDir))))
 	if err != nil {
 		return fmt.Errorf("failed to load the internal trust signer: %v", err)
 	}

pkg/cmd/run.go

@@ -85,7 +85,7 @@ func RunMicroshift(cfg *config.Config) error {
 		klog.Fatal(err)
 	}
 
-	os.MkdirAll(microshiftDataDir, 0700)
+	os.MkdirAll(config.DataDir, 0700)
 
 	// TODO: change to only initialize what is strictly necessary for the selected role(s)
 	certChains, err := initCerts(cfg)

pkg/components/components.go

@@ -5,8 +5,6 @@ import (
 	"k8s.io/klog/v2"
 )
 
-var microshiftDataDir = config.GetDataDir()
-
 func StartComponents(cfg *config.Config) error {
 	kubeAdminConfig := cfg.KubeConfigPath(config.KubeAdmin)