Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions features/src/kubectl/devcontainer-feature.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,21 @@
"type": "string",
"default": "",
"description": "The download URL to use for kube-score binaries."
},
"fzfVersion": {
"type": "string",
"proposals": [
"latest",
"none",
"0.60.0"
],
"default": "latest",
"description": "The version of fzf to install."
},
"fzfDownloadUrl": {
"type": "string",
"default": "",
"description": "The download URL to use for fzf binaries."
}
}
}
48 changes: 46 additions & 2 deletions features/src/kubectl/installer.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ func runMain() error {
kustomizeDownloadUrl := flag.String("kustomizeDownloadUrl", "", "")
kubeconformDownloadUrl := flag.String("kubeconformDownloadUrl", "", "")
kubescoreDownloadUrl := flag.String("kubescoreDownloadUrl", "", "")
fzfVersion := flag.String("fzfVersion", "latest", "")
fzfDownloadUrl := flag.String("fzfDownloadUrl", "", "")
flag.Parse()

// Load settings from an external file
Expand All @@ -66,6 +68,7 @@ func runMain() error {
installer.HandleGitHubOverride(kustomizeDownloadUrl, "kubernetes-sigs/kustomize", "kubectl-kustomize-download-url")
installer.HandleGitHubOverride(kubeconformDownloadUrl, "yannh/kubeconform", "kubectl-kubeconform-download-url")
installer.HandleGitHubOverride(kubescoreDownloadUrl, "zegl/kube-score", "kubectl-kubescore-download-url")
installer.HandleGitHubOverride(fzfDownloadUrl, "junegunn/fzf", "kubectl-fzf-download-url")

// Create and process the feature
feature := installer.NewFeature("kubectl", true,
Expand Down Expand Up @@ -102,7 +105,8 @@ func runMain() error {
DownloadUrl: *kubescoreDownloadUrl,
},
&fzfComponent{
ComponentBase: installer.NewComponentBase("fzf", installer.VERSION_SYSTEM_DEFAULT),
ComponentBase: installer.NewComponentBase("fzf", *fzfVersion),
DownloadUrl: *fzfDownloadUrl,
},
)
return feature.Process()
Expand Down Expand Up @@ -528,8 +532,48 @@ func (c *kubescoreComponent) InstallVersion(version *gover.Version) error {

type fzfComponent struct {
*installer.ComponentBase
DownloadUrl string
}

func (c *fzfComponent) GetAllVersions() ([]*gover.Version, error) {
tags, err := installer.Tools.GitHub.GetTags("junegunn", "fzf")
if err != nil {
return nil, err
}
return installer.Tools.Versioning.ParseVersionsFromList(tags, threeDigitRegex, true)
}

func (c *fzfComponent) InstallVersion(version *gover.Version) error {
return installer.Tools.System.InstallPackages("fzf")
// Download
archPart, err := installer.Tools.System.MapArchitecture(map[string]string{
installer.AMD64: "amd64",
installer.ARM64: "arm64",
})
if err != nil {
return err
}
fileName := fmt.Sprintf("fzf-%s-linux_%s.tar.gz", version.Raw, archPart)
downloadUrl, err := installer.Tools.Http.BuildUrl(c.DownloadUrl, "v"+version.Raw, fileName)
if err != nil {
return err
}
if err := installer.Tools.Download.ToFile(downloadUrl, fileName, "fzf"); err != nil {
return err
}
// Extract
if err := installer.Tools.Compression.ExtractTarGz(fileName, "fzf", false); err != nil {
return err
}
// Install
if err := installer.Tools.System.InstallBinaryToUsrLocalBin("fzf/fzf", "fzf"); err != nil {
return err
}
// Cleanup
if err := os.Remove(fileName); err != nil {
return err
}
if err := os.RemoveAll("fzf"); err != nil {
return err
}
return nil
}
1 change: 1 addition & 0 deletions features/test/kubectl/full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ check_version "$(helm version --short)" "v3.16.2+g13654a5"
check_version "$(kustomize version)" "v5.4.2"
check_version "$(kubeconform -v)" "v0.6.6"
check_version "$(kube-score version)" "kube-score version: 1.18.0, commit: 0fb5f668e153c22696aa75ec769b080c41b5dd3d, built: 2024-02-05T14:13:15Z"
check_version "$(fzf --version)" "0.60.0"
6 changes: 4 additions & 2 deletions features/test/kubectl/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"helmVersion": "none",
"kustomizeVersion": "none",
"kubeconformVersion": "none",
"kubescoreVersion": "none"
"kubescoreVersion": "none",
"fzfVersion": "none"
}
}
},
Expand All @@ -35,7 +36,8 @@
"helmVersion": "3.16.2",
"kustomizeVersion": "5.4.2",
"kubeconformVersion": "0.6.6",
"kubescoreVersion": "1.18.0"
"kubescoreVersion": "1.18.0",
"fzfVersion": "0.60.0"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions override-all.env
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ KUBECTL_HELM_DOWNLOAD_URL=""
KUBECTL_KUSTOMIZE_DOWNLOAD_URL=""
KUBECTL_KUBECONFORM_DOWNLOAD_URL=""
KUBECTL_KUBESCORE_DOWNLOAD_URL=""
KUBECTL_FZF_DOWNLOAD_URL=""

# nginx
NGINX_DOWNLOAD_URL=""
Expand Down