Skip to content
This repository was archived by the owner on Dec 31, 2025. It is now read-only.

Updated directory structure and have versioned names - #52

Merged
puneetguptanitj merged 1 commit into
masterfrom
private/versioned-tools-dir
Aug 8, 2018
Merged

Updated directory structure and have versioned names#52
puneetguptanitj merged 1 commit into
masterfrom
private/versioned-tools-dir

Conversation

@puneetguptanitj

@puneetguptanitjpuneetguptanitj commented Aug 4, 2018

Copy link
Copy Markdown
Contributor

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 versioned binaries in 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

@vannrt

Copy link
Copy Markdown
Contributor

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

@puneetguptanitj

puneetguptanitj commented Aug 8, 2018

Copy link
Copy Markdown
ContributorAuthor

Hi @vannrt thanks for taking a look, that comment is a bit old, had a chat with @dlipovetsky after that, have updated the PR message with the required directory structure

var KubeDirName = filepath.Join("kubernetes", KubernetesVersion)
var FlannelDirName = filepath.Join("flannel", FlannelVersion)
var CNIDirName = filepath.Join("cni", CNIVersion)
var CniVersionInstallDir = filepath.Join(CNIBaseDir, CNIVersion)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: CNIVersionInstallDir

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Daniel, will address in the next commit

@puneetguptanitj
puneetguptanitj merged commit 035dbe7 into masterAug 8, 2018
@puneetguptanitj
puneetguptanitj deleted the private/versioned-tools-dir branch August 8, 2018 23:43
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@puneetguptanitj@vannrt@sarun87@dlipovetsky