Updated directory structure and have versioned names #45

puneetguptanitj · 2018-08-04T07:49:07Z

Updated /var/cache to have a consistent format.
Updated directory names to have versions, to allow multiple installations to coexist
Have /opt/bin to have actual binaries and not symlinks (as we now have directories with versions in /var/cache)

Also change the directory names for other binaries to follow the same pattern of
/var/cache/<parent-tool>/<tool>/<tool-version>/<tool-binary> (by parent tool we mean the one which uses the tool, e.g. ssh-provider is the parent tool for nodeadm, while nodeadm is the parent tool for kubernetes)

contents of `/var/cache`

coreos-puneet-199-10-105-16-14platform9 cache # find nodeadm/
nodeadm/
nodeadm/kubernetes
nodeadm/kubernetes/v1.10.4
nodeadm/kubernetes/v1.10.4/10-kubeadm.conf
nodeadm/kubernetes/v1.10.4/kubeadm
nodeadm/kubernetes/v1.10.4/kubelet.service
nodeadm/kubernetes/v1.10.4/kubectl
nodeadm/kubernetes/v1.10.4/kubelet
nodeadm/cni
nodeadm/cni/v0.6.0
nodeadm/cni/v0.6.0/cni-plugins-amd64-v0.6.0.tgz
nodeadm/images
nodeadm/images/80cc5ea4b547abe174d7550b82825ace40769e977cde90495df3427b3a0f4e75.tar
nodeadm/images/c2ce1ffb51ed60c54057f53b8756231f5b4b792ce04113c6755339a1beb25943.tar
...
nodeadm/flannel
nodeadm/flannel/v0.10.0
nodeadm/flannel/v0.10.0/kube-flannel.yml

coreos-puneet-199-10-105-16-14platform9 cache # find etcdadm/
etcdadm/
etcdadm/etcd
etcdadm/etcd/v3.3.8
etcdadm/etcd/v3.3.8/etcd-v3.3.8-linux-amd64.tar.gz

coreos-puneet-199-10-105-16-14platform9 cache # find ssh-provider/
ssh-provider/
ssh-provider/nodeadm
ssh-provider/nodeadm/v.0.0.1-alpha
ssh-provider/nodeadm/v.0.0.1-alpha/nodeadm
ssh-provider/etcdadm
ssh-provider/etcdadm/v.0.0.1-alpha
ssh-provider/etcdadm/v.0.0.1-alpha/etcdadm

contents of `/opt/bin`

coreos-puneet-199-10-105-16-14platform9 bin # ls
cctl  conf  etcd  etcdadm  etcdctl  exporter  kubeadm  kubectl  kubelet  nodeadm

sarun87 · 2018-08-06T20:21:54Z

binary/etcd.go

 		return err
 	}
-	return util.CreateSymLink(etcdctlBinaryPath, etcdctlSymLinkPath)
+	return util.CopyFile(etcdctlSrcPath, etcdctlDestPath)
 }

 // DeleteSymLinks deletes symlinks created for etcd binaires


nit: Change comment to reflect delete binaries

Thanks Arun, fixed it

sarun87 · 2018-08-06T20:22:59Z

cmd/reset.go

-		}
-		// Remove symlinks
-		if err = binary.DeleteSymLinks(constants.DefaultInstallBaseDir); err != nil {
+		if err = binary.DeleteBinaries(constants.DefaultInstallBaseDir); err != nil {


If InstallBaseDir is now renamed to InstallDir, should DefaultInstallBaseDir be renamed to DefaultInstallDir ?

Thanks, updated it

sarun87 · 2018-08-06T20:26:18Z

binary/etcd.go


-	if err := util.CreateSymLink(etcdBinaryPath, etcdSymLinkPath); err != nil {
+	if err := util.CopyFile(etcdSrcPath, etcdDestPath); err != nil {


Since CopyFile does not force copy a file cp -f, should there be a FileExists check to see if the binary already exists, and remove the binary if it does exist before copying the binary over to the destDir? (Idempotent operation)

I thought that's already handled when we call IsInstalled

Thanks updated to cp -f

dlipovetsky · 2018-08-07T21:33:52Z

binary/etcd.go

-	etcdSymLinkPath := filepath.Join(symLinkDir, "etcd")
-	etcdctlSymLinkPath := filepath.Join(symLinkDir, "etcdctl")
-	if err := util.RemoveFile(etcdSymLinkPath); err != nil {
+func DeleteBinaries(installDir string) error {


Just FYI: I added an Uninstall to complement InstallFromCache in platform9@46866b8. Once that PR merges, this will get called by Uninstall, and won't need to be exported.

Thanks Daniel, updated to use Uninstall

dlipovetsky · 2018-08-07T21:41:54Z

util/filesystem.go

@@ -42,3 +43,11 @@ func CreateSymLink(srcFile, linkFile string) error {
 	RemoveFile(linkFile)
 	return os.Symlink(srcFile, linkFile)
 }
+
+// Copy file from src to dest
+func CopyFile(srcFile, destFile string) error {


It's true that the standard library doesn't provide a "copyfile" function (here's why). Do you prefer calling cp to ioutil.ReadFile + ioutil.WriteFile?

yeah, i also tried to look at some external libraries e.g. https://github.com/spf13/afero but that also doesn't have a copy utility. I felt that using cp was much more concise and had other features like automatically retaining the file permissions..

dlipovetsky · 2018-08-07T21:42:07Z

util/filesystem.go

@@ -42,3 +43,11 @@ func CreateSymLink(srcFile, linkFile string) error {
 	RemoveFile(linkFile)
 	return os.Symlink(srcFile, linkFile)
 }
+


~~FYI: The other functions (and this file) were removed in #46. You'll need to add the file back.~~ My mistake. The file was not removed, but all functions apart from FileExists were.

sounds good, thanks Daniel

vannrt · 2018-08-08T20:05:20Z

Can you make sure this question is resolved https://github.com/platform9/isv-tests/pull/26#pullrequestreview-144584751?

)

puneetguptanitj requested review from sarun87 and dlipovetsky August 4, 2018 07:49

sarun87 suggested changes Aug 6, 2018

View reviewed changes

dlipovetsky reviewed Aug 7, 2018

View reviewed changes

dlipovetsky approved these changes Aug 7, 2018

View reviewed changes

puneetguptanitj force-pushed the private/versioned-tools-dir branch 2 times, most recently from 397795f to 4628381 Compare August 8, 2018 17:36

Updated directory structure and have versioned names

b2f56bf

puneetguptanitj force-pushed the private/versioned-tools-dir branch from 4628381 to b2f56bf Compare August 8, 2018 18:38

sarun87 approved these changes Aug 8, 2018

View reviewed changes

vannrt self-requested a review August 8, 2018 22:44

vannrt approved these changes Aug 8, 2018

View reviewed changes

puneetguptanitj merged commit 8b4b59a into master Aug 8, 2018

puneetguptanitj deleted the private/versioned-tools-dir branch August 8, 2018 23:43

justinsb pushed a commit to justinsb/etcdadm that referenced this pull request Aug 28, 2020

Updated directory structure and have versioned names (kubernetes-sigs#45

4f1185b

)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated directory structure and have versioned names #45

Updated directory structure and have versioned names #45

puneetguptanitj commented Aug 4, 2018 •

edited

sarun87 Aug 6, 2018

puneetguptanitj Aug 8, 2018

sarun87 Aug 6, 2018

dlipovetsky Aug 7, 2018

puneetguptanitj Aug 8, 2018

sarun87 Aug 6, 2018

dlipovetsky Aug 7, 2018

puneetguptanitj Aug 8, 2018

dlipovetsky Aug 7, 2018

puneetguptanitj Aug 8, 2018 •

edited

dlipovetsky Aug 7, 2018

puneetguptanitj Aug 8, 2018

dlipovetsky Aug 7, 2018 •

edited

puneetguptanitj Aug 8, 2018

vannrt commented Aug 8, 2018


		if err := util.CreateSymLink(etcdBinaryPath, etcdSymLinkPath); err != nil {
		if err := util.CopyFile(etcdSrcPath, etcdDestPath); err != nil {

Updated directory structure and have versioned names #45

Updated directory structure and have versioned names #45

Conversation

puneetguptanitj commented Aug 4, 2018 • edited

contents of /var/cache

contents of /opt/bin

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

puneetguptanitj Aug 8, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dlipovetsky Aug 7, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vannrt commented Aug 8, 2018

puneetguptanitj commented Aug 4, 2018 •

edited

contents of `/var/cache`

contents of `/opt/bin`

puneetguptanitj Aug 8, 2018 •

edited

dlipovetsky Aug 7, 2018 •

edited